fix stuff based on infection testing

chubbyphp · May 1, 2019 · 6b40d66 · 6b40d66
1 parent 321a8ee
commit 6b40d66
Show file tree

Hide file tree

Showing 14 changed files with 291 additions and 34 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,5 @@
+parameters:
+    level: 7
+    paths:
+        - src
+    ignoreErrors: []
diff --git a/src/Accessor/PropertyAccessor.php b/src/Accessor/PropertyAccessor.php
@@ -42,7 +42,7 @@ function ($property, $value) {
             $class
         );
 
-        return $setter($this->property, $value);
+        $setter($this->property, $value);
     }
 
     /**
@@ -81,7 +81,10 @@ private function getClass($object): string
                 $object->__load();
             }
 
-            return (new \ReflectionClass($object))->getParentClass()->name;
+            $reflectionParentClass = (new \ReflectionObject($object))->getParentClass();
+            if ($reflectionParentClass instanceof \ReflectionClass) {
+                return $reflectionParentClass->getName();
+            }
         }
 
         return get_class($object);

diff --git a/src/Decoder/JsonxTypeDecoder.php b/src/Decoder/JsonxTypeDecoder.php
@@ -53,10 +53,6 @@ private function decodeNode(\DOMNode $node)
     {
         $nodeName = $node->nodeName;
 
-        if (0 !== strpos($nodeName, 'json:')) {
-            throw DeserializerRuntimeException::createNotParsable($this->getContentType());
-        }
-
         $nodeType = substr($nodeName, 5);
 
         if (self::DATATYPE_OBJECT === $nodeType) {

diff --git a/src/Decoder/UrlEncodedTypeDecoder.php b/src/Decoder/UrlEncodedTypeDecoder.php
@@ -43,9 +43,7 @@ public function decode(string $data): array
     private function fixValues(array $rawData): array
     {
         $data = [];
-        foreach ($rawData as $rawKey => $value) {
-            $key = (string) (int) $rawKey === $rawKey ? (int) $rawKey : $rawKey;
-
+        foreach ($rawData as $key => $value) {
             if (is_array($value)) {
                 $data[$key] = $this->fixValues($value);
             } else {

diff --git a/src/Denormalizer/ConvertTypeFieldDenormalizer.php b/src/Denormalizer/ConvertTypeFieldDenormalizer.php
@@ -112,10 +112,6 @@ private function convertType($value)
      */
     private function convertBool($value)
     {
-        if (is_float($value) || is_int($value)) {
-            return $value;
-        }
-
         if ('true' === $value) {
             return true;
         }

diff --git a/src/Denormalizer/Denormalizer.php b/src/Denormalizer/Denormalizer.php
@@ -207,14 +207,14 @@ private function isWithinGroup(
     }
 
     /**
-     * @param string     $path
-     * @param string|int $name
+     * @param string $path
+     * @param string $name
      *
      * @return string
      */
-    private function getSubPathByName(string $path, $name): string
+    private function getSubPathByName(string $path, string $name): string
     {
-        return '' === $path ? (string) $name : $path.'.'.$name;
+        return '' === $path ? $name : $path.'.'.$name;
     }
 
     /**

diff --git a/src/Denormalizer/DenormalizerObjectMappingRegistry.php b/src/Denormalizer/DenormalizerObjectMappingRegistry.php
@@ -45,7 +45,8 @@ public function getObjectMapping(string $class): DenormalizationObjectMappingInt
         $reflectionClass = new \ReflectionClass($class);
 
         if (in_array('Doctrine\Common\Persistence\Proxy', $reflectionClass->getInterfaceNames(), true)) {
-            if (false !== $reflectionParentClass = $reflectionClass->getParentClass()) {
+            $reflectionParentClass = (new \ReflectionClass($class))->getParentClass();
+            if ($reflectionParentClass instanceof \ReflectionClass) {
                 $class = $reflectionParentClass->getName();
             }
         }

diff --git a/src/Mapping/DenormalizationFieldMappingBuilder.php b/src/Mapping/DenormalizationFieldMappingBuilder.php
@@ -28,7 +28,7 @@ final class DenormalizationFieldMappingBuilder implements DenormalizationFieldMa
     private $groups = [];
 
     /**
-     * @var FieldDenormalizerInterface|null
+     * @var FieldDenormalizerInterface
      */
     private $fieldDenormalizer;
 
@@ -71,8 +71,11 @@ public static function createCallback(string $name, callable $callback): Denorma
      *
      * @return DenormalizationFieldMappingBuilderInterface
      */
-    public static function createConvertType(string $name, string $type, bool $emptyToNull = false): DenormalizationFieldMappingBuilderInterface
-    {
+    public static function createConvertType(
+        string $name,
+        string $type,
+        bool $emptyToNull = false
+    ): DenormalizationFieldMappingBuilderInterface {
         $self = new self($name);
         $self->fieldDenormalizer = new ConvertTypeFieldDenormalizer(new PropertyAccessor($name), $type, $emptyToNull);
 
@@ -84,8 +87,10 @@ public static function createConvertType(string $name, string $type, bool $empty
      *
      * @return DenormalizationFieldMappingBuilderInterface
      */
-    public static function createDateTime(string $name, bool $emptyToNull = false): DenormalizationFieldMappingBuilderInterface
-    {
+    public static function createDateTime(
+        string $name,
+        bool $emptyToNull = false
+    ): DenormalizationFieldMappingBuilderInterface {
         $self = new self($name);
         $self->fieldDenormalizer = new DateTimeFieldDenormalizer(new PropertyAccessor($name), $emptyToNull);
 

diff --git a/tests/Accessor/PropertyAccessorTest.php b/tests/Accessor/PropertyAccessorTest.php
@@ -41,24 +41,34 @@ public function getName(): string
     public function testSetValueCanAccessPrivatePropertyThroughDoctrineProxyClass()
     {
         $object = new class() extends AbstractManyModel implements Proxy {
+            /**
+             * @var bool
+             */
+            private $initialized = false;
+
             public function __load()
             {
+                $this->initialized = true;
             }
 
             /**
              * @return bool
              */
             public function __isInitialized()
             {
-                return false;
+                return $this->initialized;
             }
         };
 
         $accessor = new PropertyAccessor('address');
 
+        self::assertFalse($object->__isInitialized());
+
         $accessor->setValue($object, 'Address');
 
-        self::assertSame('Address', $accessor->getValue($object));
+        self::assertTrue($object->__isInitialized());
+
+        self::assertSame('Address', $object->getAddress());
     }
 
     public function testMissingSet()
@@ -99,24 +109,34 @@ public function setName(string $name)
     public function testGetValueCanAccessPrivatePropertyThroughDoctrineProxyClass()
     {
         $object = new class() extends AbstractManyModel implements Proxy {
+            /**
+             * @var bool
+             */
+            private $initialized = false;
+
             public function __load()
             {
+                $this->initialized = true;
             }
 
             /**
              * @return bool
              */
             public function __isInitialized()
             {
-                return false;
+                return $this->initialized;
             }
         };
 
         $object->setAddress('Address');
 
         $accessor = new PropertyAccessor('address');
 
+        self::assertFalse($object->__isInitialized());
+
         self::assertSame('Address', $accessor->getValue($object));
+
+        self::assertTrue($object->__isInitialized());
     }
 
     public function testMissingGet()

diff --git a/tests/Denormalizer/ConvertTypeFieldDenormalizerTest.php b/tests/Denormalizer/ConvertTypeFieldDenormalizerTest.php
@@ -397,6 +397,23 @@ public function testDenormalizeFieldWithEmptyToNullDisabled()
         $fieldDenormalizer->denormalizeField('value', $object, '', $context);
     }
 
+    public function testDenormalizeFieldWithObjectToString()
+    {
+        $object = new \stdClass();
+        $valueObject = new \stdClass();
+
+        /** @var AccessorInterface|MockObject $accessor */
+        $accessor = $this->getMockByCalls(AccessorInterface::class, [
+            Call::create('setValue')->with($object, $valueObject),
+        ]);
+
+        /** @var DenormalizerContextInterface|MockObject $context */
+        $context = $this->getMockByCalls(DenormalizerContextInterface::class);
+
+        $fieldDenormalizer = new ConvertTypeFieldDenormalizer($accessor, ConvertTypeFieldDenormalizer::TYPE_STRING);
+        $fieldDenormalizer->denormalizeField('value', $object, $valueObject, $context);
+    }
+
     public function testDenormalizeFieldWithEmptyToNullEnabled()
     {
         $object = new \stdClass();

diff --git a/tests/Denormalizer/DateTimeFieldDenormalizerTest.php b/tests/Denormalizer/DateTimeFieldDenormalizerTest.php
@@ -53,7 +53,6 @@ function ($date) {
                 ),
         ]);
 
-
         error_clear_last();
 
         $fieldDenormalizer = new DateTimeFieldDenormalizer($fieldDenormalizer);
@@ -63,7 +62,14 @@ function ($date) {
         self::assertNotNull($error);
 
         self::assertSame(E_USER_DEPRECATED, $error['type']);
-        self::assertSame('Use "Chubbyphp\\Deserialization\\Accessor\\AccessorInterface" instead of "Chubbyphp\\Deserialization\\Denormalizer\\FieldDenormalizerInterface" as __construct argument', $error['message']);
+        self::assertSame(
+            sprintf(
+                'Use "%s" instead of "%s" as __construct argument',
+                AccessorInterface::class,
+                FieldDenormalizerInterface::class
+            ),
+            $error['message']
+        );
 
         $fieldDenormalizer->denormalizeField('date', $object, '2017-01-01', $context);
     }
@@ -230,7 +236,14 @@ public function testDenormalizeZeroStringField()
         $context = $this->getMockByCalls(DenormalizerContextInterface::class);
 
         $fieldDenormalizer = new DateTimeFieldDenormalizer($accessor);
+
+        error_clear_last();
+
         $fieldDenormalizer->denormalizeField('date', $object, '0', $context);
+
+        $error = error_get_last();
+
+        self::assertNull($error);
     }
 
     public function testDenormalizeArrayField()

diff --git a/tests/Denormalizer/DenormalizerTest.php b/tests/Denormalizer/DenormalizerTest.php
@@ -141,6 +141,60 @@ public function testDenormalizeWithNewAndType()
         );
     }
 
+    public function testDenormalizeWithNewAndTypeAndResetMissinFields()
+    {
+        $object = new \stdClass();
+
+        $factory = function () use ($object) {
+            return $object;
+        };
+
+        $context = DenormalizerContextBuilder::create()->setResetMissingFields(true)->getContext();
+
+        /** @var FieldDenormalizerInterface|MockObject $nameFieldDenormalizer */
+        $nameFieldDenormalizer = $this->getMockByCalls(FieldDenormalizerInterface::class, [
+            Call::create('denormalizeField')
+                ->with('name', $object, 'name', $context, new ArgumentInstanceOf(DenormalizerInterface::class)),
+        ]);
+
+        /** @var DenormalizationFieldMappingInterface|MockObject $denormalizationNameFieldMapping */
+        $denormalizationNameFieldMapping = $this->getMockByCalls(DenormalizationFieldMappingInterface::class, [
+            Call::create('getName')->with()->willReturn('name'),
+            Call::create('getFieldDenormalizer')->with()->willReturn($nameFieldDenormalizer),
+        ]);
+
+        /** @var DenormalizationFieldMappingInterface|MockObject $denormalizationValueFieldMapping */
+        $denormalizationValueFieldMapping = $this->getMockByCalls(DenormalizationFieldMappingInterface::class, [
+            Call::create('getName')->with()->willReturn('value'),
+        ]);
+
+        /** @var DenormalizationObjectMappingInterface|MockObject $objectMapping */
+        $objectMapping = $this->getMockByCalls(DenormalizationObjectMappingInterface::class, [
+            Call::create('getDenormalizationFactory')->with('', 'object')->willReturn($factory),
+            Call::create('getDenormalizationFieldMappings')->with('', 'object')->willReturn([
+                $denormalizationNameFieldMapping,
+                $denormalizationValueFieldMapping,
+            ]),
+        ]);
+
+        /** @var DenormalizerObjectMappingRegistryInterface|MockObject $registry */
+        $registry = $this->getMockByCalls(DenormalizerObjectMappingRegistryInterface::class, [
+            Call::create('getObjectMapping')->with(\stdClass::class)->willReturn($objectMapping),
+        ]);
+
+        /** @var LoggerInterface|MockObject $logger */
+        $logger = $this->getMockByCalls(LoggerInterface::class, [
+            Call::create('info')->with('deserialize: path {path}', ['path' => 'name']),
+        ]);
+
+        $denormalizer = new Denormalizer($registry, $logger);
+
+        self::assertSame(
+            $object,
+            $denormalizer->denormalize(\stdClass::class, ['name' => 'name', '_type' => 'object'], $context)
+        );
+    }
+
     public function testDenormalizeWithExisting()
     {
         $object = new \stdClass();