Merge pull request #21 from NicolasGuilloux/feature/doctrine-strip-null

Prevent searching a doctrine entity with a null value
NicolasGuilloux · Feb 14, 2020 · 7a9b04c · 7a9b04c
2 parents 99d6c1a + dadefa4
commit 7a9b04c
Show file tree

Hide file tree

Showing 7 changed files with 662 additions and 491 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.2.3
+
+Bug fix:
+ * Don't treat null as a valid value when converting a value to an entity.
+
 ## 2.2.2
 
 Bug fix:

diff --git a/EventListener/DataTransferObjectValidationExceptionSubscriber.php b/EventListener/DataTransferObjectValidationExceptionSubscriber.php
@@ -5,7 +5,7 @@
 use Chaplean\Bundle\DtoHandlerBundle\Exception\DataTransferObjectValidationException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
@@ -27,11 +27,11 @@ public static function getSubscribedEvents(): array
     }
 
     /**
-     * @param GetResponseForExceptionEvent $event
+     * @param ExceptionEvent $event
      *
      * @return void
      */
-    public function onKernelException(GetResponseForExceptionEvent $event): void
+    public function onKernelException(ExceptionEvent $event): void
     {
         $exception = $event->getException();
 

diff --git a/ParamConverter/DataTransferObjectParamConverter.php b/ParamConverter/DataTransferObjectParamConverter.php
@@ -26,10 +26,10 @@
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class DataTransferObjectParamConverter.
@@ -308,6 +308,7 @@ protected function autoConfigureOne(
         if ($propertyConfigurationModel->getMapTo() !== null) {
             $config->setOptions(
                 [
+                    'strip_null' => true,
                     'mapping' => [
                         $name => $propertyConfigurationModel->getMapTo()
                     ]
@@ -373,7 +374,7 @@ protected function getViolationFromException(Request $request, \Exception $excep
             $propertyName,
             $value,
             null,
-            $exception->getCode()
+            (string) $exception->getCode()
         );
     }
 
@@ -468,7 +469,7 @@ protected function validate($object, Request $request, array $options): void
         }
 
         $violations = new ConstraintViolationList();
-        $violationsHandler = $options['violations'] ?? false;
+        $violationsHandler = $options['violations'] ?? '';
         $groups = $options['groups'] ?? null;
 
         if ($groups !== null) {
@@ -485,7 +486,7 @@ protected function validate($object, Request $request, array $options): void
                 $this->validator->validate($object, null, $group['validation_group'])
             );
 
-            if (!$violationsHandler && $violations->count() > 0) {
+            if ($violationsHandler === '' && $violations->count() > 0) {
                 throw new DataTransferObjectValidationException($violations, $group['http_status_code']);
             }
         }

diff --git a/Tests/EventListener/DataTransferObjectValidationExceptionSubscriberTest.php b/Tests/EventListener/DataTransferObjectValidationExceptionSubscriberTest.php
@@ -5,10 +5,7 @@
 use Chaplean\Bundle\DtoHandlerBundle\EventListener\DataTransferObjectValidationExceptionSubscriber;
 use Chaplean\Bundle\DtoHandlerBundle\Exception\DataTransferObjectValidationException;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Validator\ConstraintViolation;
@@ -64,7 +61,7 @@ public function testOnKernelExceptionWithAnotherException(): void
     {
         $exception = new BadRequestHttpException();
 
-        $event = \Mockery::mock(GetResponseForExceptionEvent::class);
+        $event = \Mockery::mock(ExceptionEvent::class);
         $event->shouldNotReceive('setResponse');
         $event->shouldReceive('getException')
             ->once()
@@ -93,7 +90,7 @@ public function testOnKernelException(): void
 
         $exception = new DataTransferObjectValidationException($violations);
 
-        $event = \Mockery::mock(GetResponseForExceptionEvent::class);
+        $event = \Mockery::mock(ExceptionEvent::class);
 
         $event->shouldReceive('getException')
             ->once()

diff --git a/Tests/ParamConverter/DataTransferObjectParamConverterTest.php b/Tests/ParamConverter/DataTransferObjectParamConverterTest.php
@@ -17,18 +17,18 @@
 use Doctrine\Common\Annotations\AnnotationException;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 use Mockery\MockInterface;
-use phpmock\mockery\PHPMockery;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Tests\Chaplean\Bundle\DtoHandlerBundle\Resources\DTO\DummyDataTransferObject;
 use Tests\Chaplean\Bundle\DtoHandlerBundle\Resources\DTO\SubDataTransferObject;
 use Tests\Chaplean\Bundle\DtoHandlerBundle\Resources\Entity\DummyEntity;
-use Tests\Chaplean\Bundle\DtoHandlerBundle\Resources\DTO\DummyDataTransferObject;
+use phpmock\mockery\PHPMockery;
 
 /**
  * Class DataTransferObjectParamConverterTest
@@ -328,7 +328,7 @@ public function testApplyWithValidationSuccess(): void
             ]
         );
 
-        $request->attributes->set(0, 'UselessAttribute');
+        $request->attributes->set('0', 'UselessAttribute');
         $request->attributes->set('parasite_', 'UselessAttribute');
 
         $this->manager->shouldReceive('apply')->times(7);
@@ -422,7 +422,7 @@ public function testApplySubDto(): void
                 ['keyname' => 'test2']
             ]
         ]);
-        $request->attributes->set(0, 'UselessAttribute');
+        $request->attributes->set('0', 'UselessAttribute');
         $request->attributes->set('parasite_', 'UselessAttribute');
 
         $this->manager->shouldReceive('apply')->times(7);
@@ -689,7 +689,7 @@ public function testApplyWithUnwrittableProperties(): void
         $request->request->set('accessible', 'Accessible');
 
         $request->attributes->set('dataTransferObject', null);
-        $request->attributes->set(0, 'UselessAttribute');
+        $request->attributes->set('0', 'UselessAttribute');
         $request->attributes->set('parasite_', 'UselessAttribute');
 
         $this->manager->shouldReceive('apply')->never();