[minor] SCA

kalessil · fabpot · commit dec98a8d0c6a · 2018-06-22T08:03:15.000+02:00
diff --git a/Loader/Configurator/DefaultsConfigurator.php b/Loader/Configurator/DefaultsConfigurator.php
@@ -34,12 +34,12 @@ class DefaultsConfigurator extends AbstractServiceConfigurator
      */
     final public function tag(string $name, array $attributes = array())
     {
-        if (!is_string($name) || '' === $name) {
+        if ('' === $name) {
             throw new InvalidArgumentException('The tag name in "_defaults" must be a non-empty string.');
         }
 
         foreach ($attributes as $attribute => $value) {
-            if (!is_scalar($value) && null !== $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));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,12 @@ class DefaultsConfigurator extends AbstractServiceConfigurator`
`34`	`34`	`*/`
`35`	`35`	`final public function tag(string $name, array $attributes = array())`
`36`	`36`	`{`
`37`		`- if (!is_string($name) \|\| '' === $name) {`
	`37`	`+ if ('' === $name) {`
`38`	`38`	`throw new InvalidArgumentException('The tag name in "_defaults" must be a non-empty string.');`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`foreach ($attributes as $attribute => $value) {`
`42`		`- if (!is_scalar($value) && null !== $value) {`
	`42`	`+ if (null !== $value && !is_scalar($value)) {`
`43`	`43`	`throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type.', $name, $attribute));`
`44`	`44`	`}`
`45`	`45`	`}`