minor symfony#42141 [Validator] Backport type fixes (derrabus)

derrabus · derrabus · commit 76d41cd273e9 · 2021-07-15T23:35:37.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Validator] Backport type fixes | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | N/A | Tickets | N/A | License | MIT | Doc PR | N/A Backports from symfony#42138. Commits ------- f9bb7ba [Validator] Backport type fixes
diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php
@@ -33,18 +33,18 @@ class ConstraintViolation implements ConstraintViolationInterface
      * Creates a new constraint violation.
      *
      * @param string|\Stringable $message         The violation message as a string or a stringable object
-     * @param string             $messageTemplate The raw violation message
+     * @param string|null        $messageTemplate The raw violation message
      * @param array              $parameters      The parameters to substitute in the
      *                                            raw violation message
      * @param mixed              $root            The value originally passed to the
      *                                            validator
-     * @param string             $propertyPath    The property path from the root
+     * @param string|null        $propertyPath    The property path from the root
      *                                            value to the invalid value
      * @param mixed              $invalidValue    The invalid value that caused this
      *                                            violation
      * @param int|null           $plural          The number for determining the plural
      *                                            form when translating the message
-     * @param mixed              $code            The error code of the violation
+     * @param string|null        $code            The error code of the violation
      * @param Constraint|null    $constraint      The constraint whose validation
      *                                            caused the violation
      * @param mixed              $cause           The cause of the violation
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php
@@ -56,7 +56,7 @@ class ExecutionContext implements ExecutionContextInterface
     private $translator;
 
     /**
-     * @var string
+     * @var string|null
      */
     private $translationDomain;
 
@@ -112,21 +112,21 @@ class ExecutionContext implements ExecutionContextInterface
     /**
      * Stores which objects have been validated in which group.
      *
-     * @var array
+     * @var bool[][]
      */
     private $validatedObjects = [];
 
     /**
      * Stores which class constraint has been validated for which object.
      *
-     * @var array
+     * @var bool[]
      */
     private $validatedConstraints = [];
 
     /**
      * Stores which objects have been initialized.
      *
-     * @var array
+     * @var bool[]
      */
     private $initializedObjects;
     private $cachedObjectsRefs;
diff --git a/src/Symfony/Component/Validator/Validator/LazyProperty.php b/src/Symfony/Component/Validator/Validator/LazyProperty.php
@@ -27,6 +27,6 @@ public function __construct(\Closure $propertyValueCallback)
 
     public function getPropertyValue()
     {
-        return \call_user_func($this->propertyValueCallback);
+        return ($this->propertyValueCallback)();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ public function __construct(\Closure $propertyValueCallback)`
`27`	`27`
`28`	`28`	`public function getPropertyValue()`
`29`	`29`	`{`
`30`		`- return \call_user_func($this->propertyValueCallback);`
	`30`	`+ return ($this->propertyValueCallback)();`
`31`	`31`	`}`
`32`	`32`	`}`