fixed CS
This commit is contained in:
parent
6f3cffae09
commit
72863e441f
@ -714,7 +714,7 @@ EOF;
|
|||||||
$code .= $this->addServiceInclude($id, $definition);
|
$code .= $this->addServiceInclude($id, $definition);
|
||||||
|
|
||||||
if ($this->getProxyDumper()->isProxyCandidate($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)));
|
$code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName, $this->doExport($id)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1456,14 +1456,14 @@ EOF;
|
|||||||
if (!$this->container->hasDefinition($service)) {
|
if (!$this->container->hasDefinition($service)) {
|
||||||
return 'false';
|
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) {
|
foreach (ContainerBuilder::getServiceConditionals($value) as $service) {
|
||||||
if ($this->container->hasDefinition($service) && !$this->container->getDefinition($service)->isPublic()) {
|
if ($this->container->hasDefinition($service) && !$this->container->getDefinition($service)->isPublic()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$conditions[] = sprintf("\$this->has(%s)", $this->doExport($service));
|
$conditions[] = sprintf('$this->has(%s)', $this->doExport($service));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$conditions) {
|
if (!$conditions) {
|
||||||
|
@ -1537,15 +1537,15 @@ class HttpCacheTest extends HttpCacheTestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function testTraceLevelShort()
|
public function testTraceLevelShort()
|
||||||
{
|
{
|
||||||
$this->cacheConfig['trace_level'] = 'short';
|
$this->cacheConfig['trace_level'] = 'short';
|
||||||
|
|
||||||
$this->setNextResponse();
|
$this->setNextResponse();
|
||||||
$this->request('GET', '/');
|
$this->request('GET', '/');
|
||||||
|
|
||||||
$this->assertTrue($this->response->headers->has('X-Symfony-Cache'));
|
$this->assertTrue($this->response->headers->has('X-Symfony-Cache'));
|
||||||
$this->assertEquals('miss', $this->response->headers->get('X-Symfony-Cache'));
|
$this->assertEquals('miss', $this->response->headers->get('X-Symfony-Cache'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class TestKernel implements HttpKernelInterface
|
class TestKernel implements HttpKernelInterface
|
||||||
|
@ -95,12 +95,12 @@ class SendersLocatorTest extends TestCase
|
|||||||
$container = $this->createMock(ContainerInterface::class);
|
$container = $this->createMock(ContainerInterface::class);
|
||||||
$container->expects($this->any())
|
$container->expects($this->any())
|
||||||
->method('has')
|
->method('has')
|
||||||
->willReturnCallback(function($id) use ($senders) {
|
->willReturnCallback(function ($id) use ($senders) {
|
||||||
return isset($senders[$id]);
|
return isset($senders[$id]);
|
||||||
});
|
});
|
||||||
$container->expects($this->any())
|
$container->expects($this->any())
|
||||||
->method('get')
|
->method('get')
|
||||||
->willReturnCallback(function($id) use ($senders) {
|
->willReturnCallback(function ($id) use ($senders) {
|
||||||
return $senders[$id];
|
return $senders[$id];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -103,6 +103,7 @@ class Connection
|
|||||||
* @param int $delay The delay in milliseconds
|
* @param int $delay The delay in milliseconds
|
||||||
*
|
*
|
||||||
* @return string The inserted id
|
* @return string The inserted id
|
||||||
|
*
|
||||||
* @throws \Doctrine\DBAL\DBALException
|
* @throws \Doctrine\DBAL\DBALException
|
||||||
*/
|
*/
|
||||||
public function send(string $body, array $headers, int $delay = 0): string
|
public function send(string $body, array $headers, int $delay = 0): string
|
||||||
|
@ -84,7 +84,6 @@ class DoctrineTransport implements TransportInterface, SetupableTransportInterfa
|
|||||||
return ($this->receiver ?? $this->getReceiver())->find($id);
|
return ($this->receiver ?? $this->getReceiver())->find($id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
|
@ -33,15 +33,15 @@ class SendersLocator implements SendersLocatorInterface
|
|||||||
private $sendAndHandle;
|
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 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 = [])
|
public function __construct(array $sendersMap, /*ContainerInterface*/ $sendersLocator = null, array $sendAndHandle = [])
|
||||||
{
|
{
|
||||||
$this->sendersMap = $sendersMap;
|
$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);
|
@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.'
|
// "%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([]);
|
$this->sendersLocator = new ServiceLocator([]);
|
||||||
|
@ -19,9 +19,9 @@ use Symfony\Component\Security\Core\Role\Role;
|
|||||||
* @author Fabien Potencier <fabien@symfony.com>
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
|
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
|
||||||
*
|
*
|
||||||
* @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 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
|
interface TokenInterface extends \Serializable
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user