8000 minor #42592 Run php-cs-fixer (nicolas-grekas) · symfony/symfony@017111f · GitHub
[go: up one dir, main page]
Skip to content

Commit 017111f

Browse files
nicolas-grekasnicolas-grekas
committed
minor #42592 Run php-cs-fixer (nicolas-grekas)
This PR was merged into the 5.4 branch. Discussion ---------- Run php-cs-fixer | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- e19e6bd Run php-cs-fixer
2 parents b1115f9 + e19e6bd commit 017111f

File tree

13 files changed

+13
-20
lines changed

13 files changed

+13
-20
lines changed

‎src/Symfony/Bridge/Twig/Command/LintCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ private function displayJson(OutputInterface $output, array $filesInfo)
234234
return min($errors, 1);
235235
}
236236

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)
238238
{
239239
$line = $exception->getTemplateLine();
240240

‎src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Symfony\Bundle\WebProfilerBundle\EventListener\WebDebugToolbarListener;
1717
use Symfony\Component\HttpFoundation\Request;
1818
use Symfony\Component\HttpFoundation\Response;
19-
use Symfony\Component\HttpFoundation\Session\Session;
2019
use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
2120
use Symfony\Component\HttpKernel\Event\ResponseEvent;
2221
use Symfony\Component\HttpKernel\HttpKernelInterface;

‎src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/MinifyTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515

1616
/**
1717
* Make sure we can minify content in toolbar.
18+
*
1819
* @author Tobias Nyholm <tobias.nyholm@gmail.com>
1920
*/
2021
class MinifyTest extends TestCase
2122
{
2223
public function testNoSingleLineComments()
2324
{
24-
$dir = dirname(__DIR__, 2).'/Resources/views/Profiler';
25+
$dir = \dirname(__DIR__, 2).'/Resources/views/Profiler';
2526
$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);
2728
$this->assertTrue(0 === substr_count(file_get_contents($dir.'/toolbar.css.twig'), '//'), $message);
2829
}
2930
}

‎src/Symfony/Component/Console/Output/TrimmedBufferOutput.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ class TrimmedBufferOutput extends Output
2424
private $maxLength;
2525
private $buffer = '';
2626

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+
{
2829
if ($maxLength <= 0) {
2930
throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));
3031
}

‎src/Symfony/Component/ErrorHandler/Exception/FlattenException.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ public function setTraceFromThrowable(\Throwable $throwable): self
298298
}
299299

300300
/**
301-
*
302301
* @return $this
303302
*/
304303
public function setTrace(array $trace, ?string $file, ?int $line): self

‎src/Symfony/Component/Intl/Data/Util/RingBuffer.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ public function offsetGet($key)
6464

6565
/**
6666
* {@inheritdoc}
67-
*
68-
* @return void
6967
*/
7068
public function offsetSet($key, $value): void
7169
{
@@ -81,8 +79,6 @@ public function offsetSet($key, $value): void
8179

8280
/**
8381
* {@inheritdoc}
84-
*
85-
* @return void
8682
*/
8783
public function offsetUnset($key): void
8884
{

‎src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ public function testItDelaysTheMessage()
496496
$delayExchange = $this->createMock(\AMQPExchange::class);
497497
$delayExchange->expects($this->once())
498498
->method('publish')
499-
->with('{}', 'delay_messages__5000_delay', AMQP_NOPARAM, [
499+
->with('{}', 'delay_messages__5000_delay', \AMQP_NOPARAM, [
500500
'headers' => ['x-some-headers' => 'foo'],
501501
'delivery_mode' => 2,
502502
'timestamp' => time(),
@@ -511,7 +511,7 @@ public function testItRetriesTheMessage()
511511
$delayExchange = $this->createMock(\AMQPExchange::class);
512512
$delayExchange->expects($this->once())
513513
->method('publish')
514-
->with('{}', 'delay_messages__5000_retry', AMQP_NOPARAM);
514+
->with('{}', 'delay_messages__5000_retry', \AMQP_NOPARAM);
515515
$connection = $this->createDelayOrRetryConnection($delayExchange, '', 'delay_messages__5000_retry');
516516

517517
$amqpEnvelope = $this->createMock(\AMQPEnvelope::class);

‎src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpStamp.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public static function createFromAmqpEnvelope(\AMQPEnvelope $amqpEnvelope, self
6464
$attr['reply_to'] = $attr['reply_to'] ?? $amqpEnvelope->getReplyTo();
6565

6666
if (null === $retryRoutingKey) {
67-
$stamp = new self($previousStamp->routingKey ?? $amqpEnvelope 67DE ->getRoutingKey(), $previousStamp->flags ?? AMQP_NOPARAM, $attr);
67+
$stamp = new self($previousStamp->routingKey ?? $amqpEnvelope->getRoutingKey(), $previousStamp->flags ?? \AMQP_NOPARAM, $attr);
6868
} else {
69-
$stamp = new self($retryRoutingKey, $previousStamp->flags ?? AMQP_NOPARAM, $attr);
69+
$stamp = new self($retryRoutingKey, $previousStamp->flags ?? \AMQP_NOPARAM, $attr);
7070
$stamp->isRetryAttempt = true;
7171
}
7272

‎src/Symfony/Component/Messenger/Exception/StopWorkerException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class StopWorkerException extends RuntimeException implements StopWorkerExceptionInterface
1818
{
19-
public function __construct(string $message = 'Worker should stop.', ?\Throwable $previous = null)
19+
public function __construct(string $message = 'Worker should stop.', \Throwable $previous = null)
2020
{
2121
parent::__construct($message, 0, $previous);
2222
}

‎src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function (\SplFileInfo $current) {
5454
});
5555

5656
foreach ($files as $file) {
57-
if (!$file->isFile() || !str_ends_with($file->getFilename(), '.php')) {
57+
if (!$file->isFile() || !str_ends_with($file->getFilename(), '.php')) {
5858
continue;
5959
}
6060

0 commit comments

Comments
 (0)
0