update dev dependencies

chubbyphp · Oct 3, 2021 · 58eed4d · 58eed4d
1 parent 4baf80e
commit 58eed4d
Show file tree

Hide file tree

Showing 64 changed files with 187 additions and 195 deletions.
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -12,9 +12,16 @@
 /** @var array $config */
 $config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
 
-unset ($config['rules']['final_class']);
+unset($config['rules']['final_class']);
 
-return PhpCsFixer\Config::create()
+$config['rules']['final_public_method_for_abstract_class'] = false;
+
+// drop onces code is >= 8.0
+unset($config['rules']['phpdoc_to_return_type']);
+
+$config['rules']['phpdoc_to_param_type'] = false;
+
+return (new PhpCsFixer\Config)
     ->setIndent($config['indent'])
     ->setLineEnding($config['lineEnding'])
     ->setRules($config['rules'])

diff --git a/composer.json b/composer.json
@@ -21,12 +21,12 @@
         "chubbyphp/chubbyphp-laminas-config-factory": "^1.0",
         "chubbyphp/chubbyphp-mock": "^1.6",
         "doctrine/persistence": "^1.3|^2.0",
-        "infection/infection": "^0.20.2",
+        "infection/infection": "^0.25.2",
         "php-coveralls/php-coveralls": "^2.4.3",
         "phploc/phploc": "^7.0.2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^0.12.64",
-        "phpunit/phpunit": "^9.5",
+        "phpstan/phpstan": "^0.12.99",
+        "phpunit/phpunit": "^9.5.10",
         "pimple/pimple": "^3.3",
         "psr/container": "^1.0|^2.0",
         "symfony/validator": "^3.4|^4.2|^5.0"

diff --git a/phpstan.neon b/phpstan.neon
@@ -6,3 +6,9 @@ parameters:
         -
             message: '/PHPDoc tag @var for variable \$parentReflectionClass contains generic class ReflectionClass but does not specify its types\: T/'
             path: %currentWorkingDirectory%/src/Mapping/ValidationMappingProviderRegistry.php
+        -
+            message: '/Method Chubbyphp\\Validation\\Constraint\\Symfony\\ExecutionContext\:\:getObject\(\) should return object\|null but return statement is missing\./'
+            path: %currentWorkingDirectory%/src/Constraint/Symfony/ExecutionContext.php
+        -
+            message: '/Method Chubbyphp\\Validation\\Constraint\\Symfony\\ExecutionContext\:\:getClassName\(\) should return string\|null but return statement is missing\./'
+            path: %currentWorkingDirectory%/src/Constraint/Symfony/ExecutionContext.php
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
@@ -8,7 +9,12 @@
          executionOrder="random"
          processIsolation="false"
          stopOnFailure="false"
-        >
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Integration">
             <directory>./tests/Integration</directory>
@@ -17,9 +23,4 @@
             <directory>./tests/Unit</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/src/Accessor/AccessorInterface.php b/src/Accessor/AccessorInterface.php
@@ -9,11 +9,9 @@
 interface AccessorInterface
 {
     /**
-     * @param object $object
-     *
      * @throws ValidatorLogicException
      *
      * @return mixed
      */
-    public function getValue($object);
+    public function getValue(object $object);
 }
diff --git a/src/Accessor/MethodAccessor.php b/src/Accessor/MethodAccessor.php
@@ -16,13 +16,11 @@ public function __construct(string $property)
     }
 
     /**
-     * @param object $object
-     *
      * @throws ValidatorLogicException
      *
      * @return mixed
      */
-    public function getValue($object)
+    public function getValue(object $object)
     {
         $getMethodName = 'get'.ucfirst($this->property);
         $hasMethodName = 'has'.ucfirst($this->property);
@@ -41,7 +39,8 @@ public function getValue($object)
         }
 
         throw ValidatorLogicException::createMissingMethod(
-            get_class($object), [$getMethodName, $hasMethodName, $isMethodName]
+            \get_class($object),
+            [$getMethodName, $hasMethodName, $isMethodName]
         );
     }
 }
diff --git a/src/Accessor/PropertyAccessor.php b/src/Accessor/PropertyAccessor.php
@@ -17,11 +17,9 @@ public function __construct(string $property)
     }
 
     /**
-     * @param object $object
-     *
      * @return mixed
      */
-    public function getValue($object)
+    public function getValue(object $object)
     {
         $class = $this->getClass($object);
 
@@ -38,10 +36,7 @@ public function getValue($object)
         return $getter($this->property);
     }
 
-    /**
-     * @param object $object
-     */
-    private function getClass($object): string
+    private function getClass(object $object): string
     {
         if (interface_exists('Doctrine\Persistence\Proxy') && $object instanceof Proxy) {
             if (!$object->__isInitialized()) {
@@ -54,6 +49,6 @@ private function getClass($object): string
             }
         }
 
-        return get_class($object);
+        return \get_class($object);
     }
 }
diff --git a/src/Constraint/AllConstraint.php b/src/Constraint/AllConstraint.php
@@ -45,11 +45,11 @@ public function validate(
             return [];
         }
 
-        if (!is_array($value) && !$value instanceof \Traversable) {
+        if (!\is_array($value) && !$value instanceof \Traversable) {
             return [new Error(
                 $path.'[_all]',
                 'constraint.all.invalidtype',
-                ['type' => is_object($value) ? get_class($value) : gettype($value)]
+                ['type' => \is_object($value) ? \get_class($value) : \gettype($value)]
             )];
         }
 

diff --git a/src/Constraint/ChoiceConstraint.php b/src/Constraint/ChoiceConstraint.php
@@ -39,7 +39,7 @@ public function validate(
             return [];
         }
 
-        if (!in_array($value, $this->choices, true)) {
+        if (!\in_array($value, $this->choices, true)) {
             return [
                 new Error(
                     $path,

diff --git a/src/Constraint/CoordinateArrayConstraint.php b/src/Constraint/CoordinateArrayConstraint.php
@@ -26,11 +26,11 @@ public function validate(
             return [];
         }
 
-        if (!is_array($value)) {
+        if (!\is_array($value)) {
             return [new Error(
                 $path,
                 'constraint.coordinatearray.invalidtype',
-                ['type' => is_object($value) ? get_class($value) : gettype($value)]
+                ['type' => \is_object($value) ? \get_class($value) : \gettype($value)]
             )];
         }
 

diff --git a/src/Constraint/CoordinateConstraint.php b/src/Constraint/CoordinateConstraint.php
@@ -28,11 +28,11 @@ public function validate(
             return [];
         }
 
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
+        if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
             return [new Error(
                 $path,
                 'constraint.coordinate.invalidtype',
-                ['type' => is_object($value) ? get_class($value) : gettype($value)]
+                ['type' => \is_object($value) ? \get_class($value) : \gettype($value)]
             )];
         }
 

diff --git a/src/Constraint/CountConstraint.php b/src/Constraint/CountConstraint.php
@@ -36,15 +36,15 @@ public function validate(
             return [];
         }
 
-        if (!is_array($value) && !$value instanceof \Countable) {
+        if (!\is_array($value) && !$value instanceof \Countable) {
             return [new Error(
                 $path,
                 'constraint.count.invalidtype',
-                ['type' => is_object($value) ? get_class($value) : gettype($value)]
+                ['type' => \is_object($value) ? \get_class($value) : \gettype($value)]
             )];
         }
 
-        $count = count($value);
+        $count = \count($value);
 
         if (null !== $this->min && $count < $this->min || null !== $this->max && $count > $this->max) {
             return [

diff --git a/src/Constraint/DateTimeConstraint.php b/src/Constraint/DateTimeConstraint.php
@@ -37,19 +37,19 @@ public function validate(
             return $this->validateDateTime($path, $value);
         }
 
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
+        if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
             return [new Error(
                 $path,
                 'constraint.datetime.invalidtype',
-                ['type' => is_object($value) ? get_class($value) : gettype($value)]
+                ['type' => \is_object($value) ? \get_class($value) : \gettype($value)]
             )];
         }
 
         $value = trim((string) $value);
 
-        \DateTime::createFromFormat('!'.$this->format, $value);
+        \DateTimeImmutable::createFromFormat('!'.$this->format, $value);
 
-        $dateTimeErrors = \DateTime::getLastErrors();
+        $dateTimeErrors = \DateTimeImmutable::getLastErrors();
 
         return [...$this->errorsByDateTimeLastErrors(
             $path,
@@ -72,7 +72,7 @@ public function validate(
     private function validateDateTime(string $path, \DateTimeInterface $value): array
     {
         /** @var \DateTime $expectedValue */
-        $expectedValue = \DateTime::createFromFormat(
+        $expectedValue = \DateTimeImmutable::createFromFormat(
             '!'.$this->format,
             $value->format($this->format),
             $value->getTimezone()

diff --git a/src/Constraint/Doctrine/UniqueConstraint.php b/src/Constraint/Doctrine/UniqueConstraint.php
@@ -47,7 +47,7 @@ public function validate(
 
         $criteria = $this->getCriteria($model);
 
-        $modelClass = get_class($model);
+        $modelClass = \get_class($model);
 
         if (null === $persistedModel = $this->objectManager->getRepository($modelClass)->findOneBy($criteria)) {
             return [];

diff --git a/src/Constraint/EmailConstraint.php b/src/Constraint/EmailConstraint.php
@@ -31,11 +31,11 @@ public function validate(
             return [];
         }
 
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
+        if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
             return [new Error(
                 $path,
                 'constraint.email.invalidtype',
-                ['type' => is_object($value) ? get_class($value) : gettype($value)]
+                ['type' => \is_object($value) ? \get_class($value) : \gettype($value)]
             )];
         }
 

diff --git a/src/Constraint/MapConstraint.php b/src/Constraint/MapConstraint.php
@@ -18,7 +18,7 @@ final class MapConstraint implements ConstraintInterface
     private array $constraintsByFields;
 
     /**
-     * @param array<string, ConstraintInterface|array<ConstraintInterface>> $constraintsByFields
+     * @param array<string, array<ConstraintInterface>|ConstraintInterface> $constraintsByFields
      */
     public function __construct(array $constraintsByFields = [])
     {
@@ -58,11 +58,11 @@ public function validate(
             return [];
         }
 
-        if (!is_array($value) && !$value instanceof \Traversable) {
+        if (!\is_array($value) && !$value instanceof \Traversable) {
             return [new Error(
                 $path,
                 'constraint.map.invalidtype',
-                ['type' => is_object($value) ? get_class($value) : gettype($value)]
+                ['type' => \is_object($value) ? \get_class($value) : \gettype($value)]
             )];
         }
 

diff --git a/src/Constraint/NumericConstraint.php b/src/Constraint/NumericConstraint.php
@@ -26,11 +26,11 @@ public function validate(
             return [];
         }
 
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
+        if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
             return [new Error(
                 $path,
                 'constraint.numeric.invalidtype',
-                ['type' => is_object($value) ? get_class($value) : gettype($value)]
+                ['type' => \is_object($value) ? \get_class($value) : \gettype($value)]
             )];
         }
 

diff --git a/src/Constraint/SortConstraint.php b/src/Constraint/SortConstraint.php
@@ -40,11 +40,11 @@ public function validate(
         ValidatorContextInterface $context,
         ?ValidatorInterface $validator = null
     ): array {
-        if (!is_array($sort)) {
+        if (!\is_array($sort)) {
             return [new Error(
                 $path,
                 'constraint.sort.invalidtype',
-                ['type' => is_object($sort) ? get_class($sort) : gettype($sort)]
+                ['type' => \is_object($sort) ? \get_class($sort) : \gettype($sort)]
             )];
         }
 
@@ -66,25 +66,25 @@ private function validateFieldAndOrder(string $path, string $field, $order): arr
     {
         $errors = [];
 
-        if (!in_array($field, $this->allowedFields, true)) {
+        if (!\in_array($field, $this->allowedFields, true)) {
             $errors[] = new Error(
                 $path.'.'.$field,
                 'constraint.sort.field.notallowed',
                 ['field' => $field, 'allowedFields' => $this->allowedFields]
             );
         }
 
-        if (!is_string($order)) {
+        if (!\is_string($order)) {
             $errors[] = new Error(
                 $path.'.'.$field,
                 'constraint.sort.order.invalidtype',
-                ['field' => $field, 'type' => is_object($order) ? get_class($order) : gettype($order)]
+                ['field' => $field, 'type' => \is_object($order) ? \get_class($order) : \gettype($order)]
             );
 
             return $errors;
         }
 
-        if (!in_array($order, self::ALLOWED_ORDERS, true)) {
+        if (!\in_array($order, self::ALLOWED_ORDERS, true)) {
             $errors[] = new Error(
                 $path.'.'.$field,
                 'constraint.sort.order.notallowed',

diff --git a/src/Constraint/Symfony/ConstraintViolationBuilder.php b/src/Constraint/Symfony/ConstraintViolationBuilder.php
@@ -14,7 +14,7 @@ final class ConstraintViolationBuilder implements ConstraintViolationBuilderInte
     /**
      * @var ConstraintViolationListInterface<int, ConstraintViolationInterface>
      */
-    private $violations;
+    private ConstraintViolationListInterface $violations;
 
     private string $path;
 
@@ -128,7 +128,7 @@ public function setPlural($number): self
     }
 
     /**
-     * @param string|null $code
+     * @param null|string $code
      *
      * @return ConstraintViolationBuilder
      */