Merge branch '4.3' into 4.4

* 4.3:
  [PhpUnitBridge] fix undefined variables
This commit is contained in:
Nicolas Grekas 2019-09-19 19:31:55 +02:00
commit de346f1fe3

View File

@ -28,29 +28,10 @@ class Deprecation
const TYPE_INDIRECT = 'type_indirect';
const TYPE_UNDETERMINED = 'type_undetermined';
/**
* @var array
*/
private $trace;
/**
* @var string
*/
private $trace = [];
private $message;
/**
* @var ?string
*/
private $originClass;
/**
* @var ?string
*/
private $originMethod;
/**
* @var string
*/
private $triggeringFile;
/** @var string[] Absolute paths to vendor directories */
@ -262,7 +243,7 @@ class Deprecation
private static function getVendors()
{
if (null === self::$vendors) {
self::$vendors = [];
self::$vendors = $paths = [];
foreach (get_declared_classes() as $class) {
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
$r = new \ReflectionClass($class);