Merge branch '4.4' into 5.3

* 4.4:
  fix cs
  Update validators.lv.xlf
  Update validators.uz.xlf
  [ExpressionLanguage] Fix LexerTest number types
  [Process] intersect with getenv() to populate default envs
  Improve CI script a bit
  [Cache] fix dbindex Redis
  Never rely on dynamic properties

Author: nicolas-grekas

CHANGELOG.md

@@ -163,7 +163,7 @@ CHANGELOG
 3.2.0
 -----
 
- * deprecated `Tests\Constraints\AbstractContraintValidatorTest` in favor of `Test\ConstraintValidatorTestCase`
+ * deprecated `Tests\Constraints\AbstractConstraintValidatorTest` in favor of `Test\ConstraintValidatorTestCase`
  * added support for PHP constants in YAML configuration files
 
 3.1.0

Constraint.php

@@ -25,8 +25,6 @@
  *
  * Constraint instances are immutable and serializable.
  *
- * @property string[] $groups The groups that the constraint belongs to
- *
  * @author Bernhard Schussek <[email protected]>
  */
 abstract class Constraint
@@ -58,6 +56,13 @@ abstract class Constraint
      */
     public $payload;
 
+    /**
+     * The groups that the constraint belongs to.
+     *
+     * @var string[]
+     */
+    public $groups;
+
     /**
      * Returns the name of the given error code.
      *
@@ -105,6 +110,8 @@ public static function getErrorName(string $errorCode)
      */
     public function __construct($options = null, array $groups = null, $payload = null)
     {
+        unset($this->groups); // enable lazy initialization
+
         $options = $this->normalizeOptions($options);
         if (null !== $groups) {
             $options['groups'] = $groups;
@@ -124,9 +131,6 @@ protected function normalizeOptions($options): array
         $missingOptions = array_flip((array) $this->getRequiredOptions());
         $knownOptions = get_class_vars(static::class);
 
-        // The "groups" option is added to the object lazily
-        $knownOptions['groups'] = true;
-
         if (\is_array($options) && isset($options['value']) && !property_exists($this, 'value')) {
             if (null === $defaultOption) {
                 throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));

Constraints/Composite.php

@@ -79,7 +79,7 @@ public function __construct($options = null)
             }
         }
 
-        if (!property_exists($this, 'groups')) {
+        if (!isset(((array) $this)['groups'])) {
             $mergedGroups = [];
 
             foreach ($nestedConstraints as $constraint) {
@@ -96,7 +96,7 @@ public function __construct($options = null)
         }
 
         foreach ($nestedConstraints as $constraint) {
-            if (property_exists($constraint, 'groups')) {
+            if (isset(((array) $constraint)['groups'])) {
                 $excessGroups = array_diff($constraint->groups, $this->groups);
 
                 if (\count($excessGroups) > 0) {
@@ -139,7 +139,7 @@ abstract protected function getCompositeOption();
      *
      * @return Constraint[]
      */
-    public function getNestedContraints()
+    public function getNestedConstraints()
     {
         /* @var Constraint[] $nestedConstraints */
         return $this->{$this->getCompositeOption()};

Mapping/ClassMetadata.php

@@ -505,8 +505,8 @@ private function checkConstraint(Constraint $constraint)
         }
 
         if ($constraint instanceof Composite) {
-            foreach ($constraint->getNestedContraints() as $nestedContraint) {
-                $this->checkConstraint($nestedContraint);
+            foreach ($constraint->getNestedConstraints() as $nestedConstraint) {
+                $this->checkConstraint($nestedConstraint);
             }
         }
     }

Mapping/MemberMetadata.php

@@ -188,8 +188,8 @@ private function checkConstraint(Constraint $constraint)
         }
 
         if ($constraint instanceof Composite) {
-            foreach ($constraint->getNestedContraints() as $nestedContraint) {
-                $this->checkConstraint($nestedContraint);
+            foreach ($constraint->getNestedConstraints() as $nestedConstraint) {
+                $this->checkConstraint($nestedConstraint);
             }
         }
     }

Resources/translations/validators.lv.xlf

@@ -268,7 +268,7 @@
             </trans-unit>
             <trans-unit id="70">
                 <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>TŠai vērtībai ir jābūt mazākai vai vienādai ar {{ compared_value }}.</target>
+                <target>Šai vērtībai ir jābūt mazākai vai vienādai ar {{ compared_value }}.</target>
             </trans-unit>
             <trans-unit id="71">
                 <source>This value should not be equal to {{ compared_value }}.</source>

Resources/translations/validators.uz.xlf

@@ -394,6 +394,14 @@
                 <source>This value is not a valid CSS color.</source>
                 <target>Bu qiymat haqiqiy CSS rangi emas.</target>
             </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Qiymat CIDR belgisiga mos kelmaydi.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Tarmoq niqobining qiymati {{ min }} va {{ max }} oralig'ida bo'lishi kerak.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>