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

Commitf4cd670

Browse files
committed
disable global test listener when not registered
The global test listener is always initialized to register the clockmock and DNS mock as soon as possible. However, when the listener isregistered locally through the PHPUnit config, it will never beregistered as a listener. In thise case, the state of the locallistener must be reset to correctly report expected deprecation testresults.
1 parentf7bdfd0 commitf4cd670

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListener.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ public function __construct(array $mockedNamespaces = array())
2727
$this->trait =newSymfonyTestsListenerTrait($mockedNamespaces);
2828
}
2929

30+
publicfunctionglobalListenerDisabled()
31+
{
32+
$this->trait->globalListenerDisabled();
33+
}
34+
3035
publicfunctionstartTestSuite(\PHPUnit_Framework_TestSuite$suite)
3136
{
3237
return$this->trait->startTestSuite($suite);

‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ public function __destruct()
9393
}
9494
}
9595

96+
publicfunctionglobalListenerDisabled()
97+
{
98+
self::$globallyEnabled =false;
99+
$this->state = -1;
100+
}
101+
96102
publicfunctionstartTestSuite($suite)
97103
{
98104
if (class_exists('PHPUnit_Util_Blacklist',false)) {

‎src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,17 @@ protected function handleConfiguration(array &$arguments)
3838

3939
$arguments['listeners'] =isset($arguments['listeners']) ?$arguments['listeners'] :array();
4040

41-
if (!array_filter($arguments['listeners'],function ($listener) {return$listenerinstanceof SymfonyTestsListener; })) {
41+
$registeredLocally =false;
42+
43+
foreach ($arguments['listeners']as$registeredListener) {
44+
if ($registeredListenerinstanceof SymfonyTestsListener) {
45+
$registeredListener->globalListenerDisabled();
46+
$registeredLocally =true;
47+
break;
48+
}
49+
}
50+
51+
if (!$registeredLocally) {
4252
$arguments['listeners'][] =$listener;
4353
}
4454

0 commit comments

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