Merge branch '4.3' into 4.4

* 4.3:
  fix merge
This commit is contained in:
Nicolas Grekas 2019-06-13 16:07:54 +02:00
commit 7a1e6f732e

View File

@ -30,17 +30,17 @@ class ClassExistsMock
public static function class_exists($name, $autoload = true)
{
return (bool) (self::$classes[ltrim($name, '\\')] ?? class_exists($name, $autoload));
return (bool) (self::$classes[ltrim($name, '\\')] ?? \class_exists($name, $autoload));
}
public static function interface_exists($name, $autoload = true)
{
return (bool) (self::$classes[ltrim($name, '\\')] ?? interface_exists($name, $autoload));
return (bool) (self::$classes[ltrim($name, '\\')] ?? \interface_exists($name, $autoload));
}
public static function trait_exists($name, $autoload = true)
{
return (bool) (self::$classes[ltrim($name, '\\')] ?? trait_exists($name, $autoload));
return (bool) (self::$classes[ltrim($name, '\\')] ?? \trait_exists($name, $autoload));
}
public static function register($class)