DependencyChecker: fixed compatibility with PHP 8 [Closes #247]

nette · Nov 4, 2020 · 47688f3 · 47688f3
1 parent 8d796de
commit 47688f3
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/DI/DependencyChecker.php b/src/DI/DependencyChecker.php
@@ -132,14 +132,15 @@ class_uses($name),
  }
  foreach ($class->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
  if ($method->getDeclaringClass() == $class) { // intentionally ==
+ $type = $method->getReturnType();
  $hash[] = [
  $name,
  $method->name,
  $method->getDocComment(),
  self::hashParameters($method),
- $method->hasReturnType()
- ? [$method->getReturnType()->getName(), $method->getReturnType()->allowsNull()]
- : null,
+ PHP_VERSION_ID < 80000
+ ? ($type ? [$type->getName(), $type->allowsNull()] : null)
+ : (string) $type,
  ];
  }
  }
@@ -158,14 +159,15 @@ class_uses($name),
  $method = new \ReflectionFunction($name);
  $uses = null;
  }
+ $type = $method->getReturnType();
  $hash[] = [
  $name,
  $uses,
  $method->getDocComment(),
  self::hashParameters($method),
- $method->hasReturnType()
- ? [$method->getReturnType()->getName(), $method->getReturnType()->allowsNull()]
- : null,
+ PHP_VERSION_ID < 80000
+ ? ($type ? [$type->getName(), $type->allowsNull()] : null)
+ : (string) $type,
  ];
  }
 
@@ -179,8 +181,9 @@ private static function hashParameters(\ReflectionFunctionAbstract $method): arr
  foreach ($method->getParameters() as $param) {
  $res[] = [
  $param->name,
- Reflection::getParameterType($param),
- $param->allowsNull(),
+ PHP_VERSION_ID < 80000
+ ? [Reflection::getParameterType($param), $param->allowsNull()]
+ : (string) $param->getType(),
  $param->isVariadic(),
  $param->isDefaultValueAvailable()
  ? [Reflection::getParameterDefaultValue($param)]