From 72863e441f4b00a0d299ebc7bf4b04d73aaacaf9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 8 May 2019 19:18:10 +0200 Subject: [PATCH] fixed CS --- .../DependencyInjection/Dumper/PhpDumper.php | 6 +++--- .../HttpKernel/Tests/HttpCache/HttpCacheTest.php | 14 +++++++------- .../Tests/Transport/Sender/SendersLocatorTest.php | 4 ++-- .../Messenger/Transport/Doctrine/Connection.php | 1 + .../Transport/Doctrine/DoctrineTransport.php | 1 - .../Messenger/Transport/Sender/SendersLocator.php | 6 +++--- .../Core/Authentication/Token/TokenInterface.php | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 61446a0e17..2228bdc00f 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -714,7 +714,7 @@ EOF; $code .= $this->addServiceInclude($id, $definition); if ($this->getProxyDumper()->isProxyCandidate($definition)) { - $factoryCode = $asFile ? ($definition->isShared() ? "\$this->load('%s.php', false)" : "\$this->factories[%2\$s](false)") : '$this->%s(false)'; + $factoryCode = $asFile ? ($definition->isShared() ? "\$this->load('%s.php', false)" : '$this->factories[%2$s](false)') : '$this->%s(false)'; $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName, $this->doExport($id))); } @@ -1456,14 +1456,14 @@ EOF; if (!$this->container->hasDefinition($service)) { return 'false'; } - $conditions[] = sprintf("isset(\$this->%s[%s])", $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $this->doExport($service)); + $conditions[] = sprintf('isset($this->%s[%s])', $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $this->doExport($service)); } foreach (ContainerBuilder::getServiceConditionals($value) as $service) { if ($this->container->hasDefinition($service) && !$this->container->getDefinition($service)->isPublic()) { continue; } - $conditions[] = sprintf("\$this->has(%s)", $this->doExport($service)); + $conditions[] = sprintf('$this->has(%s)', $this->doExport($service)); } if (!$conditions) { diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php index d9f1e458f9..309e8aaaec 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php @@ -1537,15 +1537,15 @@ class HttpCacheTest extends HttpCacheTestCase } public function testTraceLevelShort() - { - $this->cacheConfig['trace_level'] = 'short'; + { + $this->cacheConfig['trace_level'] = 'short'; - $this->setNextResponse(); - $this->request('GET', '/'); + $this->setNextResponse(); + $this->request('GET', '/'); - $this->assertTrue($this->response->headers->has('X-Symfony-Cache')); - $this->assertEquals('miss', $this->response->headers->get('X-Symfony-Cache')); - } + $this->assertTrue($this->response->headers->has('X-Symfony-Cache')); + $this->assertEquals('miss', $this->response->headers->get('X-Symfony-Cache')); + } } class TestKernel implements HttpKernelInterface diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php index e085d721ef..4c9be63c1c 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php @@ -95,12 +95,12 @@ class SendersLocatorTest extends TestCase $container = $this->createMock(ContainerInterface::class); $container->expects($this->any()) ->method('has') - ->willReturnCallback(function($id) use ($senders) { + ->willReturnCallback(function ($id) use ($senders) { return isset($senders[$id]); }); $container->expects($this->any()) ->method('get') - ->willReturnCallback(function($id) use ($senders) { + ->willReturnCallback(function ($id) use ($senders) { return $senders[$id]; }); diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php index 3663ca1726..7011295ee8 100644 --- a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php @@ -103,6 +103,7 @@ class Connection * @param int $delay The delay in milliseconds * * @return string The inserted id + * * @throws \Doctrine\DBAL\DBALException */ public function send(string $body, array $headers, int $delay = 0): string diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransport.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransport.php index 1e0db72e76..41e7d09b3e 100644 --- a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransport.php +++ b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransport.php @@ -84,7 +84,6 @@ class DoctrineTransport implements TransportInterface, SetupableTransportInterfa return ($this->receiver ?? $this->getReceiver())->find($id); } - /** * {@inheritdoc} */ diff --git a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php index 430da41aaa..815dbbc3f8 100644 --- a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php +++ b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php @@ -33,15 +33,15 @@ class SendersLocator implements SendersLocatorInterface private $sendAndHandle; /** - * @param string[][] $sendersMap An array, keyed by "type", set to an array of sender aliases + * @param string[][] $sendersMap An array, keyed by "type", set to an array of sender aliases * @param ContainerInterface $sendersLocator Locator of senders, keyed by sender alias - * @param bool[] $sendAndHandle + * @param bool[] $sendAndHandle */ public function __construct(array $sendersMap, /*ContainerInterface*/ $sendersLocator = null, array $sendAndHandle = []) { $this->sendersMap = $sendersMap; - if (is_array($sendersLocator) || null === $sendersLocator) { + if (\is_array($sendersLocator) || null === $sendersLocator) { @trigger_error(sprintf('"%s::__construct()" requires a "%s" as 2nd argument. Not doing so is deprecated since Symfony 4.3 and will be required in 5.0.', __CLASS__, ContainerInterface::class), E_USER_DEPRECATED); // "%s" requires a "%s" as 2nd argument. Not doing so is deprecated since Symfony 4.3 and will be required in 5.0.' $this->sendersLocator = new ServiceLocator([]); diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php index 80ddca19db..984966a9c8 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php @@ -19,9 +19,9 @@ use Symfony\Component\Security\Core\Role\Role; * @author Fabien Potencier * @author Johannes M. Schmitt * - * @method array __serialize() Returns all the necessary state of the object for serialization purposes - not implementing it is deprecated since Symfony 4.3 + * @method array __serialize() Returns all the necessary state of the object for serialization purposes - not implementing it is deprecated since Symfony 4.3 * @method void __unserialize(array $data) Restores the object state from an array given by __serialize() - not implementing it is deprecated since Symfony 4.3 - * @method string[] getRoleNames() The associated roles - not implementing it is deprecated since Symfony 4.3 + * @method string[] getRoleNames() The associated roles - not implementing it is deprecated since Symfony 4.3 */ interface TokenInterface extends \Serializable {