Skip to content

Commit c9ea2a1

Browse files
committed
Merge branch '4.2' into 4.3
* 4.2: [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 57dc7d5 + 6163f06 commit c9ea2a1

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
@@ -314,7 +314,7 @@ public function testLoadDirectory()
314314
$dotenv->load(__DIR__);
315315
}
316316

317-
public function testServerSuperglobalIsNotOverriden()
317+
public function testServerSuperglobalIsNotOverridden()
318318
{
319319
$originalValue = $_SERVER['argc'];
320320

@@ -324,7 +324,7 @@ public function testServerSuperglobalIsNotOverriden()
324324
$this->assertSame($originalValue, $_SERVER['argc']);
325325
}
326326

327-
public function testEnvVarIsNotOverriden()
327+
public function testEnvVarIsNotOverridden()
328328
{
329329
putenv('TEST_ENV_VAR=original_value');
330330
$_SERVER['TEST_ENV_VAR'] = 'original_value';
@@ -335,7 +335,7 @@ public function testEnvVarIsNotOverriden()
335335
$this->assertSame('original_value', getenv('TEST_ENV_VAR'));
336336
}
337337

338-
public function testHttpVarIsPartiallyOverriden()
338+
public function testHttpVarIsPartiallyOverridden()
339339
{
340340
$_SERVER['HTTP_TEST_ENV_VAR'] = 'http_value';
341341

0 commit comments

Comments
 (0)