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

Merge branch '4.3' into 4.4

Browse Source 
* 4.3:
  [PhpUnitBridge] more fixes for PHP 5.5
This commit is contained in:
Nicolas Grekas 2019-09-19 19:42:09 +02:00
commit dee76144e5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,7 @@ class Deprecation
foreach (get_declared_classes() as $class) {
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
$r = new \ReflectionClass($class);
$v = \dirname($r->getFileName(), 2);
$v = \dirname(\dirname($r->getFileName()));
if (file_exists($v.'/composer/installed.json')) {
self::$vendors[] = $v;
$loader = require $v.'/autoload.php';

2
src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
View File

@ -29,7 +29,7 @@ class DeprecationTest extends TestCase
{
$r = new \ReflectionClass(Deprecation::class);
if (dirname($r->getFileName(), 2) !== dirname(__DIR__, 2)) {
if (\dirname(\dirname($r->getFileName())) !== \dirname(\dirname(__DIR__))) {
$this->markTestSkipped('Test case is not compatible with having the bridge in vendor/');
}