TASK: Raise PhpStan level for Flow.Validation to 8 and adjust breakiness

Author: mficzel

Neos.Flow/Classes/Validation/Validator/AbstractCompositeValidator.php

@@ -79,6 +79,7 @@ function ($value) {
             $options
         );
         $this->validators = new \SplObjectStorage();
+        $this->validatedInstancesContainer = new \SplObjectStorage();
     }
 
     /**
@@ -113,9 +114,10 @@ public function addValidator(ValidatorInterface $validator)
      *
      * @param ValidatorInterface $validator The validator to remove
      * @throws NoSuchValidatorException
+     * @return void
      * @api
      */
-    public function removeValidator(ValidatorInterface $validator): void
+    public function removeValidator(ValidatorInterface $validator)
     {
         if (!$this->validators->contains($validator)) {
             throw new NoSuchValidatorException('Cannot remove validator because its not in the conjunction.', 1207020177);

Neos.Flow/Classes/Validation/Validator/GenericObjectValidator.php

@@ -85,9 +85,10 @@ protected function isValid($object)
     }
 
     /**
+     * @param object $object
      * @return boolean
      */
-    protected function isUninitializedProxy(object $object)
+    protected function isUninitializedProxy($object)
     {
         return ($object instanceof DoctrineProxy && $object->__isInitialized() === false);
     }
@@ -163,7 +164,7 @@ protected function checkProperty($value, $validators)
      * @return void
      * @api
      */
-    public function addPropertyValidator(string $propertyName, ValidatorInterface $validator)
+    public function addPropertyValidator($propertyName, ValidatorInterface $validator)
     {
         if (!isset($this->propertyValidators[$propertyName])) {
             /** @var \SplObjectStorage<ValidatorInterface,mixed> $storage */
@@ -179,16 +180,19 @@ public function addPropertyValidator(string $propertyName, ValidatorInterface $v
      * @param ?string $propertyName Name of the property to return validators for
      * @return ($propertyName is null ? array<string,\SplObjectStorage<ValidatorInterface,mixed>> : \SplObjectStorage<ValidatorInterface,mixed>)
      */
-    public function getPropertyValidators(?string $propertyName = null)
+    public function getPropertyValidators($propertyName = null)
     {
-        if ($propertyName !== null) {
+        if ($propertyName === null) {
+            return $this->propertyValidators;
+        }
+        if (is_string($propertyName)) {
             $propertyValidators = $this->propertyValidators[$propertyName] ?? null;
-            if (!$propertyValidators) {
-                /** @var \SplObjectStorage<ValidatorInterface,mixed> $propertyValidators */
-                $propertyValidators = new \SplObjectStorage();
+            if ($propertyValidators instanceof \SplObjectStorage) {
+                return $propertyValidators;
             }
-            return $propertyValidators;
         }
-        return $this->propertyValidators;
+        /** @var \SplObjectStorage<ValidatorInterface,mixed> $propertyValidators */
+        $propertyValidators = new \SplObjectStorage();
+        return $propertyValidators;
     }
 }

Neos.Flow/Classes/Validation/ValidatorResolver.php

@@ -187,6 +187,7 @@ public function buildMethodArgumentsValidatorConjunctions($className, $methodNam
         }
 
         if ($methodValidateAnnotations === null) {
+            /** @var Flow\Validate[] $validateAnnotations */
             $validateAnnotations = $this->reflectionService->getMethodAnnotations($className, $methodName, Flow\Validate::class);
             $methodValidateAnnotations = array_map(function ($validateAnnotation) {
                 return [
@@ -336,6 +337,7 @@ protected function buildBaseValidatorConjunction($indexKey, $targetClassName, ar
                 $needsCollectionValidator = TypeHandling::isCollectionType($propertyTargetClassName);
                 $needsObjectValidator = (!TypeHandling::isSimpleType($propertyTargetClassName) && $this->objectManager->isRegistered($propertyTargetClassName) && $this->objectManager->getScope($propertyTargetClassName) === Configuration::SCOPE_PROTOTYPE);
 
+                /** @var Flow\Validate[] $validateAnnotations */
                 $validateAnnotations = $this->reflectionService->getPropertyAnnotations($targetClassName, $classPropertyName, Flow\Validate::class);
                 foreach ($validateAnnotations as $validateAnnotation) {
                     if ($validateAnnotation->type === null) {

phpstan.neon.dist

@@ -1,6 +1,9 @@
 parameters:
     level: 8
     paths:
+        - Neos.Flow/Classes/SignalSlot
+        - Neos.Flow/Classes/Utility
+        - Neos.Flow/Classes/Validation
         - Neos.Flow.Log/Classes
         - Neos.FluidAdaptor/Classes
         - Neos.Http.Factories/Classes