Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit 549af739af16 · 2017-04-07T08:15:11.000+02:00
* 3.2:
  [HttpFoundation] Fix transient tests
  [DI] Fix second auto-registration
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -242,8 +242,9 @@ public function testCreateDefinition()
         $pass = new AutowirePass();
         $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(1));
 
         $dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
         $this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
@@ -833,7 +834,7 @@ public function __construct(Lille $l)
 
 class LesTilleuls
 {
-    public function __construct(Dunglas $k)
+    public function __construct(Dunglas $j, Dunglas $k)
     {
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -204,7 +204,7 @@ public function __construct($content = '', $status = 200, $headers = array())
 
         /* RFC2616 - 14.18 says all Responses need to have a Date */
         if (!$this->headers->has('Date')) {
-            $this->setDate(new \DateTime(null, new \DateTimeZone('UTC')));
+            $this->setDate(\DateTime::createFromFormat('U', time()));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -242,8 +242,9 @@ public function testCreateDefinition()`
`242`	`242`	`$pass = new AutowirePass();`
`243`	`243`	`$pass->process($container);`
`244`	`244`
`245`		`- $this->assertCount(1, $container->getDefinition('coop_tilleuls')->getArguments());`
	`245`	`+ $this->assertCount(2, $container->getDefinition('coop_tilleuls')->getArguments());`
`246`	`246`	`$this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));`
	`247`	`+ $this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));`
`247`	`248`
`248`	`249`	`$dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');`
`249`	`250`	`$this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());`
`@@ -833,7 +834,7 @@ public function __construct(Lille $l)`
`833`	`834`
`834`	`835`	`class LesTilleuls`
`835`	`836`	`{`
`836`		`- public function __construct(Dunglas $k)`
	`837`	`+ public function __construct(Dunglas $j, Dunglas $k)`
`837`	`838`	`{`
`838`	`839`	`}`
`839`	`840`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function __construct($content = '', $status = 200, $headers = array())`
`204`	`204`
`205`	`205`	`/* RFC2616 - 14.18 says all Responses need to have a Date */`
`206`	`206`	`if (!$this->headers->has('Date')) {`
`207`		`- $this->setDate(new \DateTime(null, new \DateTimeZone('UTC')));`
	`207`	`+ $this->setDate(\DateTime::createFromFormat('U', time()));`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`