CS fixes

nicolas-grekas · nicolas-grekas · commit 814d068b703e · 2022-06-27T15:16:42.000+02:00
diff --git a/Compiler/AnalyzeServiceReferencesPass.php b/Compiler/AnalyzeServiceReferencesPass.php
@@ -120,7 +120,7 @@ protected function processValue($value, $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
@@ -688,13 +688,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
@@ -111,7 +111,7 @@ public function getEnv($prefix, $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 (!file_exists($file)) {
@@ -183,7 +183,7 @@ public function getEnv($prefix, $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));
         }
 
@@ -280,7 +280,7 @@ public function getEnv($prefix, $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, \gettype($value)));
                 }
 
diff --git a/Loader/Configurator/AbstractConfigurator.php b/Loader/Configurator/AbstractConfigurator.php
@@ -82,7 +82,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
@@ -277,7 +277,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));
                     }
                 }
@@ -534,7 +534,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/ParameterBag/EnvPlaceholderParameterBag.php b/ParameterBag/EnvPlaceholderParameterBag.php
@@ -51,10 +51,10 @@ public function get($name)
             if ($this->has($name)) {
                 $defaultValue = parent::get($name);
 
-                if (null !== $defaultValue && !is_scalar($defaultValue)) { // !is_string in 5.0
+                if (null !== $defaultValue && !\is_scalar($defaultValue)) { // !is_string in 5.0
                     //throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', \gettype($defaultValue), $name));
                     throw new RuntimeException(sprintf('The default value of an env() parameter must be scalar or null, but "%s" given to "%s".', \gettype($defaultValue), $name));
-                } elseif (is_scalar($defaultValue) && !\is_string($defaultValue)) {
+                } elseif (\is_scalar($defaultValue) && !\is_string($defaultValue)) {
                     @trigger_error(sprintf('A non-string default value of an env() parameter is deprecated since 4.3, cast "%s" to string instead.', $name), \E_USER_DEPRECATED);
                 }
             }
@@ -162,10 +162,10 @@ public function resolve()
                     @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), \E_USER_DEPRECATED);
                 }
                 $this->parameters[$name] = (string) $default;
-            } elseif (null !== $default && !is_scalar($default)) { // !is_string in 5.0
+            } elseif (null !== $default && !\is_scalar($default)) { // !is_string in 5.0
                 //throw new RuntimeException(sprintf('The default value of env parameter "%s" must be a string or null, "%s" given.', $env, \gettype($default)));
                 throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, "%s" given.', $env, \gettype($default)));
-            } elseif (is_scalar($default) && !\is_string($default)) {
+            } elseif (\is_scalar($default) && !\is_string($default)) {
                 @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), \E_USER_DEPRECATED);
             }
         }
diff --git a/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php b/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
@@ -135,7 +135,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
@@ -531,7 +531,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
`@@ -120,7 +120,7 @@ protected function processValue($value, $isRoot = false)`
`120`	`120`	`$value,`
`121`	`121`	`$this->lazy \|\| ($targetDefinition && $targetDefinition->isLazy()),`
`122`	`122`	`true`
`123`		`- );`
	`123`	`+ );`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`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
`@@ -688,13 +688,13 @@ private function isTrivialInstance(Definition $definition): bool`
`688`	`688`	`if ($v instanceof Reference && $this->container->has($id = (string) $v) && $this->container->findDefinition($id)->isSynthetic()) {`
`689`	`689`	`continue;`
`690`	`690`	`}`
`691`		`- if (!is_scalar($v) \|\| $this->dumpValue($v) !== $this->dumpValue($v, false)) {`
	`691`	`+ if (!\is_scalar($v) \|\| $this->dumpValue($v) !== $this->dumpValue($v, false)) {`
`692`	`692`	`return false;`
`693`	`693`	`}`
`694`	`694`	`}`
`695`	`695`	`} elseif ($arg instanceof Reference && $this->container->has($id = (string) $arg) && $this->container->findDefinition($id)->isSynthetic()) {`
`696`	`696`	`continue;`
`697`		`- } elseif (!is_scalar($arg) \|\| $this->dumpValue($arg) !== $this->dumpValue($arg, false)) {`
	`697`	`+ } elseif (!\is_scalar($arg) \|\| $this->dumpValue($arg) !== $this->dumpValue($arg, false)) {`
`698`	`698`	`return false;`
`699`	`699`	`}`
`700`	`700`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if ('file' === $prefix \|\| 'require' === $prefix) {`
`114`		`- if (!is_scalar($file = $getEnv($name))) {`
	`114`	`+ if (!\is_scalar($file = $getEnv($name))) {`
`115`	`115`	`throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name));`
`116`	`116`	`}`
`117`	`117`	`if (!file_exists($file)) {`
`@@ -183,7 +183,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`183`	`183`	`return null;`
`184`	`184`	`}`
`185`	`185`
`186`		`- if (!is_scalar($env)) {`
	`186`	`+ if (!\is_scalar($env)) {`
`187`	`187`	`throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));`
`188`	`188`	`}`
`189`	`189`
`@@ -280,7 +280,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`280`	`280`	`$value = $this->container->getParameter($match[1]);`
`281`	`281`	`}`
`282`	`282`
`283`		`- if (!is_scalar($value)) {`
	`283`	`+ if (!\is_scalar($value)) {`
`284`	`284`	`throw new RuntimeException(sprintf('Parameter "%s" found when resolving env var "%s" must be scalar, "%s" given.', $match[1], $name, \gettype($value)));`
`285`	`285`	`}`
`286`	`286`
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
`@@ -277,7 +277,7 @@ private function parseDefaults(array &$content, string $file): array`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`foreach ($tag as $attribute => $value) {`
`280`		`- if (!is_scalar($value) && null !== $value) {`
	`280`	`+ if (!\is_scalar($value) && null !== $value) {`
`281`	`281`	`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));`
`282`	`282`	`}`
`283`	`283`	`}`
`@@ -534,7 +534,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`foreach ($tag as $attribute => $value) {`
`537`		`- if (!is_scalar($value) && null !== $value) {`
	`537`	`+ if (!\is_scalar($value) && null !== $value) {`
`538`	`538`	`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));`
`539`	`539`	`}`
`540`	`540`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ public function get($name)`
`51`	`51`	`if ($this->has($name)) {`
`52`	`52`	`$defaultValue = parent::get($name);`
`53`	`53`
`54`		`- if (null !== $defaultValue && !is_scalar($defaultValue)) { // !is_string in 5.0`
	`54`	`+ if (null !== $defaultValue && !\is_scalar($defaultValue)) { // !is_string in 5.0`
`55`	`55`	`//throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', \gettype($defaultValue), $name));`
`56`	`56`	`throw new RuntimeException(sprintf('The default value of an env() parameter must be scalar or null, but "%s" given to "%s".', \gettype($defaultValue), $name));`
`57`		`- } elseif (is_scalar($defaultValue) && !\is_string($defaultValue)) {`
	`57`	`+ } elseif (\is_scalar($defaultValue) && !\is_string($defaultValue)) {`
`58`	`58`	`@trigger_error(sprintf('A non-string default value of an env() parameter is deprecated since 4.3, cast "%s" to string instead.', $name), \E_USER_DEPRECATED);`
`59`	`59`	`}`
`60`	`60`	`}`
`@@ -162,10 +162,10 @@ public function resolve()`
`162`	`162`	`@trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), \E_USER_DEPRECATED);`
`163`	`163`	`}`
`164`	`164`	`$this->parameters[$name] = (string) $default;`
`165`		`- } elseif (null !== $default && !is_scalar($default)) { // !is_string in 5.0`
	`165`	`+ } elseif (null !== $default && !\is_scalar($default)) { // !is_string in 5.0`
`166`	`166`	`//throw new RuntimeException(sprintf('The default value of env parameter "%s" must be a string or null, "%s" given.', $env, \gettype($default)));`
`167`	`167`	`throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, "%s" given.', $env, \gettype($default)));`
`168`		`- } elseif (is_scalar($default) && !\is_string($default)) {`
	`168`	`+ } elseif (\is_scalar($default) && !\is_string($default)) {`
`169`	`169`	`@trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), \E_USER_DEPRECATED);`
`170`	`170`	`}`
`171`	`171`	`}`