Skip to content

Commit 6163f06

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: [FrameworkBundle] Fix calling Client::getProfile() before sending a request Fix type error [Security/Core] Don't use ParagonIE_Sodium_Compat collect called listeners information only once add test to avoid regressions fix typos Turkish translation added to Form Component
2 parents c2f31ab + 3f4fdfb commit 6163f06

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Tests/DotenvTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public function testLoadDirectory()
305305
$dotenv->load(__DIR__);
306306
}
307307

308-
public function testServerSuperglobalIsNotOverriden()
308+
public function testServerSuperglobalIsNotOverridden()
309309
{
310310
$originalValue = $_SERVER['argc'];
311311

@@ -315,7 +315,7 @@ public function testServerSuperglobalIsNotOverriden()
315315
$this->assertSame($originalValue, $_SERVER['argc']);
316316
}
317317

318-
public function testEnvVarIsNotOverriden()
318+
public function testEnvVarIsNotOverridden()
319319
{
320320
putenv('TEST_ENV_VAR=original_value');
321321
$_SERVER['TEST_ENV_VAR'] = 'original_value';
@@ -326,7 +326,7 @@ public function testEnvVarIsNotOverriden()
326326
$this->assertSame('original_value', getenv('TEST_ENV_VAR'));
327327
}
328328

329-
public function testHttpVarIsPartiallyOverriden()
329+
public function testHttpVarIsPartiallyOverridden()
330330
{
331331
$_SERVER['HTTP_TEST_ENV_VAR'] = 'http_value';
332332

0 commit comments

Comments
 (0)