minor #44330 Fix redundant type casts (fancyweb)

nicolas-grekas · nicolas-grekas · commit bedd09f4e810 · 2021-11-29T16:27:18.000+01:00
This PR was merged into the 5.3 branch. Discussion ---------- Fix redundant type casts | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Continuation of #44274 on 5.3 Commits ------- 4243335 Fix redundant type casts
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -75,7 +75,7 @@ public static function createChoiceLabel(object $choice): string
      */
     public static function createChoiceName(object $choice, $key, string $value): string
     {
-        return str_replace('-', '_', (string) $value);
+        return str_replace('-', '_', $value);
     }
 
     /**
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
@@ -107,7 +107,7 @@ private function __construct(array $thresholds = [], $regex = '', $verboseOutput
             if (!isset($this->verboseOutput[$group])) {
                 throw new \InvalidArgumentException(sprintf('Unsupported verbosity group "%s", expected one of "%s".', $group, implode('", "', array_keys($this->verboseOutput))));
             }
-            $this->verboseOutput[$group] = (bool) $status;
+            $this->verboseOutput[$group] = $status;
         }
 
         if ($generateBaseline && !$baselineFile) {
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void
 
     protected function renderForm(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+        return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = []): string
@@ -68,42 +68,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = []):
             $vars += ['label' => $label];
         }
 
-        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
     protected function renderHelp(FormView $view): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+        return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
     protected function renderWidget(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
     protected function renderStart(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+        return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
     protected function renderEnd(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+        return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
     protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true): void
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php
@@ -111,7 +111,7 @@ public function testMoneyWidgetInIso()
 
     protected function renderForm(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+        return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = []): string
@@ -120,42 +120,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = []):
             $vars += ['label' => $label];
         }
 
-        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
     protected function renderHelp(FormView $view): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+        return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
     protected function renderWidget(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
     protected function renderStart(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+        return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
     protected function renderEnd(FormView $view, array $vars = []): string
     {
-        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+        return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
     protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true): void
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
@@ -105,7 +105,7 @@ public function setHidden(bool $hidden)
             throw new LogicException('A hidden question cannot use the autocompleter.');
         }
 
-        $this->hidden = (bool) $hidden;
+        $this->hidden = $hidden;
 
         return $this;
     }
@@ -127,7 +127,7 @@ public function isHiddenFallback()
      */
     public function setHiddenFallback(bool $fallback)
     {
-        $this->hiddenFallback = (bool) $fallback;
+        $this->hiddenFallback = $fallback;
 
         return $this;
     }
@@ -230,11 +230,8 @@ public function getValidator()
      */
     public function setMaxAttempts(?int $attempts)
     {
-        if (null !== $attempts) {
-            $attempts = (int) $attempts;
-            if ($attempts < 1) {
-                throw new InvalidArgumentException('Maximum number of attempts must be a positive value.');
-            }
+        if (null !== $attempts && $attempts < 1) {
+            throw new InvalidArgumentException('Maximum number of attempts must be a positive value.');
         }
 
         $this->attempts = $attempts;
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -146,7 +146,7 @@ public function setDecoratedService(?string $id, string $renamedId = null, int $
         if (null === $id) {
             $this->decoratedService = null;
         } else {
-            $this->decoratedService = [$id, $renamedId, (int) $priority];
+            $this->decoratedService = [$id, $renamedId, $priority];
 
             if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
                 $this->decoratedService[] = $invalidBehavior;
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -109,7 +109,7 @@ public function set(string $name, $value)
      */
     public function has(string $name)
     {
-        return \array_key_exists((string) $name, $this->parameters);
+        return \array_key_exists($name, $this->parameters);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
@@ -68,7 +68,7 @@ public function setTheme(FormView $view, $themes, bool $useDefaultThemes = true)
 
         // Do not cast, as casting turns objects into arrays of properties
         $this->themes[$cacheKey] = \is_array($themes) ? $themes : [$themes];
-        $this->useDefaultThemes[$cacheKey] = (bool) $useDefaultThemes;
+        $this->useDefaultThemes[$cacheKey] = $useDefaultThemes;
 
         // Unset instead of resetting to an empty array, in order to allow
         // implementations (like TwigRendererEngine) to check whether $cacheKey
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -66,7 +66,7 @@ public function createNamedBuilder(string $name, string $type = FormType::class,
 
         $type = $this->registry->getType($type);
 
-        $builder = $type->createBuilder($this, (string) $name, $options);
+        $builder = $type->createBuilder($this, $name, $options);
 
         // Explicitly call buildForm() in order to be able to override either
         // createBuilder() or buildForm() in the resolved form type
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php
@@ -72,7 +72,7 @@ public function escape(string $subject, string $ignore = '', int $flags = 0)
         $value = ldap_escape($subject, $ignore, $flags);
 
         // Per RFC 4514, leading/trailing spaces should be encoded in DNs, as well as carriage returns.
-        if ((int) $flags & \LDAP_ESCAPE_DN) {
+        if ($flags & \LDAP_ESCAPE_DN) {
             if (!empty($value) && ' ' === $value[0]) {
                 $value = '\\20'.substr($value, 1);
             }
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -455,7 +455,7 @@ protected function computeFallbackLocales(string $locale)
      */
     protected function assertValidLocale(string $locale)
     {
-        if (!preg_match('/^[a-z0-9@_\\.\\-]*$/i', (string) $locale)) {
+        if (!preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) {
             throw new InvalidArgumentException(sprintf('Invalid "%s" locale.', $locale));
         }
     }
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
@@ -67,7 +67,7 @@ protected function addNamespaceAlias(string $alias, string $namespace)
     protected function newConstraint(string $name, $options = null)
     {
         if (str_contains($name, '\\') && class_exists($name)) {
-            $className = (string) $name;
+            $className = $name;
         } elseif (str_contains($name, ':')) {
             [$prefix, $className] = explode(':', $name, 2);
 
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -207,7 +207,7 @@ public function __toString()
     public function withMaxDepth(int $maxDepth)
     {
         $data = clone $this;
-        $data->maxDepth = (int) $maxDepth;
+        $data->maxDepth = $maxDepth;
 
         return $data;
     }
@@ -220,7 +220,7 @@ public function withMaxDepth(int $maxDepth)
     public function withMaxItemsPerDepth(int $maxItemsPerDepth)
     {
         $data = clone $this;
-        $data->maxItemsPerDepth = (int) $maxItemsPerDepth;
+        $data->maxItemsPerDepth = $maxItemsPerDepth;
 
         return $data;
     }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static function createChoiceLabel(object $choice): string`
`75`	`75`	`*/`
`76`	`76`	`public static function createChoiceName(object $choice, $key, string $value): string`
`77`	`77`	`{`
`78`		`- return str_replace('-', '_', (string) $value);`
	`78`	`+ return str_replace('-', '_', $value);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private function __construct(array $thresholds = [], $regex = '', $verboseOutput`
`107`	`107`	`if (!isset($this->verboseOutput[$group])) {`
`108`	`108`	`throw new \InvalidArgumentException(sprintf('Unsupported verbosity group "%s", expected one of "%s".', $group, implode('", "', array_keys($this->verboseOutput))));`
`109`	`109`	`}`
`110`		`- $this->verboseOutput[$group] = (bool) $status;`
	`110`	`+ $this->verboseOutput[$group] = $status;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if ($generateBaseline && !$baselineFile) {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected function setUp(): void`
`59`	`59`
`60`	`60`	`protected function renderForm(FormView $view, array $vars = []): string`
`61`	`61`	`{`
`62`		`- return (string) $this->renderer->renderBlock($view, 'form', $vars);`
	`62`	`+ return $this->renderer->renderBlock($view, 'form', $vars);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`protected function renderLabel(FormView $view, $label = null, array $vars = []): string`
`@@ -68,42 +68,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = []):`
`68`	`68`	`$vars += ['label' => $label];`
`69`	`69`	`}`
`70`	`70`
`71`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
	`71`	`+ return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`protected function renderHelp(FormView $view): string`
`75`	`75`	`{`
`76`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
	`76`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`protected function renderErrors(FormView $view): string`
`80`	`80`	`{`
`81`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'errors');`
	`81`	`+ return $this->renderer->searchAndRenderBlock($view, 'errors');`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`protected function renderWidget(FormView $view, array $vars = []): string`
`85`	`85`	`{`
`86`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
	`86`	`+ return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`protected function renderRow(FormView $view, array $vars = []): string`
`90`	`90`	`{`
`91`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
	`91`	`+ return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`protected function renderRest(FormView $view, array $vars = []): string`
`95`	`95`	`{`
`96`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
	`96`	`+ return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`protected function renderStart(FormView $view, array $vars = []): string`
`100`	`100`	`{`
`101`		`- return (string) $this->renderer->renderBlock($view, 'form_start', $vars);`
	`101`	`+ return $this->renderer->renderBlock($view, 'form_start', $vars);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`protected function renderEnd(FormView $view, array $vars = []): string`
`105`	`105`	`{`
`106`		`- return (string) $this->renderer->renderBlock($view, 'form_end', $vars);`
	`106`	`+ return $this->renderer->renderBlock($view, 'form_end', $vars);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true): void`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function testMoneyWidgetInIso()`
`111`	`111`
`112`	`112`	`protected function renderForm(FormView $view, array $vars = []): string`
`113`	`113`	`{`
`114`		`- return (string) $this->renderer->renderBlock($view, 'form', $vars);`
	`114`	`+ return $this->renderer->renderBlock($view, 'form', $vars);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`protected function renderLabel(FormView $view, $label = null, array $vars = []): string`
`@@ -120,42 +120,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = []):`
`120`	`120`	`$vars += ['label' => $label];`
`121`	`121`	`}`
`122`	`122`
`123`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
	`123`	`+ return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`protected function renderHelp(FormView $view): string`
`127`	`127`	`{`
`128`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
	`128`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`protected function renderErrors(FormView $view): string`
`132`	`132`	`{`
`133`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'errors');`
	`133`	`+ return $this->renderer->searchAndRenderBlock($view, 'errors');`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`protected function renderWidget(FormView $view, array $vars = []): string`
`137`	`137`	`{`
`138`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
	`138`	`+ return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`protected function renderRow(FormView $view, array $vars = []): string`
`142`	`142`	`{`
`143`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
	`143`	`+ return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`protected function renderRest(FormView $view, array $vars = []): string`
`147`	`147`	`{`
`148`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
	`148`	`+ return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`protected function renderStart(FormView $view, array $vars = []): string`
`152`	`152`	`{`
`153`		`- return (string) $this->renderer->renderBlock($view, 'form_start', $vars);`
	`153`	`+ return $this->renderer->renderBlock($view, 'form_start', $vars);`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`protected function renderEnd(FormView $view, array $vars = []): string`
`157`	`157`	`{`
`158`		`- return (string) $this->renderer->renderBlock($view, 'form_end', $vars);`
	`158`	`+ return $this->renderer->renderBlock($view, 'form_end', $vars);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true): void`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function setHidden(bool $hidden)`
`105`	`105`	`throw new LogicException('A hidden question cannot use the autocompleter.');`
`106`	`106`	`}`
`107`	`107`
`108`		`- $this->hidden = (bool) $hidden;`
	`108`	`+ $this->hidden = $hidden;`
`109`	`109`
`110`	`110`	`return $this;`
`111`	`111`	`}`
`@@ -127,7 +127,7 @@ public function isHiddenFallback()`
`127`	`127`	`*/`
`128`	`128`	`public function setHiddenFallback(bool $fallback)`
`129`	`129`	`{`
`130`		`- $this->hiddenFallback = (bool) $fallback;`
	`130`	`+ $this->hiddenFallback = $fallback;`
`131`	`131`
`132`	`132`	`return $this;`
`133`	`133`	`}`
`@@ -230,11 +230,8 @@ public function getValidator()`
`230`	`230`	`*/`
`231`	`231`	`public function setMaxAttempts(?int $attempts)`
`232`	`232`	`{`
`233`		`- if (null !== $attempts) {`
`234`		`- $attempts = (int) $attempts;`
`235`		`- if ($attempts < 1) {`
`236`		`- throw new InvalidArgumentException('Maximum number of attempts must be a positive value.');`
`237`		`- }`
	`233`	`+ if (null !== $attempts && $attempts < 1) {`
	`234`	`+ throw new InvalidArgumentException('Maximum number of attempts must be a positive value.');`
`238`	`235`	`}`
`239`	`236`
`240`	`237`	`$this->attempts = $attempts;`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function set(string $name, $value)`
`109`	`109`	`*/`
`110`	`110`	`public function has(string $name)`
`111`	`111`	`{`
`112`		`- return \array_key_exists((string) $name, $this->parameters);`
	`112`	`+ return \array_key_exists($name, $this->parameters);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function escape(string $subject, string $ignore = '', int $flags = 0)`
`72`	`72`	`$value = ldap_escape($subject, $ignore, $flags);`
`73`	`73`
`74`	`74`	`// Per RFC 4514, leading/trailing spaces should be encoded in DNs, as well as carriage returns.`
`75`		`- if ((int) $flags & \LDAP_ESCAPE_DN) {`
	`75`	`+ if ($flags & \LDAP_ESCAPE_DN) {`
`76`	`76`	`if (!empty($value) && ' ' === $value[0]) {`
`77`	`77`	`$value = '\\20'.substr($value, 1);`
`78`	`78`	`}`