v3

README.md

@@ -30,7 +30,7 @@ A simple deserialization.
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-deserialization][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-deserialization "^2.17"
+composer require chubbyphp/chubbyphp-deserialization "^3.0"
 ```
 
 ## Usage
@@ -126,7 +126,7 @@ echo $model->getName();
 print_r($deserializer->getContentTypes());
 //[
 //    'application/json',
-//    'application/x-jsonx',
+//    'application/jsonx+xml',
 //    'application/x-www-form-urlencoded',
 //    'application/xml',
 //    'application/x-yaml'

composer.json

@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.17-dev"
+            "dev-master": "3.0-dev"
         }
     },
     "scripts": {
@@ -59,8 +59,8 @@
             "@test:insights"
         ],
         "test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
-        "test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=93 --verbose --coverage=build/phpunit",
-        "test:insights": "mkdir -p build && bash -c 'vendor/bin/phpinsights analyse -v --no-interaction --min-quality=82 --disable-security-check | tee build/phpinsights.log; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
+        "test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=95 --verbose --coverage=build/phpunit",
+        "test:insights": "mkdir -p build && bash -c 'vendor/bin/phpinsights analyse -v --no-interaction --min-quality=93 --disable-security-check | tee build/phpinsights.log; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
         "test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-result-file=build/phpunit/result.cache",
         "test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",
         "test:loc": "mkdir -p build && vendor/bin/phploc src --verbose | tee build/phploc.log",

doc/Decoder/Decoder.md

@@ -5,12 +5,14 @@
 
 use Chubbyphp\Deserialization\Decoder\Decoder;
 use Chubbyphp\Deserialization\Decoder\JsonTypeDecoder;
+use Chubbyphp\Deserialization\Decoder\JsonxTypeDecoder;
 use Chubbyphp\Deserialization\Decoder\UrlEncodedTypeDecoder;
 use Chubbyphp\Deserialization\Decoder\XmlTypeDecoder;
 use Chubbyphp\Deserialization\Decoder\YamlTypeDecoder;
 
 $decoder = new Decoder([
     new JsonTypeDecoder(),
+    new JsonxTypeDecoder(),
     new UrlEncodedTypeDecoder(),
     new XmlTypeDecoder(),
     new YamlTypeDecoder()
@@ -19,6 +21,7 @@ $decoder = new Decoder([
 print_r($decoder->getContentTypes());
 //[
 //    'application/json',
+//    'application/jsonx+xml',
 //    'application/x-www-form-urlencoded',
 //    'application/xml',
 //    'application/x-yaml'
@@ -29,4 +32,4 @@ print_r($decoder->decode(
     'application/json'
 ));
 // ['name' => 'php']
-```
+```

doc/Decoder/JsonxTypeDecoder.md

@@ -8,7 +8,7 @@ use Chubbyphp\Deserialization\Decoder\JsonxTypeDecoder;
 $decoderType = new JsonxTypeDecoder();
 
 echo $decoderType->getContentType();
-// 'application/x-jsonx'
+// 'application/jsonx+xml'
 
 print_r($decoderType->decode('<json:object><json:string name="name">php</json:string></json:object>'));
 // ['name' => 'php']

doc/Decoder/XmlTypeDecoder.md

@@ -1,4 +1,4 @@
-# XmlTypeDecoder
+# XmlTypeDecoder (alias for Jsonx)
 
 ```php
 <?php
@@ -10,6 +10,6 @@ $decoderType = new XmlTypeDecoder();
 echo $decoderType->getContentType();
 // 'application/xml'
 
-print_r($decoderType->decode('<name type="string">php</name>'));
+print_r($decoderType->decode('<json:object><json:string name="name">php</json:string></json:object>'));
 // ['name' => 'php']
 ```

doc/Denormalizer/DenormalizerContext.md

@@ -9,21 +9,16 @@ use Psr\Http\Message\ServerRequestInterface;
 /** @var ServerRequestInterface $request */
 $request = ...;
 
-$context = new DenormalizerContext(['allowed_additional_field'], ['group1'], $request, true, [], true);
+$context = new DenormalizerContext(['allowed_additional_field'], $request, [], true);
 
 echo $context->getAllowedAdditionalFields();
 // ['allowed_additional_field']
 
-print_r($context->getGroups());
-// ['group1']
-
 $context->getRequest();
 // instanceof ServerRequestInterface
 
-echo $context->isResetMissingFields();
-// true
-
 echo $context->isClearMissing();
+// true
 
 $context->getAttributes();
 $context->getAttribute('name');

doc/Denormalizer/DenormalizerContextBuilder.md

@@ -11,24 +11,16 @@ $request = ...;
 
 $context = DenormalizerContextBuilder::create()
     ->setAllowedAdditionalFields(['allowed_additional_field'])
-    ->setGroups(['group1'])
     ->setRequest($request)
-    ->setResetMissingFields(true) // deprecated
     ->setClearMissing(true)
     ->getContext();
 
 echo $context->getAllowedAdditionalFields();
 // ['allowed_additional_field']
 
-print_r($context->getGroups());
-// ['group1']
-
 $context->getRequest();
 // instanceof ServerRequestInterface
 
-echo $context->isResetMissingFields();
-// true
-
 echo $context->isClearMissing();
 // true
 

phpstan.neon

@@ -1,26 +1,11 @@
 parameters:
     ignoreErrors:
-        -
-            message: '/Method Chubbyphp\\Deserialization\\Accessor\\AccessorInterface\:\:setValue\(\) has no return typehint specified\./'
-            path: %currentWorkingDirectory%/src/Accessor/AccessorInterface.php
-        -
-            message: '/Method Chubbyphp\\Deserialization\\Accessor\\MethodAccessor\:\:setValue\(\) has no return typehint specified\./'
-            path: %currentWorkingDirectory%/src/Accessor/MethodAccessor.php
         -
             message: '//'
             path: %currentWorkingDirectory%/src/Decoder/JsonxTypeDecoder.php
         -
             message: '//'
             path: %currentWorkingDirectory%/src/Decoder/UrlEncodedTypeDecoder.php
-        -
-            message: '//'
-            path: %currentWorkingDirectory%/src/Decoder/XmlTypeDecoder.php
-        -
-            message: '/Unreachable statement - code above always terminates\./'
-            path: %currentWorkingDirectory%/src/Denormalizer/DateTimeFieldDenormalizer.php
         -
             message: '/Parameter \#1 \$argument of class ReflectionClass constructor expects class\-string<T of object>\|T of object, string given\./'
             path: %currentWorkingDirectory%/src/Denormalizer/DenormalizerObjectMappingRegistry.php
-        -
-            message: '/Method Chubbyphp\\Deserialization\\Denormalizer\\FieldDenormalizerInterface\:\:denormalizeField\(\) has no return typehint specified\./'
-            path: %currentWorkingDirectory%/src/Denormalizer/FieldDenormalizerInterface.php

src/Accessor/AccessorInterface.php

@@ -9,19 +9,16 @@
 interface AccessorInterface
 {
     /**
-     * @param object $object
-     * @param mixed  $value
+     * @param mixed $value
      *
      * @throws DeserializerLogicException
      */
-    public function setValue($object, $value);
+    public function setValue(object $object, $value): void;
 
     /**
-     * @param object $object
-     *
      * @throws DeserializerLogicException
      *
      * @return mixed
      */
-    public function getValue($object);
+    public function getValue(object $object);
 }

src/Accessor/MethodAccessor.php

@@ -19,29 +19,26 @@ public function __construct(string $property)
     }
 
     /**
-     * @param object $object
-     * @param mixed  $value
+     * @param mixed $value
      *
      * @throws DeserializerLogicException
      */
-    public function setValue($object, $value)
+    public function setValue(object $object, $value): void
     {
         $set = 'set'.ucfirst($this->property);
         if (!method_exists($object, $set)) {
             throw DeserializerLogicException::createMissingMethod(get_class($object), [$set]);
         }
 
-        return $object->{$set}($value);
+        $object->{$set}($value);
     }
 
     /**
-     * @param object $object
-     *
      * @throws DeserializerLogicException
      *
      * @return mixed
      */
-    public function getValue($object)
+    public function getValue(object $object)
     {
         $get = 'get'.ucfirst($this->property);
         $has = 'has'.ucfirst($this->property);

src/Accessor/PropertyAccessor.php

@@ -20,10 +20,9 @@ public function __construct(string $property)
     }
 
     /**
-     * @param object $object
-     * @param mixed  $value
+     * @param mixed $value
      */
-    public function setValue($object, $value): void
+    public function setValue(object $object, $value): void
     {
         $class = $this->getClass($object);
 
@@ -43,11 +42,9 @@ function ($property, $value): void {
     }
 
     /**
-     * @param object $object
-     *
      * @return mixed
      */
-    public function getValue($object)
+    public function getValue(object $object)
     {
         $class = $this->getClass($object);
 

src/Decoder/Decoder.php

@@ -37,7 +37,7 @@ public function getContentTypes(): array
      * @throws DeserializerLogicException
      * @throws DeserializerRuntimeException
      *
-     * @return array<mixed>
+     * @return array<int|string, array|string|float|int|bool|null>
      */
     public function decode(string $data, string $contentType): array
     {

src/Decoder/DecoderInterface.php

@@ -18,7 +18,7 @@ public function getContentTypes(): array;
      * @throws DeserializerLogicException
      * @throws DeserializerRuntimeException
      *
-     * @return array<mixed>
+     * @return array<int|string, array|string|float|int|bool|null>
      */
     public function decode(string $data, string $contentType): array;
 }

src/Decoder/JsonTypeDecoder.php

@@ -16,11 +16,11 @@ public function getContentType(): string
     /**
      * @throws DeserializerRuntimeException
      *
-     * @return array<mixed>
+     * @return array<int|string, array|string|float|int|bool|null>
      */
     public function decode(string $data): array
     {
-        $decoded = $json = json_decode($data, true);
+        $decoded = json_decode($data, true);
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw DeserializerRuntimeException::createNotParsable($this->getContentType(), json_last_error_msg());

src/Decoder/JsonxTypeDecoder.php

@@ -11,39 +11,22 @@
  */
 final class JsonxTypeDecoder implements TypeDecoderInterface
 {
-    public const DATATYPE_OBJECT = 'object';
-    public const DATATYPE_ARRAY = 'array';
-    public const DATATYPE_BOOLEAN = 'boolean';
-    public const DATATYPE_STRING = 'string';
-    public const DATATYPE_NUMBER = 'number';
-    public const DATATYPE_NULL = 'null';
-
-    /**
-     * @var string
-     */
-    private $contentType;
-
-    public function __construct(string $contentType = 'application/x-jsonx')
-    {
-        if ('application/x-jsonx' === $contentType) {
-            @trigger_error(
-                'Use "application/jsonx+xml" instead of "application/x-jsonx", cause jsonx is a xml variant.',
-                E_USER_DEPRECATED
-            );
-        }
-
-        $this->contentType = $contentType;
-    }
+    private const DATATYPE_OBJECT = 'object';
+    private const DATATYPE_ARRAY = 'array';
+    private const DATATYPE_BOOLEAN = 'boolean';
+    private const DATATYPE_STRING = 'string';
+    private const DATATYPE_NUMBER = 'number';
+    private const DATATYPE_NULL = 'null';
 
     public function getContentType(): string
     {
-        return $this->contentType;
+        return 'application/jsonx+xml';
     }
 
     /**
      * @throws DeserializerRuntimeException
      *
-     * @return array<mixed>
+     * @return array<int|string, array|string|float|int|bool|null>
      */
     public function decode(string $data): array
     {

src/Decoder/TypeDecoderInterface.php

@@ -13,7 +13,7 @@ public function getContentType(): string;
     /**
      * @throws DeserializerRuntimeException
      *
-     * @return array<mixed>
+     * @return array<int|string, array|string|float|int|bool|null>
      */
     public function decode(string $data): array;
 }

src/Decoder/UrlEncodedTypeDecoder.php

@@ -16,7 +16,7 @@ public function getContentType(): string
     /**
      * @throws DeserializerRuntimeException
      *
-     * @return array<mixed>
+     * @return array<int|string, array|string|float|int|bool|null>
      */
     public function decode(string $data): array
     {
@@ -30,6 +30,11 @@ public function decode(string $data): array
         return $this->fixValues($rawData);
     }
 
+    /**
+     * @param array<int|string, array|string|float|int|bool|null> $rawData
+     *
+     * @return array<int|string, array|string|float|int|bool|null>
+     */
     private function fixValues(array $rawData): array
     {
         $data = [];
@@ -45,7 +50,7 @@ private function fixValues(array $rawData): array
     }
 
     /**
-     * @return mixed
+     * @return string|float|int|bool|null
      */
     private function fixValue(string $value)
     {