Merge branch '5.3' into 5.4

xabbuh · xabbuh · commit 96886312f483 · 2021-05-25T09:48:11.000+02:00
* 5.3:
  fix test
  [HttpKernel] Throw when HttpKernel is created and the env is empty
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -87,7 +87,10 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     public function __construct(string $environment, bool $debug)
     {
-        $this->environment = $environment;
+        if (!$this->environment = $environment) {
+            throw new \InvalidArgumentException(sprintf('Invalid environment provided to "%s": the environment cannot be empty.', get_debug_type($this)));
+        }
+
         $this->debug = $debug;
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -55,6 +55,14 @@ public function testConstructor()
         $this->assertLessThanOrEqual(microtime(true), $kernel->getStartTime());
     }
 
+    public function testEmptyEnv()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage(sprintf('Invalid environment provided to "%s": the environment cannot be empty.', KernelForTest::class));
+
+        new KernelForTest('', false);
+    }
+
     public function testClone()
     {
         $env = 'test_env';
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
@@ -118,7 +118,7 @@ public function testConsumeRememberMeCookieExpired()
         $this->tokenProvider->expects($this->any())
             ->method('loadTokenBySeries')
             ->with('series1')
-            ->willReturn(new PersistentToken(InMemoryUser::class, 'wouter', 'series1', 'tokenvalue', new \DateTime('-'.(31536000 - 1).' seconds')));
+            ->willReturn(new PersistentToken(InMemoryUser::class, 'wouter', 'series1', 'tokenvalue', new \DateTime('-'.(31536000 + 1).' seconds')));
 
         $this->tokenProvider->expects($this->never())->method('updateToken')->with('series1');
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,10 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl`
`87`	`87`
`88`	`88`	`public function __construct(string $environment, bool $debug)`
`89`	`89`	`{`
`90`		`- $this->environment = $environment;`
	`90`	`+ if (!$this->environment = $environment) {`
	`91`	`+ throw new \InvalidArgumentException(sprintf('Invalid environment provided to "%s": the environment cannot be empty.', get_debug_type($this)));`
	`92`	`+ }`
	`93`	`+`
`91`	`94`	`$this->debug = $debug;`
`92`	`95`	`}`
`93`	`96`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,14 @@ public function testConstructor()`
`55`	`55`	`$this->assertLessThanOrEqual(microtime(true), $kernel->getStartTime());`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ public function testEmptyEnv()`
	`59`	`+ {`
	`60`	`+ $this->expectException(\InvalidArgumentException::class);`
	`61`	`+ $this->expectExceptionMessage(sprintf('Invalid environment provided to "%s": the environment cannot be empty.', KernelForTest::class));`
	`62`	`+`
	`63`	`+ new KernelForTest('', false);`
	`64`	`+ }`
	`65`	`+`
`58`	`66`	`public function testClone()`
`59`	`67`	`{`
`60`	`68`	`$env = 'test_env';`