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 da617e8

Browse filesBrowse files
committed
fix deprecation triggering test detection
1 parent be9382a commit da617e8
Copy full SHA for da617e8

File tree

2 files changed

+12
-4
lines changed
Filter options

2 files changed

+12
-4
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+10-2Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,16 @@ public static function register($mode = 0)
116116
}
117117

118118
if (isset($trace[$i]['object']) || isset($trace[$i]['class'])) {
119-
$class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
120-
$method = $trace[$i]['function'];
119+
if (isset($trace[$i]['class']) && in_array($trace[$i]['class'], array('Symfony\Bridge\PhpUnit\SymfonyTestsListener', 'Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListener'), true)) {
120+
$parsedMsg = unserialize($msg);
121+
$msg = $parsedMsg['deprecation'];
122+
$class = $parsedMsg['class'];
123+
$method = $parsedMsg['method'];
124+
} else {
125+
$class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
126+
$method = $trace[$i]['function'];
127+
}
128+
121129
$Test = $UtilPrefix.'Test';
122130

123131
if (0 !== error_reporting()) {

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,9 @@ public function endTest($test, $time)
264264
unlink($this->runsInSeparateProcess);
265265
foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
266266
if ($deprecation[0]) {
267-
trigger_error($deprecation[1], E_USER_DEPRECATED);
267+
trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false))), E_USER_DEPRECATED);
268268
} else {
269-
@trigger_error($deprecation[1], E_USER_DEPRECATED);
269+
@trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false))), E_USER_DEPRECATED);
270270
}
271271
}
272272
$this->runsInSeparateProcess = false;

0 commit comments

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