Merge branch '5.4' into 6.4

xabbuh · xabbuh · commit 2ae0c84cc9be · 2024-07-09T20:29:35.000+02:00
* 5.4:
  Fix typo
  use copy() instead of rename() on Windows
  test: kebab-case to snake_case
  [PropertyInfo] Handle collection in PhpStan same as PhpDoc
  [Messenger] Passing to `WorkerMessageRetriedEvent` envelope with actual stamps after sent
diff --git a/Tests/DotenvTest.php b/Tests/DotenvTest.php
@@ -430,16 +430,16 @@ public function testHttpVarIsPartiallyOverridden()
         $this->assertSame('http_value', $_SERVER['HTTP_TEST_ENV_VAR']);
     }
 
-    public function testEnvVarIsOverriden()
+    public function testEnvVarIsOverridden()
     {
-        putenv('TEST_ENV_VAR_OVERRIDEN=original_value');
+        putenv('TEST_ENV_VAR_OVERRIDDEN=original_value');
 
         $dotenv = (new Dotenv())->usePutenv();
-        $dotenv->populate(['TEST_ENV_VAR_OVERRIDEN' => 'new_value'], true);
+        $dotenv->populate(['TEST_ENV_VAR_OVERRIDDEN' => 'new_value'], true);
 
-        $this->assertSame('new_value', getenv('TEST_ENV_VAR_OVERRIDEN'));
-        $this->assertSame('new_value', $_ENV['TEST_ENV_VAR_OVERRIDEN']);
-        $this->assertSame('new_value', $_SERVER['TEST_ENV_VAR_OVERRIDEN']);
+        $this->assertSame('new_value', getenv('TEST_ENV_VAR_OVERRIDDEN'));
+        $this->assertSame('new_value', $_ENV['TEST_ENV_VAR_OVERRIDDEN']);
+        $this->assertSame('new_value', $_SERVER['TEST_ENV_VAR_OVERRIDDEN']);
     }
 
     public function testMemorizingLoadedVarsNamesInSpecialVar()

Original file line number	Diff line number	Diff line change
`@@ -430,16 +430,16 @@ public function testHttpVarIsPartiallyOverridden()`
`430`	`430`	`$this->assertSame('http_value', $_SERVER['HTTP_TEST_ENV_VAR']);`
`431`	`431`	`}`
`432`	`432`
`433`		`- public function testEnvVarIsOverriden()`
	`433`	`+ public function testEnvVarIsOverridden()`
`434`	`434`	`{`
`435`		`- putenv('TEST_ENV_VAR_OVERRIDEN=original_value');`
	`435`	`+ putenv('TEST_ENV_VAR_OVERRIDDEN=original_value');`
`436`	`436`
`437`	`437`	`$dotenv = (new Dotenv())->usePutenv();`
`438`		`- $dotenv->populate(['TEST_ENV_VAR_OVERRIDEN' => 'new_value'], true);`
	`438`	`+ $dotenv->populate(['TEST_ENV_VAR_OVERRIDDEN' => 'new_value'], true);`
`439`	`439`
`440`		`- $this->assertSame('new_value', getenv('TEST_ENV_VAR_OVERRIDEN'));`
`441`		`- $this->assertSame('new_value', $_ENV['TEST_ENV_VAR_OVERRIDEN']);`
`442`		`- $this->assertSame('new_value', $_SERVER['TEST_ENV_VAR_OVERRIDEN']);`
	`440`	`+ $this->assertSame('new_value', getenv('TEST_ENV_VAR_OVERRIDDEN'));`
	`441`	`+ $this->assertSame('new_value', $_ENV['TEST_ENV_VAR_OVERRIDDEN']);`
	`442`	`+ $this->assertSame('new_value', $_SERVER['TEST_ENV_VAR_OVERRIDDEN']);`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`public function testMemorizingLoadedVarsNamesInSpecialVar()`