Merge branch '5.3' into 5.4

derrabus · derrabus · commit 5640f8620023 · 2021-11-04T17:48:04.000+01:00
* 5.3:
  [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait`
  Fix CS
  [Intl] Update the ICU data to 70.1
  Default access_decision_manager.strategy option with merge.

Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/Extension/Validator/ViolationMapper/ViolationMapper.php b/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -57,7 +57,7 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form
         $match = false;
 
         // Don't create a ViolationPath instance for empty property paths
-        if (\strlen($violation->getPropertyPath()) > 0) {
+        if ('' !== $violation->getPropertyPath()) {
             $violationPath = new ViolationPath($violation->getPropertyPath());
             $relativePath = $this->reconstructPath($violationPath, $form);
         }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form`
`57`	`57`	`$match = false;`
`58`	`58`
`59`	`59`	`// Don't create a ViolationPath instance for empty property paths`
`60`		`- if (\strlen($violation->getPropertyPath()) > 0) {`
	`60`	`+ if ('' !== $violation->getPropertyPath()) {`
`61`	`61`	`$violationPath = new ViolationPath($violation->getPropertyPath());`
`62`	`62`	`$relativePath = $this->reconstructPath($violationPath, $form);`
`63`	`63`	`}`