Added Symfony 5 support (#3)

onmoon · Nov 12, 2020 · 97dc573 · 97dc573
1 parent 993b55f
commit 97dc573
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 33 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "require": {
         "php": "^7.4",
         "thecodingmachine/safe": "^1.1",
-        "symfony/property-info": "^4.0"
+        "symfony/property-info": "^4.0|^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -34,7 +34,7 @@
         "all": "composer stan && composer test && composer cs && composer sec"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^7.0",
+        "doctrine/coding-standard": "^8.2",
         "phpstan/phpstan": "^0.12.19",
         "phpunit/phpunit": "^9.1",
         "sensiolabs/security-checker": "^6.0",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         colors="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         bootstrap="./tests/bootstrap.php"
->
-    <testsuites>
-        <testsuite name="OnMoon Dto Mapper Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" colors="true" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" bootstrap="./tests/bootstrap.php">
+  <coverage>
+    <include>
+      <directory>./src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="OnMoon Dto Mapper Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/src/DtoMapper.php b/src/DtoMapper.php
@@ -25,6 +25,7 @@
 use Safe\Exceptions\VarException;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
+
 use function array_key_exists;
 use function array_map;
 use function class_exists;
@@ -171,7 +172,7 @@ private function getPropertyValue($rawValue, ReflectionProperty $property, $from
                 throw CannotMapToDto::becausePhpDocIsCorrupt($property->getName(), $className);
             }
 
-            $itemClassName = $docIterableType->getClassName()??$docIterableType->getBuiltinType();
+            $itemClassName = $docIterableType->getClassName() ?? $docIterableType->getBuiltinType();
             $isBuiltIn     = ($docIterableType->getClassName() === null);
 
             $result = [];
@@ -238,9 +239,13 @@ private function getNotIterableValue($rawValue, string $typeName, bool $isBuiltI
      */
     private function getValue($object, string $item)
     {
-        if (((is_array($object) || $object instanceof ArrayObject) &&
-                (isset($object[$item]) || array_key_exists($item, (array) $object)))
-            || ($object instanceof ArrayAccess && isset($object[$item]))
+        if (
+            ((is_array($object) ||
+            $object instanceof ArrayObject) &&
+                (isset($object[$item]) ||
+                array_key_exists($item, (array) $object))) ||
+            ($object instanceof ArrayAccess &&
+            isset($object[$item]))
         ) {
             return $object[$item];
         }
@@ -339,7 +344,7 @@ static function (string $value) {
         return $ret;
     }
 
-    private static function strToLowerEn(string $str) : string
+    private static function strToLowerEn(string $str): string
     {
         return strtr($str, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
     }

diff --git a/src/Exception/CannotMapToDto.php b/src/Exception/CannotMapToDto.php
@@ -8,7 +8,7 @@
 
 class CannotMapToDto extends DtoMapperError
 {
-    public static function becausePhpDocIsNotReadable(string $name, string $class) : self
+    public static function becausePhpDocIsNotReadable(string $name, string $class): self
     {
         return new self(
             sprintf(
@@ -19,7 +19,7 @@ public static function becausePhpDocIsNotReadable(string $name, string $class) :
         );
     }
 
-    public static function becausePhpDocIsMultiple(string $name, string $class) : self
+    public static function becausePhpDocIsMultiple(string $name, string $class): self
     {
         return new self(
             sprintf(
@@ -30,7 +30,7 @@ public static function becausePhpDocIsMultiple(string $name, string $class) : se
         );
     }
 
-    public static function becausePhpDocIsNotAnArray(string $name, string $class) : self
+    public static function becausePhpDocIsNotAnArray(string $name, string $class): self
     {
         return new self(
             sprintf(
@@ -41,7 +41,7 @@ public static function becausePhpDocIsNotAnArray(string $name, string $class) :
         );
     }
 
-    public static function becausePhpDocIsCorrupt(string $name, string $class) : self
+    public static function becausePhpDocIsCorrupt(string $name, string $class): self
     {
         return new self(
             sprintf(
@@ -52,7 +52,7 @@ public static function becausePhpDocIsCorrupt(string $name, string $class) : sel
         );
     }
 
-    public static function becauseNoPhpType(string $name, string $class) : self
+    public static function becauseNoPhpType(string $name, string $class): self
     {
         return new self(
             sprintf(
@@ -63,7 +63,7 @@ public static function becauseNoPhpType(string $name, string $class) : self
         );
     }
 
-    public static function becauseClassDoesNotExist(string $childClass, string $name, string $class) : self
+    public static function becauseClassDoesNotExist(string $childClass, string $name, string $class): self
     {
         return new self(
             sprintf(
@@ -75,7 +75,7 @@ public static function becauseClassDoesNotExist(string $childClass, string $name
         );
     }
 
-    public static function becauseRootClassDoesNotExist(string $class) : self
+    public static function becauseRootClassDoesNotExist(string $class): self
     {
         return new self(
             sprintf(

diff --git a/src/Exception/MapperReturnedNotAString.php b/src/Exception/MapperReturnedNotAString.php
@@ -5,6 +5,7 @@
 namespace OnMoon\DtoMapper\Exception;
 
 use Safe\Exceptions\StringsException;
+
 use function Safe\sprintf;
 
 class MapperReturnedNotAString extends DtoMapperError

diff --git a/src/Exception/NotADateTimeValue.php b/src/Exception/NotADateTimeValue.php
@@ -5,6 +5,7 @@
 namespace OnMoon\DtoMapper\Exception;
 
 use Safe\Exceptions\StringsException;
+
 use function Safe\sprintf;
 
 class NotADateTimeValue extends DtoMapperError

diff --git a/src/Exception/NotAnArrayValue.php b/src/Exception/NotAnArrayValue.php
@@ -5,6 +5,7 @@
 namespace OnMoon\DtoMapper\Exception;
 
 use Safe\Exceptions\StringsException;
+
 use function Safe\sprintf;
 
 class NotAnArrayValue extends DtoMapperError

diff --git a/src/Exception/UnexpectedNullValue.php b/src/Exception/UnexpectedNullValue.php
@@ -5,6 +5,7 @@
 namespace OnMoon\DtoMapper\Exception;
 
 use Safe\Exceptions\StringsException;
+
 use function Safe\sprintf;
 
 class UnexpectedNullValue extends DtoMapperError

diff --git a/src/Exception/UnexpectedScalarValue.php b/src/Exception/UnexpectedScalarValue.php
@@ -5,6 +5,7 @@
 namespace OnMoon\DtoMapper\Exception;
 
 use Safe\Exceptions\StringsException;
+
 use function Safe\sprintf;
 
 class UnexpectedScalarValue extends DtoMapperError