Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit a475fffb167f · 2021-08-16T18:08:22.000+02:00
* 5.4:
  Run php-cs-fixer
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -234,7 +234,7 @@ private function displayJson(OutputInterface $output, array $filesInfo)
         return min($errors, 1);
     }
 
-    private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, ?GithubActionReporter $githubReporter = null)
+    private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null)
     {
         $line = $exception->getTemplateLine();
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -16,7 +16,6 @@
 use Symfony\Bundle\WebProfilerBundle\EventListener\WebDebugToolbarListener;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/MinifyTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/MinifyTest.php
@@ -15,15 +15,16 @@
 
 /**
  * Make sure we can minify content in toolbar.
+ *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
 class MinifyTest extends TestCase
 {
     public function testNoSingleLineComments()
     {
-        $dir = dirname(__DIR__, 2).'/Resources/views/Profiler';
+        $dir = \dirname(__DIR__, 2).'/Resources/views/Profiler';
         $message = 'There cannot be any single line comment in this file. Consider using multiple line comment. ';
-        $this->assertTrue(2 === substr_count(file_get_contents($dir . '/base_js.html.twig'), '//'), $message);
+        $this->assertTrue(2 === substr_count(file_get_contents($dir.'/base_js.html.twig'), '//'), $message);
         $this->assertTrue(0 === substr_count(file_get_contents($dir.'/toolbar.css.twig'), '//'), $message);
     }
 }
diff --git a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
@@ -24,7 +24,8 @@ class TrimmedBufferOutput extends Output
     private $maxLength;
     private $buffer = '';
 
-    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null) {
+    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null)
+    {
         if ($maxLength <= 0) {
             throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));
         }
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
@@ -462,7 +462,7 @@ public function testItDelaysTheMessage()
         $delayExchange = $this->createMock(\AMQPExchange::class);
         $delayExchange->expects($this->once())
             ->method('publish')
-            ->with('{}', 'delay_messages__5000_delay', AMQP_NOPARAM, [
+            ->with('{}', 'delay_messages__5000_delay', \AMQP_NOPARAM, [
                 'headers' => ['x-some-headers' => 'foo'],
                 'delivery_mode' => 2,
                 'timestamp' => time(),
@@ -477,7 +477,7 @@ public function testItRetriesTheMessage()
         $delayExchange = $this->createMock(\AMQPExchange::class);
         $delayExchange->expects($this->once())
             ->method('publish')
-            ->with('{}', 'delay_messages__5000_retry', AMQP_NOPARAM);
+            ->with('{}', 'delay_messages__5000_retry', \AMQP_NOPARAM);
         $connection = $this->createDelayOrRetryConnection($delayExchange, '', 'delay_messages__5000_retry');
 
         $amqpEnvelope = $this->createMock(\AMQPEnvelope::class);
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpStamp.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpStamp.php
@@ -64,9 +64,9 @@ public static function createFromAmqpEnvelope(\AMQPEnvelope $amqpEnvelope, self
         $attr['reply_to'] = $attr['reply_to'] ?? $amqpEnvelope->getReplyTo();
 
         if (null === $retryRoutingKey) {
-            $stamp = new self($previousStamp->routingKey ?? $amqpEnvelope->getRoutingKey(), $previousStamp->flags ?? AMQP_NOPARAM, $attr);
+            $stamp = new self($previousStamp->routingKey ?? $amqpEnvelope->getRoutingKey(), $previousStamp->flags ?? \AMQP_NOPARAM, $attr);
         } else {
-            $stamp = new self($retryRoutingKey, $previousStamp->flags ?? AMQP_NOPARAM, $attr);
+            $stamp = new self($retryRoutingKey, $previousStamp->flags ?? \AMQP_NOPARAM, $attr);
             $stamp->isRetryAttempt = true;
         }
 
diff --git a/src/Symfony/Component/Messenger/Exception/StopWorkerException.php b/src/Symfony/Component/Messenger/Exception/StopWorkerException.php
@@ -16,7 +16,7 @@
  */
 class StopWorkerException extends RuntimeException implements StopWorkerExceptionInterface
 {
-    public function __construct(string $message = 'Worker should stop.', ?\Throwable $previous = null)
+    public function __construct(string $message = 'Worker should stop.', \Throwable $previous = null)
     {
         parent::__construct($message, 0, $previous);
     }
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php
@@ -49,7 +49,7 @@ function (\SplFileInfo $current) {
         });
 
         foreach ($files as $file) {
-            if (!$file->isFile() ||  !str_ends_with($file->getFilename(), '.php')) {
+            if (!$file->isFile() || !str_ends_with($file->getFilename(), '.php')) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -805,7 +805,7 @@ public function count(): int
         return \count($this->list);
     }
 
-    public function getIterator():\Traversable
+    public function getIterator(): \Traversable
     {
         return new \ArrayIterator($this->list);
     }
diff --git a/src/Symfony/Component/VarExporter/Instantiator.php b/src/Symfony/Component/VarExporter/Instantiator.php
@@ -53,8 +53,6 @@ final class Instantiator
      * @param array  $privateProperties The private properties to set on the instance,
      *                                  keyed by their declaring class
      *
-     * @return object
-     *
      * @throws ExceptionInterface When the instance cannot be created
      */
     public static function instantiate(string $class, array $properties = [], array $privateProperties = []): object

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ private function displayJson(OutputInterface $output, array $filesInfo)`
`234`	`234`	`return min($errors, 1);`
`235`	`235`	`}`
`236`	`236`
`237`		`- private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, ?GithubActionReporter $githubReporter = null)`
	`237`	`+ private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null)`
`238`	`238`	`{`
`239`	`239`	`$line = $exception->getTemplateLine();`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,16 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* Make sure we can minify content in toolbar.`
	`18`	`+ *`
`18`	`19`	`* @author Tobias Nyholm <tobias.nyholm@gmail.com>`
`19`	`20`	`*/`
`20`	`21`	`class MinifyTest extends TestCase`
`21`	`22`	`{`
`22`	`23`	`public function testNoSingleLineComments()`
`23`	`24`	`{`
`24`		`- $dir = dirname(__DIR__, 2).'/Resources/views/Profiler';`
	`25`	`+ $dir = \dirname(__DIR__, 2).'/Resources/views/Profiler';`
`25`	`26`	`$message = 'There cannot be any single line comment in this file. Consider using multiple line comment. ';`
`26`		`- $this->assertTrue(2 === substr_count(file_get_contents($dir . '/base_js.html.twig'), '//'), $message);`
	`27`	`+ $this->assertTrue(2 === substr_count(file_get_contents($dir.'/base_js.html.twig'), '//'), $message);`
`27`	`28`	`$this->assertTrue(0 === substr_count(file_get_contents($dir.'/toolbar.css.twig'), '//'), $message);`
`28`	`29`	`}`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ class TrimmedBufferOutput extends Output`
`24`	`24`	`private $maxLength;`
`25`	`25`	`private $buffer = '';`
`26`	`26`
`27`		`- public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null) {`
	`27`	`+ public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null)`
	`28`	`+ {`
`28`	`29`	`if ($maxLength <= 0) {`
`29`	`30`	`throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`class StopWorkerException extends RuntimeException implements StopWorkerExceptionInterface`
`18`	`18`	`{`
`19`		`- public function __construct(string $message = 'Worker should stop.', ?\Throwable $previous = null)`
	`19`	`+ public function __construct(string $message = 'Worker should stop.', \Throwable $previous = null)`
`20`	`20`	`{`
`21`	`21`	`parent::__construct($message, 0, $previous);`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ function (\SplFileInfo $current) {`
`49`	`49`	`});`
`50`	`50`
`51`	`51`	`foreach ($files as $file) {`
`52`		`- if (!$file->isFile() \|\| !str_ends_with($file->getFilename(), '.php')) {`
	`52`	`+ if (!$file->isFile() \|\| !str_ends_with($file->getFilename(), '.php')) {`
`53`	`53`	`continue;`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ public function count(): int`
`805`	`805`	`return \count($this->list);`
`806`	`806`	`}`
`807`	`807`
`808`		`- public function getIterator():\Traversable`
	`808`	`+ public function getIterator(): \Traversable`
`809`	`809`	`{`
`810`	`810`	`return new \ArrayIterator($this->list);`
`811`	`811`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@ final class Instantiator`
`53`	`53`	`* @param array $privateProperties The private properties to set on the instance,`
`54`	`54`	`* keyed by their declaring class`
`55`	`55`	`*`
`56`		`- * @return object`
`57`		`- *`
`58`	`56`	`* @throws ExceptionInterface When the instance cannot be created`
`59`	`57`	`*/`
`60`	`58`	`public static function instantiate(string $class, array $properties = [], array $privateProperties = []): object`