Skip to content

Commit 538c955

Browse files
Merge branch '4.3' into 4.4
* 4.3: [PhpUnitBridge] more fixes for PHP 5.5
2 parents 8b376c1 + 0e35408 commit 538c955

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DeprecationErrorHandler/Deprecation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private static function getVendors()
247247
foreach (get_declared_classes() as $class) {
248248
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
249249
$r = new \ReflectionClass($class);
250-
$v = \dirname($r->getFileName(), 2);
250+
$v = \dirname(\dirname($r->getFileName()));
251251
if (file_exists($v.'/composer/installed.json')) {
252252
self::$vendors[] = $v;
253253
$loader = require $v.'/autoload.php';

Tests/DeprecationErrorHandler/DeprecationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function testItCanTellWhetherItIsInternal()
2929
{
3030
$r = new \ReflectionClass(Deprecation::class);
3131

32-
if (dirname($r->getFileName(), 2) !== dirname(__DIR__, 2)) {
32+
if (\dirname(\dirname($r->getFileName())) !== \dirname(\dirname(__DIR__))) {
3333
$this->markTestSkipped('Test case is not compatible with having the bridge in vendor/');
3434
}
3535

0 commit comments

Comments
 (0)