[minor] SCA

kalessil · fabpot · commit afeb89fa065b · 2018-06-22T08:03:15.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php b/src/Symfony/Component/DependencyInjection/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));
             }
         }
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
@@ -28,10 +28,6 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo
      */
     public function __construct(?int $scale = 0, ?bool $grouping = false, int $roundingMode = self::ROUND_DOWN)
     {
-        if (null === $roundingMode) {
-            $roundingMode = self::ROUND_DOWN;
-        }
-
         parent::__construct(0, $grouping, $roundingMode);
     }
 
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php
@@ -29,7 +29,7 @@ public function __construct(string $class, string $username, string $series, str
         if (empty($class)) {
             throw new \InvalidArgumentException('$class must not be empty.');
         }
-        if ('' === $username || null === $username) {
+        if ('' === $username) {
             throw new \InvalidArgumentException('$username must not be empty.');
         }
         if (empty($series)) {
diff --git a/src/Symfony/Component/Security/Core/User/LdapUserProvider.php b/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
@@ -37,10 +37,6 @@ class LdapUserProvider implements UserProviderInterface
 
     public function __construct(LdapInterface $ldap, string $baseDn, string $searchDn = null, string $searchPassword = null, array $defaultRoles = array(), string $uidKey = 'sAMAccountName', string $filter = '({uid_key}={username})', string $passwordAttribute = null)
     {
-        if (null === $uidKey) {
-            $uidKey = 'sAMAccountName';
-        }
-
         $this->ldap = $ldap;
         $this->baseDn = $baseDn;
         $this->searchDn = $searchDn;
diff --git a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php
@@ -45,7 +45,7 @@ protected function extractFiles($resource)
 
     private function toSplFileInfo(string $file): \SplFileInfo
     {
-        return ($file instanceof \SplFileInfo) ? $file : new \SplFileInfo($file);
+        return new \SplFileInfo($file);
     }
 
     /**

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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,6 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo`
`28`	`28`	`*/`
`29`	`29`	`public function __construct(?int $scale = 0, ?bool $grouping = false, int $roundingMode = self::ROUND_DOWN)`
`30`	`30`	`{`
`31`		`- if (null === $roundingMode) {`
`32`		`- $roundingMode = self::ROUND_DOWN;`
`33`		`- }`
`34`		`-`
`35`	`31`	`parent::__construct(0, $grouping, $roundingMode);`
`36`	`32`	`}`
`37`	`33`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(string $class, string $username, string $series, str`
`29`	`29`	`if (empty($class)) {`
`30`	`30`	`throw new \InvalidArgumentException('$class must not be empty.');`
`31`	`31`	`}`
`32`		`- if ('' === $username \|\| null === $username) {`
	`32`	`+ if ('' === $username) {`
`33`	`33`	`throw new \InvalidArgumentException('$username must not be empty.');`
`34`	`34`	`}`
`35`	`35`	`if (empty($series)) {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function extractFiles($resource)`
`45`	`45`
`46`	`46`	`private function toSplFileInfo(string $file): \SplFileInfo`
`47`	`47`	`{`
`48`		`- return ($file instanceof \SplFileInfo) ? $file : new \SplFileInfo($file);`
	`48`	`+ return new \SplFileInfo($file);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`