Skip to content

Commit 8b376c1

Browse files
Merge branch '4.3' into 4.4
* 4.3: [PhpUnitBridge] fix undefined variables
2 parents 6662677 + 6c8ab8e commit 8b376c1

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

DeprecationErrorHandler/Deprecation.php

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,10 @@ class Deprecation
2828
const TYPE_INDIRECT = 'type_indirect';
2929
const TYPE_UNDETERMINED = 'type_undetermined';
3030

31-
/**
32-
* @var array
33-
*/
34-
private $trace;
35-
36-
/**
37-
* @var string
38-
*/
31+
private $trace = [];
3932
private $message;
40-
41-
/**
42-
* @var ?string
43-
*/
4433
private $originClass;
45-
46-
/**
47-
* @var ?string
48-
*/
4934
private $originMethod;
50-
51-
/**
52-
* @var string
53-
*/
5435
private $triggeringFile;
5536

5637
/** @var string[] Absolute paths to vendor directories */
@@ -262,7 +243,7 @@ private function getPackage($path)
262243
private static function getVendors()
263244
{
264245
if (null === self::$vendors) {
265-
self::$vendors = [];
246+
self::$vendors = $paths = [];
266247
foreach (get_declared_classes() as $class) {
267248
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
268249
$r = new \ReflectionClass($class);

0 commit comments

Comments
 (0)