@@ -45,6 +45,6 @@ |
||
| 45 | 45 | */ |
| 46 | 46 | public function validate($value) |
| 47 | 47 | { |
| 48 | - return ! $this->validator->validate($value); |
|
| 48 | + return !$this->validator->validate($value); |
|
| 49 | 49 | } |
| 50 | 50 | } |
@@ -37,11 +37,11 @@ |
||
| 37 | 37 | * @var array |
| 38 | 38 | */ |
| 39 | 39 | private $validTypes = [ |
| 40 | - 'array' => [ 'array' ], |
|
| 41 | - 'object' => [ 'object' ], |
|
| 42 | - 'integer' => [ 'integer' ], |
|
| 43 | - 'number' => [ 'integer', 'double' ], |
|
| 44 | - 'string' => [ 'string' ], |
|
| 40 | + 'array' => ['array'], |
|
| 41 | + 'object' => ['object'], |
|
| 42 | + 'integer' => ['integer'], |
|
| 43 | + 'number' => ['integer', 'double'], |
|
| 44 | + 'string' => ['string'], |
|
| 45 | 45 | 'boolean' => ['boolean'], |
| 46 | 46 | 'null' => ['NULL'], |
| 47 | 47 | ]; |
@@ -18,13 +18,6 @@ |
||
| 18 | 18 | namespace Mcustiel\SimpleRequest; |
| 19 | 19 | |
| 20 | 20 | use Doctrine\Common\Annotations\AnnotationReader; |
| 21 | -use Mcustiel\SimpleRequest\Util\ValidatorBuilder; |
|
| 22 | -use Mcustiel\SimpleRequest\Annotation\RequestAnnotation; |
|
| 23 | -use Mcustiel\SimpleRequest\Annotation\ValidatorAnnotation; |
|
| 24 | -use Mcustiel\SimpleRequest\Annotation\FilterAnnotation; |
|
| 25 | -use Mcustiel\SimpleRequest\Util\FilterBuilder; |
|
| 26 | -use Mcustiel\SimpleRequest\Annotation\ParseAs; |
|
| 27 | -use Mcustiel\SimpleRequest\Annotation\AnnotationWithAssociatedClass; |
|
| 28 | 21 | use Mcustiel\SimpleRequest\Strategies\AnnotationParserFactory; |
| 29 | 22 | use Mcustiel\SimpleRequest\Strategies\PropertyParserBuilder; |
| 30 | 23 | use Mcustiel\SimpleRequest\Strategies\Properties\PropertyParser; |
@@ -19,7 +19,6 @@ |
||
| 19 | 19 | |
| 20 | 20 | use Mcustiel\SimpleRequest\Exception\InvalidRequestException; |
| 21 | 21 | use Psr\Cache\CacheItemPoolInterface as PsrCache; |
| 22 | -use Symfony\Component\Cache\CacheItem; |
|
| 23 | 22 | |
| 24 | 23 | /** |
| 25 | 24 | * Builds a request by parsing all the resulting object's annotations and running |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | |
| 74 | 74 | private function generateRequestParserObject($className, $parser) |
| 75 | 75 | { |
| 76 | - $cacheKey = str_replace('\\', '', $className . get_class($parser)); |
|
| 76 | + $cacheKey = str_replace('\\', '', $className.get_class($parser)); |
|
| 77 | 77 | $cacheItem = $this->cache->getItem($cacheKey); |
| 78 | 78 | $return = $cacheItem->get(); |
| 79 | 79 | if ($return === null) { |
@@ -44,9 +44,9 @@ |
||
| 44 | 44 | throw new FilterDoesNotExistException("Filter class {$type} does not exist"); |
| 45 | 45 | } |
| 46 | 46 | $filter = new $type; |
| 47 | - if (! ($filter instanceof FilterInterface)) { |
|
| 47 | + if (!($filter instanceof FilterInterface)) { |
|
| 48 | 48 | throw new FilterDoesNotExistException( |
| 49 | - "Filter class {$type} must implement " . FilterInterface::class |
|
| 49 | + "Filter class {$type} must implement ".FilterInterface::class |
|
| 50 | 50 | ); |
| 51 | 51 | } |
| 52 | 52 | |
@@ -43,9 +43,9 @@ |
||
| 43 | 43 | throw new ValidatorDoesNotExistException("Validator class {$type} does not exist"); |
| 44 | 44 | } |
| 45 | 45 | $validator = new $type; |
| 46 | - if (! ($validator instanceof ValidatorInterface)) { |
|
| 46 | + if (!($validator instanceof ValidatorInterface)) { |
|
| 47 | 47 | throw new ValidatorDoesNotExistException( |
| 48 | - "Validator class {$type} must implement " . ValidatorInterface::class |
|
| 48 | + "Validator class {$type} must implement ".ValidatorInterface::class |
|
| 49 | 49 | ); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | foreach ($this->validators as $validator) { |
| 89 | 89 | if (!$validator->validate($value)) { |
| 90 | 90 | throw new InvalidValueException( |
| 91 | - "Field {$this->name}, was set with invalid value: " . var_export($value, true) |
|
| 91 | + "Field {$this->name}, was set with invalid value: ".var_export($value, true) |
|
| 92 | 92 | ); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -29,6 +29,6 @@ |
||
| 29 | 29 | return new $val; |
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | - throw new \Exception('Unsupported annotation: ' . get_class($annotation)); |
|
| 32 | + throw new \Exception('Unsupported annotation: '.get_class($annotation)); |
|
| 33 | 33 | } |
| 34 | 34 | } |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | $value = $propertyParser->parse( |
| 79 | 79 | $this->getFromRequest($request, $propertyName) |
| 80 | 80 | ); |
| 81 | - $method = 'set' . ucfirst($propertyName); |
|
| 81 | + $method = 'set'.ucfirst($propertyName); |
|
| 82 | 82 | $object->$method($value); |
| 83 | 83 | } |
| 84 | 84 | |