Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 191d0ffb0854 · 2022-06-27T18:58:25.000+02:00
* 4.4:
  CS fixes
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43
diff --git a/Compiler/AnalyzeServiceReferencesPass.php b/Compiler/AnalyzeServiceReferencesPass.php
@@ -112,7 +112,7 @@ protected function processValue($value, bool $isRoot = false)
                     $value,
                     $this->lazy || ($targetDefinition && $targetDefinition->isLazy()),
                     true
-               );
+                );
             }
 
             return $value;
diff --git a/Compiler/CheckDefinitionValidityPass.php b/Compiler/CheckDefinitionValidityPass.php
@@ -63,7 +63,7 @@ public function process(ContainerBuilder $container)
             foreach ($definition->getTags() as $name => $tags) {
                 foreach ($tags as $attributes) {
                     foreach ($attributes as $attribute => $value) {
-                        if (!is_scalar($value) && null !== $value) {
+                        if (!\is_scalar($value) && null !== $value) {
                             throw new RuntimeException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $id, $name, $attribute));
                         }
                     }
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -719,13 +719,13 @@ private function isTrivialInstance(Definition $definition): bool
                     if ($v instanceof Reference && $this->container->has($id = (string) $v) && $this->container->findDefinition($id)->isSynthetic()) {
                         continue;
                     }
-                    if (!is_scalar($v) || $this->dumpValue($v) !== $this->dumpValue($v, false)) {
+                    if (!\is_scalar($v) || $this->dumpValue($v) !== $this->dumpValue($v, false)) {
                         return false;
                     }
                 }
             } elseif ($arg instanceof Reference && $this->container->has($id = (string) $arg) && $this->container->findDefinition($id)->isSynthetic()) {
                 continue;
-            } elseif (!is_scalar($arg) || $this->dumpValue($arg) !== $this->dumpValue($arg, false)) {
+            } elseif (!\is_scalar($arg) || $this->dumpValue($arg) !== $this->dumpValue($arg, false)) {
                 return false;
             }
         }
diff --git a/EnvVarProcessor.php b/EnvVarProcessor.php
@@ -112,7 +112,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
         }
 
         if ('file' === $prefix || 'require' === $prefix) {
-            if (!is_scalar($file = $getEnv($name))) {
+            if (!\is_scalar($file = $getEnv($name))) {
                 throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name));
             }
             if (!is_file($file)) {
@@ -184,7 +184,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
             return null;
         }
 
-        if (!is_scalar($env)) {
+        if (!\is_scalar($env)) {
             throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));
         }
 
@@ -283,7 +283,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
                     $value = $this->container->getParameter($match[1]);
                 }
 
-                if (!is_scalar($value)) {
+                if (!\is_scalar($value)) {
                     throw new RuntimeException(sprintf('Parameter "%s" found when resolving env var "%s" must be scalar, "%s" given.', $match[1], $name, get_debug_type($value)));
                 }
 
diff --git a/Loader/Configurator/AbstractConfigurator.php b/Loader/Configurator/AbstractConfigurator.php
@@ -100,7 +100,7 @@ public static function processValue($value, $allowServices = false)
 
         switch (true) {
             case null === $value:
-            case is_scalar($value):
+            case \is_scalar($value):
                 return $value;
 
             case $value instanceof ArgumentInterface:
diff --git a/Loader/Configurator/DefaultsConfigurator.php b/Loader/Configurator/DefaultsConfigurator.php
@@ -49,7 +49,7 @@ final public function tag(string $name, array $attributes = []): self
         }
 
         foreach ($attributes as $attribute => $value) {
-            if (null !== $value && !is_scalar($value)) {
+            if (null !== $value && !\is_scalar($value)) {
                 throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type.', $name, $attribute));
             }
         }
diff --git a/Loader/Configurator/Traits/TagTrait.php b/Loader/Configurator/Traits/TagTrait.php
@@ -27,7 +27,7 @@ final public function tag(string $name, array $attributes = []): self
         }
 
         foreach ($attributes as $attribute => $value) {
-            if (!is_scalar($value) && null !== $value) {
+            if (!\is_scalar($value) && null !== $value) {
                 throw new InvalidArgumentException(sprintf('A tag attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $this->id, $name, $attribute));
             }
         }
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -304,7 +304,7 @@ private function parseDefaults(array &$content, string $file): array
                 }
 
                 foreach ($tag as $attribute => $value) {
-                    if (!is_scalar($value) && null !== $value) {
+                    if (!\is_scalar($value) && null !== $value) {
                         throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in "%s". Check your YAML syntax.', $name, $attribute, $file));
                     }
                 }
@@ -616,7 +616,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa
             }
 
             foreach ($tag as $attribute => $value) {
-                if (!is_scalar($value) && null !== $value) {
+                if (!\is_scalar($value) && null !== $value) {
                     throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in "%s". Check your YAML syntax.', $id, $name, $attribute, $file));
                 }
             }
diff --git a/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php b/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
@@ -133,7 +133,7 @@ public function testProcessDoesNotErrorOnServicesThatDoNotHaveDefinitions()
             ->addArgument(new Reference('not.defined'))
             ->setPublic(true);
 
-        $container->set('not.defined', new \StdClass());
+        $container->set('not.defined', new \stdClass());
 
         $this->process($container);
 
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
@@ -609,7 +609,7 @@ public function testExtensions()
 
     public function testExtensionInPhar()
     {
-        if (\extension_loaded('suhosin') && !str_contains(ini_get('suhosin.executor.include.whitelist'), 'phar')) {
+        if (\extension_loaded('suhosin') && !str_contains(\ini_get('suhosin.executor.include.whitelist'), 'phar')) {
             $this->markTestSkipped('To run this test, add "phar" to the "suhosin.executor.include.whitelist" settings in your php.ini file.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected function processValue($value, bool $isRoot = false)`
`112`	`112`	`$value,`
`113`	`113`	`$this->lazy \|\| ($targetDefinition && $targetDefinition->isLazy()),`
`114`	`114`	`true`
`115`		`- );`
	`115`	`+ );`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function process(ContainerBuilder $container)`
`63`	`63`	`foreach ($definition->getTags() as $name => $tags) {`
`64`	`64`	`foreach ($tags as $attributes) {`
`65`	`65`	`foreach ($attributes as $attribute => $value) {`
`66`		`- if (!is_scalar($value) && null !== $value) {`
	`66`	`+ if (!\is_scalar($value) && null !== $value) {`
`67`	`67`	`throw new RuntimeException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $id, $name, $attribute));`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -719,13 +719,13 @@ private function isTrivialInstance(Definition $definition): bool`
`719`	`719`	`if ($v instanceof Reference && $this->container->has($id = (string) $v) && $this->container->findDefinition($id)->isSynthetic()) {`
`720`	`720`	`continue;`
`721`	`721`	`}`
`722`		`- if (!is_scalar($v) \|\| $this->dumpValue($v) !== $this->dumpValue($v, false)) {`
	`722`	`+ if (!\is_scalar($v) \|\| $this->dumpValue($v) !== $this->dumpValue($v, false)) {`
`723`	`723`	`return false;`
`724`	`724`	`}`
`725`	`725`	`}`
`726`	`726`	`} elseif ($arg instanceof Reference && $this->container->has($id = (string) $arg) && $this->container->findDefinition($id)->isSynthetic()) {`
`727`	`727`	`continue;`
`728`		`- } elseif (!is_scalar($arg) \|\| $this->dumpValue($arg) !== $this->dumpValue($arg, false)) {`
	`728`	`+ } elseif (!\is_scalar($arg) \|\| $this->dumpValue($arg) !== $this->dumpValue($arg, false)) {`
`729`	`729`	`return false;`
`730`	`730`	`}`
`731`	`731`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if ('file' === $prefix \|\| 'require' === $prefix) {`
`115`		`- if (!is_scalar($file = $getEnv($name))) {`
	`115`	`+ if (!\is_scalar($file = $getEnv($name))) {`
`116`	`116`	`throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name));`
`117`	`117`	`}`
`118`	`118`	`if (!is_file($file)) {`
`@@ -184,7 +184,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`184`	`184`	`return null;`
`185`	`185`	`}`
`186`	`186`
`187`		`- if (!is_scalar($env)) {`
	`187`	`+ if (!\is_scalar($env)) {`
`188`	`188`	`throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));`
`189`	`189`	`}`
`190`	`190`
`@@ -283,7 +283,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`283`	`283`	`$value = $this->container->getParameter($match[1]);`
`284`	`284`	`}`
`285`	`285`
`286`		`- if (!is_scalar($value)) {`
	`286`	`+ if (!\is_scalar($value)) {`
`287`	`287`	`throw new RuntimeException(sprintf('Parameter "%s" found when resolving env var "%s" must be scalar, "%s" given.', $match[1], $name, get_debug_type($value)));`
`288`	`288`	`}`
`289`	`289`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ final public function tag(string $name, array $attributes = []): self`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`foreach ($attributes as $attribute => $value) {`
`52`		`- if (null !== $value && !is_scalar($value)) {`
	`52`	`+ if (null !== $value && !\is_scalar($value)) {`
`53`	`53`	`throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type.', $name, $attribute));`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ final public function tag(string $name, array $attributes = []): self`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`foreach ($attributes as $attribute => $value) {`
`30`		`- if (!is_scalar($value) && null !== $value) {`
	`30`	`+ if (!\is_scalar($value) && null !== $value) {`
`31`	`31`	`throw new InvalidArgumentException(sprintf('A tag attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $this->id, $name, $attribute));`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ private function parseDefaults(array &$content, string $file): array`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`foreach ($tag as $attribute => $value) {`
`307`		`- if (!is_scalar($value) && null !== $value) {`
	`307`	`+ if (!\is_scalar($value) && null !== $value) {`
`308`	`308`	`throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in "%s". Check your YAML syntax.', $name, $attribute, $file));`
`309`	`309`	`}`
`310`	`310`	`}`
`@@ -616,7 +616,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa`
`616`	`616`	`}`
`617`	`617`
`618`	`618`	`foreach ($tag as $attribute => $value) {`
`619`		`- if (!is_scalar($value) && null !== $value) {`
	`619`	`+ if (!\is_scalar($value) && null !== $value) {`
`620`	`620`	`throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in "%s". Check your YAML syntax.', $id, $name, $attribute, $file));`
`621`	`621`	`}`
`622`	`622`	`}`
Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@ public function testExtensions()`
`609`	`609`
`610`	`610`	`public function testExtensionInPhar()`
`611`	`611`	`{`
`612`		`- if (\extension_loaded('suhosin') && !str_contains(ini_get('suhosin.executor.include.whitelist'), 'phar')) {`
	`612`	`+ if (\extension_loaded('suhosin') && !str_contains(\ini_get('suhosin.executor.include.whitelist'), 'phar')) {`
`613`	`613`	`$this->markTestSkipped('To run this test, add "phar" to the "suhosin.executor.include.whitelist" settings in your php.ini file.');`
`614`	`614`	`}`
`615`	`615`