diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PhpUnitBridge] fix compat with symfony/debug

Browse Source
This commit is contained in:
Nicolas Grekas 2021-03-17 09:49:43 +01:00
parent a78fb1832b
commit 35dd54a654
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
View File

@ -11,6 +11,8 @@
namespace Symfony\Bridge\PhpUnit\DeprecationErrorHandler; namespace Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
use PHPUnit\Framework\TestCase;
use PHPUnit\Framework\TestSuite;
use PHPUnit\Util\Test; use PHPUnit\Util\Test;
use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerFor; use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerFor;
use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader; use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
@ -82,7 +84,10 @@ class Deprecation
} }
} }
if (isset($line['object']) || isset($line['class'])) { if (!isset($line['object']) && !isset($line['class'])) {
return;
}
if (!isset($line['class'], $trace[$i - 2]['function']) || 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) { if (!isset($line['class'], $trace[$i - 2]['function']) || 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {
$this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class']; $this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];
$this->originMethod = $line['function']; $this->originMethod = $line['function'];
@ -90,7 +95,9 @@ class Deprecation
return; return;
} }
if ('trigger_error' !== $trace[$i - 2]['function'] || isset($trace[$i - 2]['class'])) { $test = isset($line['args'][0]) ? $line['args'][0] : null;
if (($test instanceof TestCase || $test instanceof TestSuite) && ('trigger_error' !== $trace[$i - 2]['function'] || isset($trace[$i - 2]['class']))) {
$this->originClass = \get_class($line['args'][0]); $this->originClass = \get_class($line['args'][0]);
$this->originMethod = $line['args'][0]->getName(); $this->originMethod = $line['args'][0]->getName();
@ -114,7 +121,6 @@ class Deprecation
$this->triggeringFile = $parsedMsg['triggering_file']; $this->triggeringFile = $parsedMsg['triggering_file'];
} }
} }
}
/** /**
* @return bool * @return bool