Merge branch '4.4' into 5.1
This commit is contained in:
commit
2081035295
@ -41,6 +41,13 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
|
||||
{
|
||||
parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter);
|
||||
|
||||
if (null === $formatter) {
|
||||
// for BC reasons, stdErr has it own Formatter only when user don't inject a specific formatter.
|
||||
$this->stderr = new StreamOutput($this->openErrorStream(), $verbosity, $decorated);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$actualDecorated = $this->isDecorated();
|
||||
$this->stderr = new StreamOutput($this->openErrorStream(), $verbosity, $decorated, $this->getFormatter());
|
||||
|
||||
|
@ -18,11 +18,19 @@ use Symfony\Component\Console\Output\Output;
|
||||
|
||||
class ConsoleOutputTest extends TestCase
|
||||
{
|
||||
public function testConstructor()
|
||||
public function testConstructorWithoutFormatter()
|
||||
{
|
||||
$output = new ConsoleOutput(Output::VERBOSITY_QUIET, true);
|
||||
$this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');
|
||||
$this->assertSame($output->getFormatter(), $output->getErrorOutput()->getFormatter(), '__construct() takes a formatter or null as the third argument');
|
||||
$this->assertNotSame($output->getFormatter(), $output->getErrorOutput()->getFormatter(), 'ErrorOutput should use it own formatter');
|
||||
}
|
||||
|
||||
public function testConstructorWithFormatter()
|
||||
{
|
||||
$output = new ConsoleOutput(Output::VERBOSITY_QUIET, true, $formatter = new OutputFormatter());
|
||||
$this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');
|
||||
$this->assertSame($formatter, $output->getFormatter());
|
||||
$this->assertSame($formatter, $output->getErrorOutput()->getFormatter(), 'Output and ErrorOutput should use the same provided formatter');
|
||||
}
|
||||
|
||||
public function testSetFormatter()
|
||||
@ -31,6 +39,7 @@ class ConsoleOutputTest extends TestCase
|
||||
$outputFormatter = new OutputFormatter();
|
||||
$output->setFormatter($outputFormatter);
|
||||
$this->assertSame($outputFormatter, $output->getFormatter());
|
||||
$this->assertSame($outputFormatter, $output->getErrorOutput()->getFormatter());
|
||||
}
|
||||
|
||||
public function testSetVerbosity()
|
||||
|
@ -1167,7 +1167,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
||||
return $this->resolveServices($reference);
|
||||
};
|
||||
} elseif ($value instanceof IteratorArgument) {
|
||||
$value = new RewindableGenerator(function () use ($value) {
|
||||
$value = new RewindableGenerator(function () use ($value, &$inlineServices) {
|
||||
foreach ($value->getValues() as $k => $v) {
|
||||
foreach (self::getServiceConditionals($v) as $s) {
|
||||
if (!$this->has($s)) {
|
||||
@ -1175,12 +1175,12 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
||||
}
|
||||
}
|
||||
foreach (self::getInitializedConditionals($v) as $s) {
|
||||
if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
|
||||
if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE, $inlineServices)) {
|
||||
continue 2;
|
||||
}
|
||||
}
|
||||
|
||||
yield $k => $this->resolveServices($v);
|
||||
yield $k => $this->doResolveServices($v, $inlineServices);
|
||||
}
|
||||
}, function () use ($value): int {
|
||||
$count = 0;
|
||||
|
@ -471,7 +471,7 @@ EOF;
|
||||
foreach ($edges as $edge) {
|
||||
$node = $edge->getDestNode();
|
||||
$id = $node->getId();
|
||||
if (!$node->getValue() instanceof Definition || $sourceId === $id || $edge->isLazy() || $edge->isWeak()) {
|
||||
if (!$node->getValue() instanceof Definition || $sourceId === $id || $edge->isWeak()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -1395,6 +1395,10 @@ class ContainerBuilderTest extends TestCase
|
||||
public function testAlmostCircular($visibility)
|
||||
{
|
||||
$container = include __DIR__.'/Fixtures/containers/container_almost_circular.php';
|
||||
$container->compile();
|
||||
|
||||
$logger = $container->get('monolog.logger');
|
||||
$this->assertEquals(new \stdClass(), $logger->handler);
|
||||
|
||||
$foo = $container->get('foo');
|
||||
$this->assertSame($foo, $foo->bar->foobar->foo);
|
||||
|
@ -1061,6 +1061,9 @@ class PhpDumperTest extends TestCase
|
||||
|
||||
$container = new $container();
|
||||
|
||||
$logger = $container->get('monolog.logger');
|
||||
$this->assertEquals(new \stdClass(), $logger->handler);
|
||||
|
||||
$foo = $container->get('foo');
|
||||
$this->assertSame($foo, $foo->bar->foobar->foo);
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
<?php
|
||||
|
||||
use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
@ -8,6 +9,24 @@ use Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCa
|
||||
$public = 'public' === $visibility;
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
// monolog-like + handler that require monolog
|
||||
|
||||
$container->register('monolog.logger', 'stdClass')->setPublic(true)
|
||||
->setProperty('handler', new Reference('mailer.transport'));
|
||||
|
||||
$container->register('mailer.transport', 'stdClass')->setPublic($public)
|
||||
->setFactory([new Reference('mailer.transport_factory'), 'create']);
|
||||
|
||||
$container->register('mailer.transport_factory', FactoryCircular::class)->setPublic($public)
|
||||
->addArgument(new TaggedIteratorArgument('mailer.transport'));
|
||||
|
||||
$container->register('mailer.transport_factory.amazon', 'stdClass')->setPublic($public)
|
||||
->addArgument(new Reference('monolog.logger_2'))
|
||||
->addTag('mailer.transport');
|
||||
|
||||
$container->register('monolog.logger_2', 'stdClass')->setPublic($public)
|
||||
->setProperty('handler', new Reference('mailer.transport'));
|
||||
|
||||
// same visibility for deps
|
||||
|
||||
$container->register('foo', FooCircular::class)->setPublic(true)
|
||||
|
@ -111,6 +111,23 @@ class LazyContext
|
||||
}
|
||||
}
|
||||
|
||||
class FactoryCircular
|
||||
{
|
||||
public $services;
|
||||
|
||||
public function __construct($services)
|
||||
{
|
||||
$this->services = $services;
|
||||
}
|
||||
|
||||
public function create()
|
||||
{
|
||||
foreach ($this->services as $service) {
|
||||
return $service;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class FoobarCircular
|
||||
{
|
||||
public function __construct(FooCircular $foo)
|
||||
|
@ -36,6 +36,7 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
|
||||
'manager' => 'getManagerService',
|
||||
'manager2' => 'getManager2Service',
|
||||
'manager3' => 'getManager3Service',
|
||||
'monolog.logger' => 'getMonolog_LoggerService',
|
||||
'root' => 'getRootService',
|
||||
'subscriber' => 'getSubscriberService',
|
||||
];
|
||||
@ -77,7 +78,11 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
|
||||
'level5' => true,
|
||||
'level6' => true,
|
||||
'logger2' => true,
|
||||
'mailer.transport' => true,
|
||||
'mailer.transport_factory' => true,
|
||||
'mailer.transport_factory.amazon' => true,
|
||||
'manager4' => true,
|
||||
'monolog.logger_2' => true,
|
||||
'multiuse1' => true,
|
||||
'subscriber2' => true,
|
||||
];
|
||||
@ -352,6 +357,20 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
|
||||
return $this->services['manager3'] = new \stdClass($b);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'monolog.logger' shared service.
|
||||
*
|
||||
* @return \stdClass
|
||||
*/
|
||||
protected function getMonolog_LoggerService()
|
||||
{
|
||||
$this->services['monolog.logger'] = $instance = new \stdClass();
|
||||
|
||||
$instance->handler = ($this->privates['mailer.transport'] ?? $this->getMailer_TransportService());
|
||||
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'root' shared service.
|
||||
*
|
||||
@ -416,6 +435,34 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the private 'mailer.transport' shared service.
|
||||
*
|
||||
* @return \stdClass
|
||||
*/
|
||||
protected function getMailer_TransportService()
|
||||
{
|
||||
return $this->privates['mailer.transport'] = (new \FactoryCircular(new RewindableGenerator(function () {
|
||||
yield 0 => ($this->privates['mailer.transport_factory.amazon'] ?? $this->getMailer_TransportFactory_AmazonService());
|
||||
}, 1)))->create();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the private 'mailer.transport_factory.amazon' shared service.
|
||||
*
|
||||
* @return \stdClass
|
||||
*/
|
||||
protected function getMailer_TransportFactory_AmazonService()
|
||||
{
|
||||
$a = new \stdClass();
|
||||
|
||||
$this->privates['mailer.transport_factory.amazon'] = $instance = new \stdClass($a);
|
||||
|
||||
$a->handler = ($this->privates['mailer.transport'] ?? $this->getMailer_TransportService());
|
||||
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the private 'manager4' shared service.
|
||||
*
|
||||
|
@ -42,9 +42,14 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
|
||||
'listener3' => 'getListener3Service',
|
||||
'listener4' => 'getListener4Service',
|
||||
'logger' => 'getLoggerService',
|
||||
'mailer.transport' => 'getMailer_TransportService',
|
||||
'mailer.transport_factory' => 'getMailer_TransportFactoryService',
|
||||
'mailer.transport_factory.amazon' => 'getMailer_TransportFactory_AmazonService',
|
||||
'manager' => 'getManagerService',
|
||||
'manager2' => 'getManager2Service',
|
||||
'manager3' => 'getManager3Service',
|
||||
'monolog.logger' => 'getMonolog_LoggerService',
|
||||
'monolog.logger_2' => 'getMonolog_Logger2Service',
|
||||
'root' => 'getRootService',
|
||||
'subscriber' => 'getSubscriberService',
|
||||
];
|
||||
@ -434,6 +439,50 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'mailer.transport' shared service.
|
||||
*
|
||||
* @return \stdClass
|
||||
*/
|
||||
protected function getMailer_TransportService()
|
||||
{
|
||||
$a = ($this->services['mailer.transport_factory'] ?? $this->getMailer_TransportFactoryService());
|
||||
|
||||
if (isset($this->services['mailer.transport'])) {
|
||||
return $this->services['mailer.transport'];
|
||||
}
|
||||
|
||||
return $this->services['mailer.transport'] = $a->create();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'mailer.transport_factory' shared service.
|
||||
*
|
||||
* @return \FactoryCircular
|
||||
*/
|
||||
protected function getMailer_TransportFactoryService()
|
||||
{
|
||||
return $this->services['mailer.transport_factory'] = new \FactoryCircular(new RewindableGenerator(function () {
|
||||
yield 0 => ($this->services['mailer.transport_factory.amazon'] ?? $this->getMailer_TransportFactory_AmazonService());
|
||||
}, 1));
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'mailer.transport_factory.amazon' shared service.
|
||||
*
|
||||
* @return \stdClass
|
||||
*/
|
||||
protected function getMailer_TransportFactory_AmazonService()
|
||||
{
|
||||
$a = ($this->services['monolog.logger_2'] ?? $this->getMonolog_Logger2Service());
|
||||
|
||||
if (isset($this->services['mailer.transport_factory.amazon'])) {
|
||||
return $this->services['mailer.transport_factory.amazon'];
|
||||
}
|
||||
|
||||
return $this->services['mailer.transport_factory.amazon'] = new \stdClass($a);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'manager' shared service.
|
||||
*
|
||||
@ -482,6 +531,34 @@ class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
|
||||
return $this->services['manager3'] = new \stdClass($a);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'monolog.logger' shared service.
|
||||
*
|
||||
* @return \stdClass
|
||||
*/
|
||||
protected function getMonolog_LoggerService()
|
||||
{
|
||||
$this->services['monolog.logger'] = $instance = new \stdClass();
|
||||
|
||||
$instance->handler = ($this->services['mailer.transport'] ?? $this->getMailer_TransportService());
|
||||
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'monolog.logger_2' shared service.
|
||||
*
|
||||
* @return \stdClass
|
||||
*/
|
||||
protected function getMonolog_Logger2Service()
|
||||
{
|
||||
$this->services['monolog.logger_2'] = $instance = new \stdClass();
|
||||
|
||||
$instance->handler = ($this->services['mailer.transport'] ?? $this->getMailer_TransportService());
|
||||
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public 'root' shared service.
|
||||
*
|
||||
|
@ -30,7 +30,7 @@ interface TokenStorageInterface
|
||||
/**
|
||||
* Sets the authentication token.
|
||||
*
|
||||
* @param TokenInterface $token A TokenInterface token, or null if no further authentication information should be stored
|
||||
* @param TokenInterface|null $token A TokenInterface token, or null if no further authentication information should be stored
|
||||
*/
|
||||
public function setToken(TokenInterface $token = null);
|
||||
}
|
||||
|
Reference in New Issue
Block a user