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

Appearance settings

Commit cadc313

Browse filesBrowse files
committed
bug #21825 [PhpUnitBridge] disable global test listener when not registered (xabbuh)
This PR was merged into the 2.8 branch. Discussion ---------- [PhpUnitBridge] disable global test listener when not registered | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The global test listener is always initialized to register the clock mock and DNS mock as soon as possible. However, when the listener is registered locally through the PHPUnit config, it will never be registered as a listener. In thise case, the state of the local listener must be reset to correctly report expected deprecation test results. Commits ------- e068661 disable global test listener when not registered
2 parents 4b27628 + e068661 commit cadc313
Copy full SHA for cadc313

File tree

Expand file treeCollapse file tree

2 files changed

+17
-1
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+17
-1
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ public function __destruct()
6868
}
6969
}
7070

71+
public function globalListenerDisabled()
72+
{
73+
self::$globallyEnabled = false;
74+
$this->state = -1;
75+
}
76+
7177
public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
7278
{
7379
$suiteName = $suite->getName();

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
+11-1Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,17 @@ protected function handleConfiguration(array &$arguments)
3333

3434
$arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
3535

36-
if (!array_filter($arguments['listeners'], function ($listener) { return $listener instanceof SymfonyTestsListener; })) {
36+
$registeredLocally = false;
37+
38+
foreach ($arguments['listeners'] as $registeredListener) {
39+
if ($registeredListener instanceof SymfonyTestsListener) {
40+
$registeredListener->globalListenerDisabled();
41+
$registeredLocally = true;
42+
break;
43+
}
44+
}
45+
46+
if (!$registeredLocally) {
3747
$arguments['listeners'][] = $listener;
3848
}
3949

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.