Merge branch '4.4' into 5.2

derrabus · derrabus · commit 0afb2cb761dc · 2021-02-22T07:48:33.000+01:00
* 4.4:
  [Form] Ignoring invalid forms from delete_empty behavior in CollectionType
  Add Symfony Armenian Translations
  cs fix
  Add different header notations to tests
diff --git a/Compiler/ResolveInstanceofConditionalsPass.php b/Compiler/ResolveInstanceofConditionalsPass.php
@@ -73,7 +73,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
         $parent = $definition instanceof ChildDefinition ? $definition->getParent() : null;
 
         foreach ($conditionals as $interface => $instanceofDefs) {
-            if ($interface !== $class && !(null === $reflectionClass ? $reflectionClass = ($container->getReflectionClass($class, false) ?: false) : $reflectionClass)) {
+            if ($interface !== $class && !($reflectionClass ?? $reflectionClass = $container->getReflectionClass($class, false) ?: false)) {
                 continue;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi`
`73`	`73`	`$parent = $definition instanceof ChildDefinition ? $definition->getParent() : null;`
`74`	`74`
`75`	`75`	`foreach ($conditionals as $interface => $instanceofDefs) {`
`76`		`- if ($interface !== $class && !(null === $reflectionClass ? $reflectionClass = ($container->getReflectionClass($class, false) ?: false) : $reflectionClass)) {`
	`76`	`+ if ($interface !== $class && !($reflectionClass ?? $reflectionClass = $container->getReflectionClass($class, false) ?: false)) {`
`77`	`77`	`continue;`
`78`	`78`	`}`
`79`	`79`