Merge branch '3.2'
* 3.2: [HttpFoundation] Fix transient tests [DI] Fix second auto-registration
This commit is contained in:
commit
549af739af
@ -242,8 +242,9 @@ class AutowirePassTest extends TestCase
|
|||||||
$pass = new AutowirePass();
|
$pass = new AutowirePass();
|
||||||
$pass->process($container);
|
$pass->process($container);
|
||||||
|
|
||||||
$this->assertCount(1, $container->getDefinition('coop_tilleuls')->getArguments());
|
$this->assertCount(2, $container->getDefinition('coop_tilleuls')->getArguments());
|
||||||
$this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));
|
$this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));
|
||||||
|
$this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));
|
||||||
|
|
||||||
$dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
|
$dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
|
||||||
$this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
|
$this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
|
||||||
@ -833,7 +834,7 @@ class Dunglas
|
|||||||
|
|
||||||
class LesTilleuls
|
class LesTilleuls
|
||||||
{
|
{
|
||||||
public function __construct(Dunglas $k)
|
public function __construct(Dunglas $j, Dunglas $k)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -204,7 +204,7 @@ class Response
|
|||||||
|
|
||||||
/* RFC2616 - 14.18 says all Responses need to have a Date */
|
/* RFC2616 - 14.18 says all Responses need to have a Date */
|
||||||
if (!$this->headers->has('Date')) {
|
if (!$this->headers->has('Date')) {
|
||||||
$this->setDate(new \DateTime(null, new \DateTimeZone('UTC')));
|
$this->setDate(\DateTime::createFromFormat('U', time()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user