Skip to content

Commit

Permalink
[FIX] Refactoring application test.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bim-g
bim-g committed Jul 25, 2023
1 parent 7be9d58 commit 0947d8d
Show file tree
Hide file tree
Showing 25 changed files with 474 additions and 644 deletions.
2 changes: 1 addition & 1 deletion .phpunit.result.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":1,"defects":{"Test\\Schema\\SCHStringTest::testStringObject":4,"Test\\Schema\\SCHStringTest::testStringObjectIsNotKey":3,"Test\\Schema\\SCHStringTest::testStringEmailKey":3,"Test\\Schema\\SCHStringTest::testStringObjectIsKey":4,"Test\\Schema\\StringSchemaTest::testStringURLKey":3,"Test\\Schema\\StringSchemaTest::testStringMatchKey":3,"Test\\Schema\\StringSchemaTest::testStringMinimumKey":3,"Test\\Schema\\NumberSchemaTest::testStringIsObject":4,"Test\\Schema\\NumberSchemaTest::testRequiredKey":3,"Test\\Schema\\DateSchemaTest::testDateTodayKey":3,"Test\\Schema\\BooleanSchemaTest::testBooleanIsRequireddKey":3,"Test\\Script\\StringValidationTest::testStringIsObject":4,"Test\\Script\\StringValidationTest::testStringObjectException":4,"Test\\Script\\StringValidationTest::testException":3,"Test\\Script\\StringValidationTest::testStringMin":3,"Test\\Script\\StringValidationTest::testStringMaxError":4,"Test\\Script\\StringValidationTest::testStringMaxSuccess":4,"Test\\Script\\StringValidationTest::testStringValidationSourceDataException":4,"Test\\Script\\StringValidationTest::testStringValidationSchemaException":4,"Test\\Script\\StringValidationTest::testStringMinError":4,"Test\\Script\\StringValidationTest::testStringMinSuccess":4,"Test\\Script\\StringValidationTest::testStringEmailError":4,"Test\\Script\\StringValidationTest::testStringURLSuccess":4,"Test\\Script\\StringValidationTest::testStringRequiredSuccess":4,"Test\\Script\\StringValidationTest::testStringRequiredErrors":4,"Test\\Script\\StringValidationTest::testStringRequiredErrorsUnknown":4,"Test\\Script\\StringValidationTest::testStringMatchSuccess":4,"Test\\Script\\StringValidationTest::testStringMatchErrors":4,"Test\\Schema\\StringSchemaTest::testStringIsObject":4,"Test\\Schema\\StringSchemaTest::testStringObjectIsKey":3,"Test\\Schema\\StringSchemaTest::testStringEmailKey":3,"Test\\Schema\\StringSchemaTest::testStringMaximumKey":3,"Test\\Schema\\DateSchemaTest::testStringIsObject":4,"Test\\Schema\\DateSchemaTest::testStringObjectIsKey":3,"Test\\Schema\\DateSchemaTest::testDateNowKey":3,"Test\\Schema\\NumberSchemaTest::testStringObjectIsKey":3,"Test\\Schema\\NumberSchemaTest::testNumberPositiveKey":3,"Test\\Schema\\BooleanSchemaTest::testBooleanIsObject":4,"Test\\Schema\\BooleanSchemaTest::testStringObjectIsKey":3,"Test\\Schema\\BooleanSchemaTest::testBooleanIsValidKey":3,"Test\\ValidationTest::testValidationStringObject":3,"Test\\ValidationTest::testValidationStringErrorObject":3,"Test\\Script\\StringValidationTest::testStringValidationFieldNotDefinedException":4,"Test\\Script\\StringValidationTest::testStringEmailSuccess":4,"Test\\Script\\StringValidationTest::testStringURLError":4,"Test\\SchemaTest::testSchemaStringObject":3,"Test\\SchemaTest::testSchemaNumberObject":3,"Test\\SchemaTest::testSchemaDateObject":3},"times":{"Test\\Schema\\SCHStringTest::testStringObject":0.021,"Test\\Schema\\SCHStringTest::testStringObjectIsKey":0,"Test\\Schema\\SCHStringTest::testStringObjectIsNotKey":0.01,"Test\\Schema\\SCHStringTest::testStringEmailKey":0.001,"Test\\Schema\\SCHStringTest::testStringIsObject":0.008,"Test\\Schema\\StringSchemaTest::testStringIsObject":0.007,"Test\\Schema\\StringSchemaTest::testStringObjectIsKey":0.001,"Test\\Schema\\StringSchemaTest::testStringEmailKey":0.001,"Test\\Schema\\StringSchemaTest::testStringURLKey":0,"Test\\Schema\\StringSchemaTest::testStringMatchKey":0,"Test\\Schema\\StringSchemaTest::testStringMinimumKey":0,"Test\\Schema\\StringSchemaTest::testStringMaximumKey":0,"Test\\Schema\\NumberSchemaTest::testStringIsObject":0.007,"Test\\Schema\\NumberSchemaTest::testStringObjectIsKey":0,"Test\\Schema\\NumberSchemaTest::testRequiredKey":0.001,"Test\\Schema\\NumberSchemaTest::testNumberPositiveKey":0,"Test\\Schema\\DateSchemaTest::testStringIsObject":0.009,"Test\\Schema\\DateSchemaTest::testStringObjectIsKey":0.008,"Test\\Schema\\DateSchemaTest::testDateNowKey":0.001,"Test\\Schema\\DateSchemaTest::testDateTodayKey":0,"Test\\Schema\\BooleanSchemaTest::testBooleanIsObject":0.007,"Test\\Schema\\BooleanSchemaTest::testStringObjectIsKey":0.001,"Test\\Schema\\BooleanSchemaTest::testBooleanIsRequireddKey":0.001,"Test\\Schema\\BooleanSchemaTest::testBooleanIsValidKey":0,"Test\\Script\\StringValidationTest::testStringIsObject":0.001,"Test\\Script\\StringValidationTest::testStringObjectException":0.006,"Test\\Script\\StringValidationTest::testException":0.007,"Test\\Script\\StringValidationTest::testStringMin":0.001,"Test\\Script\\StringValidationTest::testStringValidationException":0.006,"Test\\Script\\StringValidationTest::testStringValidationSchemaException":0.001,"Test\\Script\\StringValidationTest::testStringValidationSourceDataException":0.076,"Test\\Script\\StringValidationTest::testStringMinError":0.001,"Test\\Script\\StringValidationTest::testStringMinSuccess":0.001,"Test\\Script\\StringValidationTest::testStringMaxError":0.001,"Test\\Script\\StringValidationTest::testStringMaxSuccess":0.001,"Test\\Script\\StringValidationTest::testStringEmailError":0.001,"Test\\Script\\StringValidationTest::testStringEmailSuccess":0.001,"Test\\Script\\StringValidationTest::testStringUrlError":0.008,"Test\\Script\\StringValidationTest::testStringURLError":0.001,"Test\\Script\\StringValidationTest::testStringURLSuccess":0.001,"Test\\Script\\StringValidationTest::testStringRequiredSuccess":0.001,"Test\\Script\\StringValidationTest::testStringRequiredErrors":0.001,"Test\\Script\\StringValidationTest::testStringRequiredErrorsUnknow":0,"Test\\Script\\StringValidationTest::testStringRequiredErrorsUnknown":0.001,"Test\\Script\\StringValidationTest::testStringMatchErrors":0.001,"Test\\Script\\StringValidationTest::testStringMatchSuccess":0.001,"Test\\Script\\StringValidationTest::testStringValidationFieldNotDefinedException":0.001,"Test\\ValidationTest::testValidationObject":0.016,"Test\\ValidationTest::testValidationStringObject":0.005,"Test\\ValidationTest::testValidationStringErrorObject":0.262,"Test\\SchemaTest::testSchemaObject":0.008,"Test\\SchemaTest::testSchemaStringObject":0.002,"Test\\SchemaTest::testSchemaStringErrorObject":0.003,"Test\\SchemaTest::testSchemaNumberObject":0.007,"Test\\SchemaTest::testSchemaNumberErrorObject":0.011,"Test\\SchemaTest::testSchemaDateErrorObject":0.012,"Test\\SchemaTest::testSchemaDateObject":0.007}}
{"version":1,"defects":{"Test\\Schema\\SCHStringTest::testStringObject":4,"Test\\Schema\\SCHStringTest::testStringObjectIsNotKey":3,"Test\\Schema\\SCHStringTest::testStringEmailKey":3,"Test\\Schema\\SCHStringTest::testStringObjectIsKey":4,"Test\\Schema\\StringSchemaTest::testStringURLKey":3,"Test\\Schema\\StringSchemaTest::testStringMatchKey":3,"Test\\Schema\\StringSchemaTest::testStringMinimumKey":3,"Test\\Schema\\NumberSchemaTest::testStringIsObject":4,"Test\\Schema\\NumberSchemaTest::testRequiredKey":3,"Test\\Schema\\DateSchemaTest::testDateTodayKey":3,"Test\\Schema\\BooleanSchemaTest::testBooleanIsRequireddKey":3,"Test\\Script\\StringValidationTest::testStringIsObject":4,"Test\\Script\\StringValidationTest::testStringObjectException":4,"Test\\Script\\StringValidationTest::testException":3,"Test\\Script\\StringValidationTest::testStringMin":3,"Test\\Script\\StringValidationTest::testStringMaxError":4,"Test\\Script\\StringValidationTest::testStringMaxSuccess":4,"Test\\Script\\StringValidationTest::testStringValidationSourceDataException":3,"Test\\Script\\StringValidationTest::testStringValidationSchemaException":4,"Test\\Script\\StringValidationTest::testStringMinError":4,"Test\\Script\\StringValidationTest::testStringMinSuccess":4,"Test\\Script\\StringValidationTest::testStringEmailError":4,"Test\\Script\\StringValidationTest::testStringURLSuccess":4,"Test\\Script\\StringValidationTest::testStringRequiredSuccess":4,"Test\\Script\\StringValidationTest::testStringRequiredErrors":4,"Test\\Script\\StringValidationTest::testStringRequiredErrorsUnknown":4,"Test\\Script\\StringValidationTest::testStringMatchSuccess":4,"Test\\Script\\StringValidationTest::testStringMatchErrors":4,"Test\\Schema\\StringSchemaTest::testStringIsObject":4,"Test\\Schema\\StringSchemaTest::testStringObjectIsKey":3,"Test\\Schema\\StringSchemaTest::testStringEmailKey":3,"Test\\Schema\\StringSchemaTest::testStringMaximumKey":3,"Test\\Schema\\DateSchemaTest::testStringIsObject":4,"Test\\Schema\\DateSchemaTest::testStringObjectIsKey":3,"Test\\Schema\\DateSchemaTest::testDateNowKey":3,"Test\\Schema\\NumberSchemaTest::testStringObjectIsKey":3,"Test\\Schema\\NumberSchemaTest::testNumberPositiveKey":3,"Test\\Schema\\BooleanSchemaTest::testBooleanIsObject":4,"Test\\Schema\\BooleanSchemaTest::testStringObjectIsKey":3,"Test\\Schema\\BooleanSchemaTest::testBooleanIsValidKey":3,"Test\\ValidationTest::testValidationStringObject":3,"Test\\ValidationTest::testValidationStringErrorObject":3,"Test\\Script\\StringValidationTest::testStringValidationFieldNotDefinedException":3,"Test\\Script\\StringValidationTest::testStringEmailSuccess":4,"Test\\Script\\StringValidationTest::testStringURLError":4,"Test\\SchemaTest::testSchemaStringObject":3,"Test\\SchemaTest::testSchemaNumberObject":3,"Test\\SchemaTest::testSchemaDateObject":3},"times":{"Test\\Schema\\SCHStringTest::testStringObject":0.021,"Test\\Schema\\SCHStringTest::testStringObjectIsKey":0,"Test\\Schema\\SCHStringTest::testStringObjectIsNotKey":0.01,"Test\\Schema\\SCHStringTest::testStringEmailKey":0.001,"Test\\Schema\\SCHStringTest::testStringIsObject":0.008,"Test\\Schema\\StringSchemaTest::testStringIsObject":0.017,"Test\\Schema\\StringSchemaTest::testStringObjectIsKey":0.001,"Test\\Schema\\StringSchemaTest::testStringEmailKey":0.002,"Test\\Schema\\StringSchemaTest::testStringURLKey":0,"Test\\Schema\\StringSchemaTest::testStringMatchKey":0,"Test\\Schema\\StringSchemaTest::testStringMinimumKey":0,"Test\\Schema\\StringSchemaTest::testStringMaximumKey":0,"Test\\Schema\\NumberSchemaTest::testStringIsObject":0.02,"Test\\Schema\\NumberSchemaTest::testStringObjectIsKey":0.001,"Test\\Schema\\NumberSchemaTest::testRequiredKey":0.001,"Test\\Schema\\NumberSchemaTest::testNumberPositiveKey":0,"Test\\Schema\\DateSchemaTest::testStringIsObject":0.015,"Test\\Schema\\DateSchemaTest::testStringObjectIsKey":0.001,"Test\\Schema\\DateSchemaTest::testDateNowKey":0.001,"Test\\Schema\\DateSchemaTest::testDateTodayKey":0.001,"Test\\Schema\\BooleanSchemaTest::testBooleanIsObject":0.012,"Test\\Schema\\BooleanSchemaTest::testStringObjectIsKey":0.001,"Test\\Schema\\BooleanSchemaTest::testBooleanIsRequireddKey":0.002,"Test\\Schema\\BooleanSchemaTest::testBooleanIsValidKey":0,"Test\\Script\\StringValidationTest::testStringIsObject":0.002,"Test\\Script\\StringValidationTest::testStringObjectException":0.006,"Test\\Script\\StringValidationTest::testException":0.007,"Test\\Script\\StringValidationTest::testStringMin":0.001,"Test\\Script\\StringValidationTest::testStringValidationException":0.006,"Test\\Script\\StringValidationTest::testStringValidationSchemaException":0.001,"Test\\Script\\StringValidationTest::testStringValidationSourceDataException":0.013,"Test\\Script\\StringValidationTest::testStringMinError":0.001,"Test\\Script\\StringValidationTest::testStringMinSuccess":0.003,"Test\\Script\\StringValidationTest::testStringMaxError":0.002,"Test\\Script\\StringValidationTest::testStringMaxSuccess":0.002,"Test\\Script\\StringValidationTest::testStringEmailError":0.001,"Test\\Script\\StringValidationTest::testStringEmailSuccess":0.002,"Test\\Script\\StringValidationTest::testStringUrlError":0.008,"Test\\Script\\StringValidationTest::testStringURLError":0.002,"Test\\Script\\StringValidationTest::testStringURLSuccess":0.002,"Test\\Script\\StringValidationTest::testStringRequiredSuccess":0.002,"Test\\Script\\StringValidationTest::testStringRequiredErrors":0.002,"Test\\Script\\StringValidationTest::testStringRequiredErrorsUnknow":0,"Test\\Script\\StringValidationTest::testStringRequiredErrorsUnknown":0.002,"Test\\Script\\StringValidationTest::testStringMatchErrors":0.002,"Test\\Script\\StringValidationTest::testStringMatchSuccess":0.003,"Test\\Script\\StringValidationTest::testStringValidationFieldNotDefinedException":0.01,"Test\\ValidationTest::testValidationObject":0.016,"Test\\ValidationTest::testValidationStringObject":0.005,"Test\\ValidationTest::testValidationStringErrorObject":0.262,"Test\\SchemaTest::testSchemaObject":0.012,"Test\\SchemaTest::testSchemaStringObject":0.003,"Test\\SchemaTest::testSchemaStringErrorObject":0.004,"Test\\SchemaTest::testSchemaNumberObject":0.001,"Test\\SchemaTest::testSchemaNumberErrorObject":0.002,"Test\\SchemaTest::testSchemaDateErrorObject":0.001,"Test\\SchemaTest::testSchemaDateObject":0.002}}
14 changes: 13 additions & 1 deletion index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,17 @@
* @author Boss Ibrahim Mussa
*/

use Wepesi\App\Validator\StringValidator;

require_once __DIR__."/vendor/autoload.php";
include __DIR__.'/example/index.php';
//include __DIR__.'/example/index.php';
try {
$stringValidationSourceDataException = new StringValidator('');
} catch (Exception $ex) {
$className = get_class($ex);
$msg = $ex->getMessage();
$code = $ex->getCode();
var_dump($className,
$msg,
$code);
}
2 changes: 1 addition & 1 deletion src/Providers/Contracts/ValidatorContracts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ public function addError(array $value);
/**
* @return array
*/
public function result():array;
public function result(): array;
}
2 changes: 1 addition & 1 deletion src/Providers/SChemaProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ public function required(): SChemaProvider
*/
public function generate(): array
{
return $this->schema;
return $this->schema;
}
}
45 changes: 29 additions & 16 deletions src/Providers/ValidatorProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Wepesi\App\Providers\Contracts\Contracts;

/**
*
* Validator provider model
*/
abstract class ValidatorProvider implements Contracts
{
Expand All @@ -29,15 +29,12 @@ abstract class ValidatorProvider implements Contracts
* @var
*/
protected $field_value;
/**
* @var string
*/
protected string $class_provider = 'unknown';

/**
*
*/
function __construct(){
function __construct()
{
$this->errors = [];
}

Expand All @@ -53,31 +50,46 @@ abstract public function min(int $rule);
*/
abstract public function max(int $rule);

/**
* Provide validation module name
* @return string
*/
abstract protected function classProvider(): string ;

/**
* @return string
*/
private function getClassProvider(): string
{
return $this->classProvider && strlen($this->classProvider) > 0 ? $this->classProvider : 'unknown';
}
/**
* @return void
*/
public function required(){
if(is_array($this->field_value)){
public function required()
{
if (is_array($this->field_value)) {
if (count($this->field_value) == 0) {
$message = [
'type' => $this->class_provider . ' required',
'type' => $this->getClassProvider() . ' required',
'message' => "'$this->field_name' is required",
'label' => $this->field_name,
];
$this->addError($message);
}
}else{
} else {
$required_value = trim($this->field_value);
if (strlen($required_value) == 0) {
$message = [
'type' => $this->class_provider . ' required',
'type' => $this->classProvider() . ' required',
'message' => "'$this->field_name' is required",
'label' => $this->field_name,
];
$this->addError($message);
}
}
}

/**
*
* @param array $value
Expand All @@ -93,20 +105,21 @@ public function addError(array $value): void
*/
public function result(): array
{
return $this->errors;
return $this->errors;
}

/**
* @param int $rule
* @param bool $max
* @return bool
*/
protected function positiveParamMethod(int $rule,bool $max = false):bool{
protected function positiveParamMethod(int $rule, bool $max = false): bool
{
$status = true;
if($rule<1){
$method = $max?"max":"min";
if ($rule < 1) {
$method = $max ? "max" : "min";
$message = [
'type' => $this->class_provider . ' method '. $method,
'type' => $this->getClassProvider() . ' method ' . $method,
'message' => "'$this->field_name' $method param should be a positive number",
'label' => $this->field_name,
];
Expand Down
12 changes: 7 additions & 5 deletions src/Resolver/Option.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

namespace Wepesi\App\Resolver;

use Closure;

/**
* Class Option
* @package Wepesi\App\Resolver
Expand All @@ -28,9 +30,9 @@ final class Option
private bool $hasDefaultValue;

/**
* @var \Closure|null
* @var Closure|null
*/
private ?\Closure $validator = null;
private ?Closure $validator = null;

/**
* Option constructor.
Expand Down Expand Up @@ -78,10 +80,10 @@ public function hasDefaultValue(): bool
}

/**
* @param \Closure $closure
* @param Closure $closure
* @return $this
*/
public function validator(\Closure $closure): self
public function validator(Closure $closure): self
{
$this->validator = $closure;
return $this;
Expand All @@ -93,7 +95,7 @@ public function validator(\Closure $closure): self
*/
public function isValid($value): bool
{
if ($this->validator instanceof \Closure) {
if ($this->validator instanceof Closure) {
$validator = $this->validator;
return $validator($value);
}
Expand Down
Loading

0 comments on commit 0947d8d

Please sign in to comment.