Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit88cfcb5

Browse files
greg0irenicolas-grekas
authored andcommitted
[PhpunitBridge] Read environment variable from superglobals
The Dotenv component has recently been switched to using superglobalsinstead of putenv(). Let us support both and give priority tosuperglobals.Closes#31857
1 parent2b8e441 commit88cfcb5

File tree

4 files changed

+57
-3
lines changed

4 files changed

+57
-3
lines changed

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,13 @@ private function getConfiguration()
216216
return$this->configuration;
217217
}
218218
if (false ===$mode =$this->mode) {
219-
$mode =getenv('SYMFONY_DEPRECATIONS_HELPER');
219+
if (isset($_SERVER['SYMFONY_DEPRECATIONS_HELPER'])) {
220+
$mode =$_SERVER['SYMFONY_DEPRECATIONS_HELPER'];
221+
}elseif (isset($_ENV['SYMFONY_DEPRECATIONS_HELPER'])) {
222+
$mode =$_ENV['SYMFONY_DEPRECATIONS_HELPER'];
223+
}else {
224+
$mode =getenv('SYMFONY_DEPRECATIONS_HELPER');
225+
}
220226
}
221227
if ('strict' ===$mode) {
222228
return$this->configuration = Configuration::inStrictMode();

‎src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
--TEST--
2-
Test DeprecationErrorHandler inweak mode
2+
Test DeprecationErrorHandler indisabled mode
33
--FILE--
44
<?php
55

6-
putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
6+
$_SERVER['SYMFONY_DEPRECATIONS_HELPER'] ='disabled';
77
putenv('ANSICON');
88
putenv('ConEmuANSI');
99
putenv('TERM');
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
--TEST--
2+
Test DeprecationErrorHandler in disabled mode (via putenv)
3+
--FILE--
4+
<?php
5+
6+
$_ENV['SYMFONY_DEPRECATIONS_HELPER'] ='disabled';
7+
putenv('ANSICON');
8+
putenv('ConEmuANSI');
9+
putenv('TERM');
10+
11+
$vendor =__DIR__;
12+
while (!file_exists($vendor.'/vendor')) {
13+
$vendor =dirname($vendor);
14+
}
15+
define('PHPUNIT_COMPOSER_INSTALL',$vendor.'/vendor/autoload.php');
16+
requirePHPUNIT_COMPOSER_INSTALL;
17+
require_once__DIR__.'/../../bootstrap.php';
18+
19+
echo (int)set_error_handler('var_dump');
20+
echo (int)class_exists('Symfony\Bridge\PhpUnit\DeprecationErrorHandler',false);
21+
22+
?>
23+
--EXPECTF--
24+
00
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
--TEST--
2+
Test DeprecationErrorHandler in disabled mode (via putenv)
3+
--FILE--
4+
<?php
5+
6+
putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
7+
putenv('ANSICON');
8+
putenv('ConEmuANSI');
9+
putenv('TERM');
10+
11+
$vendor =__DIR__;
12+
while (!file_exists($vendor.'/vendor')) {
13+
$vendor =dirname($vendor);
14+
}
15+
define('PHPUNIT_COMPOSER_INSTALL',$vendor.'/vendor/autoload.php');
16+
requirePHPUNIT_COMPOSER_INSTALL;
17+
require_once__DIR__.'/../../bootstrap.php';
18+
19+
echo (int)set_error_handler('var_dump');
20+
echo (int)class_exists('Symfony\Bridge\PhpUnit\DeprecationErrorHandler',false);
21+
22+
?>
23+
--EXPECTF--
24+
00

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp