[6.0] cs fixes

fancyweb · fancyweb · Nov 30, 2021 · Dec 2, 2021 · Dec 8, 2021 · Dec 11, 2021
commit d5534b0c13c2e5d249b480365d8fd921952d021e
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -134,8 +134,6 @@ protected function setMappingDriverConfig(array $mappingConfig, string $mappingN
     * If this is a bundle controlled mapping all the missing information can be autodetected by this method.
     *
     * Returns false when autodetection failed, an array of the completed information otherwise.
-     *
-     * @return array|false
     */
    protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, string $bundleDir = null): array|false
    {

diff --git a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
@@ -68,9 +68,6 @@ class UndefinedCallableHandler
        'workflow' => 'enable "framework.workflows"',
    ];

-    /**
-     * @return TwigFilter|false
-     */
    public static function onUndefinedFilter(string $name): TwigFilter|false
    {
        if (!isset(self::FILTER_COMPONENTS[$name])) {
@@ -80,9 +77,6 @@ public static function onUndefinedFilter(string $name): TwigFilter|false
        throw new SyntaxError(self::onUndefined($name, 'filter', self::FILTER_COMPONENTS[$name]));
    }

-    /**
-     * @return TwigFunction|false
-     */
    public static function onUndefinedFunction(string $name): TwigFunction|false
    {
        if (!isset(self::FUNCTION_COMPONENTS[$name])) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -70,8 +70,6 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface

    /**
     * Gets a container parameter by its name.
-     *
-     * @return array|bool|float|int|string|null
     */
    protected function getParameter(string $name): array|bool|float|int|string|null
    {

diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -62,8 +62,6 @@ public function getKernel(): KernelInterface

    /**
     * Gets the profile associated with the current Response.
-     *
-     * @return HttpProfile|false|null
     */
    public function getProfile(): HttpProfile|false|null
    {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
@@ -63,8 +63,6 @@ public function getParameterBag(): ParameterBagInterface

    /**
     * {@inheritdoc}
-     *
-     * @return array|bool|float|int|string|null
     */
    public function getParameter(string $name): array|bool|float|int|string|null
    {

diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -187,7 +187,6 @@ public function collect(Request $request, Response $response, \Throwable $except
                    'authenticators' => $firewallConfig->getAuthenticators(),
                ];

-
                // generate exit impersonation path from current request
                if ($this->data['impersonated'] && null !== $switchUserConfig = $firewallConfig->getSwitchUser()) {
                    $exitPath = $request->getRequestUri();

diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallAwareTrait.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallAwareTrait.php
@@ -11,7 +11,6 @@

 namespace Symfony\Bundle\SecurityBundle\Security;

-
 /**
 * Provides basic functionality for services mapped by the firewall name
 * in a container locator.

diff --git a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
@@ -55,7 +55,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
    private const DEFAULT_CACHE_TTL = 8640000;

    /**
-     * detected eviction policy used on Redis server
+     * detected eviction policy used on Redis server.
     */
    private string $redisEvictionPolicy;


diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -26,12 +26,12 @@ trait AbstractAdapterTrait
    use LoggerAwareTrait;

    /**
-     * needs to be set by class, signature is function(string <key>, mixed <value>, bool <isHit>)
+     * needs to be set by class, signature is function(string <key>, mixed <value>, bool <isHit>).
     */
    private static \Closure $createCacheItem;

    /**
-     * needs to be set by class, signature is function(array <deferred>, string <namespace>, array <&expiredIds>)
+     * needs to be set by class, signature is function(array <deferred>, string <namespace>, array <&expiredIds>).
     */
    private static \Closure $mergeByLifetime;


diff --git a/src/Symfony/Component/Cache/Traits/RedisClusterProxy.php b/src/Symfony/Component/Cache/Traits/RedisClusterProxy.php
@@ -10,8 +10,8 @@
 */

 namespace Symfony\Component\Cache\Traits;
-/**

+/**
 * @author Alessandro Chitolina <alekitto@gmail.com>
 *
 * @internal

diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -204,8 +204,6 @@ public function thenUnset(): static
    /**
     * Returns the related node.
     *
-     * @return NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
-     *
     * @throws \RuntimeException
     */
    public function end(): NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition

diff --git a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
@@ -53,8 +53,6 @@ public function denyOverwrite(bool $deny = true): static

    /**
     * Returns the related node.
-     *
-     * @return NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
     */
    public function end(): NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
    {

diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
@@ -105,8 +105,6 @@ public function setDefault(string|bool|int|float|array $default = null)

    /**
     * Returns the default value.
-     *
-     * @return string|bool|int|float|array|null
     */
    public function getDefault(): string|bool|int|float|array|null
    {

diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
@@ -187,8 +187,6 @@ public function setDefault(string|bool|int|float|array $default = null)

    /**
     * Returns the default value.
-     *
-     * @return string|bool|int|float|array|null
     */
    public function getDefault(): string|bool|int|float|array|null
    {

diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
@@ -52,8 +52,6 @@ public function getQuestion(): string

    /**
     * Returns the default answer.
-     *
-     * @return string|bool|int|float|null
     */
    public function getDefault(): string|bool|int|float|null
    {

diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -59,7 +59,7 @@ public function __construct(InputInterface $input, OutputInterface $output)
    /**
     * Formats a message as a block of text.
     */
-    public function block(string|array $messages, ?string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true)
+    public function block(string|array $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true)
    {
        $messages = \is_array($messages) ? array_values($messages) : [$messages];


diff --git a/src/Symfony/Component/CssSelector/Parser/Reader.php b/src/Symfony/Component/CssSelector/Parser/Reader.php
@@ -60,9 +60,6 @@ public function getOffset(string $string)
        return false === $position ? false : $position - $this->position;
    }

-    /**
-     * @return array|false
-     */
    public function findPattern(string $pattern): array|false
    {
        $source = substr($this->source, $this->position);

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -114,9 +114,6 @@ private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagNam
 */
 class PriorityTaggedServiceUtil
 {
-    /**
-     * @return string|int|null
-     */
    public static function getDefault(ContainerBuilder $container, string $serviceId, string $class, string $defaultMethod, string $tagName, ?string $indexAttribute, bool $checkTaggedItem): string|int|null
    {
        if (!($r = $container->getReflectionClass($class)) || (!$checkTaggedItem && !$r->hasMethod($defaultMethod))) {

diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -710,8 +710,6 @@ public function setConfigurator(string|array|Reference|null $configurator): stat

    /**
     * Gets the configurator to call after the service is fully initialized.
-     *
-     * @return string|array|null
     */
    public function getConfigurator(): string|array|null
    {

diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php
@@ -35,8 +35,6 @@ public function all(): array

    /**
     * {@inheritdoc}
-     *
-     * @return array|bool|string|int|float|null
     */
    public function get(string $name): array|bool|string|int|float|null
    {

diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
@@ -43,8 +43,6 @@ public function all(): array;
    /**
     * Gets a service container parameter.
     *
-     * @return array|bool|string|int|float|null
-     *
     * @throws ParameterNotFoundException if the parameter is not defined
     */
    public function get(string $name): array|bool|string|int|float|null;

diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -629,8 +629,6 @@ public function outerHtml(): string
     *
     * Since an XPath expression might evaluate to either a simple type or a \DOMNodeList,
     * this method will return either an array of simple types or a new Crawler instance.
-     *
-     * @return array|Crawler
     */
    public function evaluate(string $xpath): array|Crawler
    {

diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php
@@ -78,8 +78,6 @@ public function buildFinalFormTree(FormInterface $form, FormView $view);

    /**
     * Returns all collected data.
-     *
-     * @return array|Data
     */
    public function getData(): array|Data;
 }
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -727,8 +727,6 @@ public function isValid(): bool

    /**
     * Returns the button that was used to submit the form.
-     *
-     * @return FormInterface|ClickableInterface|null
     */
    public function getClickedButton(): FormInterface|ClickableInterface|null
    {

diff --git a/src/Symfony/Component/Form/Guess/ValueGuess.php b/src/Symfony/Component/Form/Guess/ValueGuess.php
@@ -32,8 +32,6 @@ public function __construct(string|int|bool|null $value, int $confidence)

    /**
     * Returns the guessed value.
-     *
-     * @return string|int|bool|null
     */
    public function getValue(): string|int|bool|null
    {

diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -23,7 +23,7 @@ class CurlHttpClientTest extends HttpClientTestCase
    protected function getHttpClient(string $testCase): HttpClientInterface
    {
        if (false !== strpos($testCase, 'Push')) {
-            if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073d00 > ($v = curl_version())['version_number'] || !(\CURL_VERSION_HTTP2 & $v['features'])) {
+            if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073D00 > ($v = curl_version())['version_number'] || !(\CURL_VERSION_HTTP2 & $v['features'])) {
                $this->markTestSkipped('curl <7.61 is used or it is not compiled with support for HTTP/2 PUSH');
            }
        }

diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -397,8 +397,6 @@ public function setContent(?string $content): static

    /**
     * Gets the current response content.
-     *
-     * @return string|false
     */
    public function getContent(): string|false
    {

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -112,8 +112,6 @@ public function __construct(array $options = [], AbstractProxy|\SessionHandlerIn

    /**
     * Gets the save handler instance.
-     *
-     * @return AbstractProxy|\SessionHandlerInterface
     */
    public function getSaveHandler(): AbstractProxy|\SessionHandlerInterface
    {

diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
@@ -47,9 +47,6 @@ public function hasException(): bool
        return isset($this->data['exception']);
    }

-    /**
-     * @return \Exception|FlattenException
-     */
    public function getException(): \Exception|FlattenException
    {
        return $this->data['exception'];

diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -55,7 +55,7 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $
        $this->earlyHandler = \is_array($handler) ? $handler[0] : null;
        restore_exception_handler();

-        $this->exceptionHandler = $exceptionHandler === null || $exceptionHandler instanceof \Closure ? $exceptionHandler : \Closure::fromCallable($exceptionHandler);
+        $this->exceptionHandler = null === $exceptionHandler || $exceptionHandler instanceof \Closure ? $exceptionHandler : \Closure::fromCallable($exceptionHandler);
        $this->logger = $logger;
        $this->levels = $levels ?? \E_ALL;
        $this->throwAt = \is_int($throwAt) ? $throwAt : (null === $throwAt ? null : ($throwAt ? \E_ALL : null));

diff --git a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php
@@ -20,9 +20,6 @@

 final class Sms77TransportTest extends TransportTestCase
 {
-    /**
-     * @return Sms77Transport
-     */
    public function createTransport(HttpClientInterface $client = null, string $from = null): Sms77Transport
    {
        return new Sms77Transport('apiKey', $from, $client ?? $this->createMock(HttpClientInterface::class));

diff --git a/src/Symfony/Component/PasswordHasher/Tests/Hasher/UserPasswordHasherTest.php b/src/Symfony/Component/PasswordHasher/Tests/Hasher/UserPasswordHasherTest.php
@@ -18,8 +18,8 @@
 use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 use Symfony\Component\PasswordHasher\Tests\Fixtures\TestLegacyPasswordAuthenticatedUser;
 use Symfony\Component\PasswordHasher\Tests\Fixtures\TestPasswordAuthenticatedUser;
-use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Security\Core\User\InMemoryUser;
+use Symfony\Component\Security\Core\User\User;

 class UserPasswordHasherTest extends TestCase
 {

diff --git a/src/Symfony/Component/RateLimiter/Policy/ResetLimiterTrait.php b/src/Symfony/Component/RateLimiter/Policy/ResetLimiterTrait.php
@@ -11,7 +11,6 @@

 namespace Symfony\Component\RateLimiter\Policy;

-
 trait ResetLimiterTrait
 {
    private $lock;

diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
@@ -32,8 +32,6 @@ interface NormalizableInterface
     * @param string|null         $format     The format is optionally given to be able to normalize differently
     *                                        based on different output formats
     * @param array               $context    Options for normalizing this object
-     *
-     * @return array|string|int|float|bool
     */
    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = []): array|string|int|float|bool;
 }
diff --git a/src/Symfony/Component/String/AbstractString.php b/src/Symfony/Component/String/AbstractString.php
@@ -425,9 +425,6 @@ public function repeat(int $multiplier): static

    abstract public function replace(string $from, string $to): static;

-    /**
-     * @param string|callable $to
-     */
    abstract public function replaceMatches(string $fromRegexp, string|callable $to): static;

    abstract public function reverse(): static;

diff --git a/src/Symfony/Component/Templating/Loader/LoaderInterface.php b/src/Symfony/Component/Templating/Loader/LoaderInterface.php
@@ -23,8 +23,6 @@ interface LoaderInterface
 {
    /**
     * Loads a template.
-     *
-     * @return Storage|false
     */
    public function load(TemplateReferenceInterface $template): Storage|false;


diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
@@ -62,9 +62,6 @@ public function reset()
        $this->data = [];
    }

-    /**
-     * @return array|Data
-     */
    public function getMessages(): array|Data
    {
        return $this->data['messages'] ?? [];

diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
@@ -85,7 +85,7 @@ public function process(ContainerBuilder $container)
    protected function processValue(mixed $value, bool $isRoot = false): mixed
    {
        if ($value instanceof Reference) {
-            if ((string) $value === 'translator') {
+            if ('translator' === (string) $value) {
                for ($i = $this->level - 1; $i >= 0; --$i) {
                    $class = $this->definitions[$i]->getClass();


diff --git a/src/Symfony/Component/Uid/Factory/NameBasedUuidFactory.php b/src/Symfony/Component/Uid/Factory/NameBasedUuidFactory.php
@@ -26,9 +26,6 @@ public function __construct(string $class, Uuid $namespace)
        $this->namespace = $namespace;
    }

-    /**
-     * @return UuidV5|UuidV3
-     */
    public function create(string $name): UuidV5|UuidV3
    {
        switch ($class = $this->class) {

diff --git a/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php b/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php
@@ -26,9 +26,6 @@ public function __construct(string $class, Uuid $node = null)
        $this->node = $node;
    }

-    /**
-     * @return UuidV6|UuidV1
-     */
    public function create(\DateTimeInterface $time = null): UuidV6|UuidV1
    {
        $class = $this->class;

diff --git a/src/Symfony/Component/Uid/Factory/UuidFactory.php b/src/Symfony/Component/Uid/Factory/UuidFactory.php
@@ -44,9 +44,6 @@ public function __construct(string|int $defaultClass = UuidV6::class, string|int
        $this->nameBasedNamespace = $nameBasedNamespace;
    }

-    /**
-     * @return UuidV6|UuidV4|UuidV1
-     */
    public function create(): UuidV6|UuidV4|UuidV1
    {
        $class = $this->defaultClass;