FEATURE: Increase PHP 8 compatibility

Related: #2233
neos · Feb 25, 2021 · 0da755f · 0da755f
1 parent d84c96b
commit 0da755f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/Neos.Flow/Classes/Core/LockManager.php b/Neos.Flow/Classes/Core/LockManager.php
@@ -135,7 +135,9 @@ public function unlockSite()
  fclose($this->lockResource);
  unlink($this->lockPathAndFilename);
  }
- @unlink($this->lockFlagPathAndFilename);
+ if (file_exists($this->lockFlagPathAndFilename)) {
+ @unlink($this->lockFlagPathAndFilename);
+ }
  }
 
  /**

diff --git a/Neos.Flow/Classes/Reflection/ParameterReflection.php b/Neos.Flow/Classes/Reflection/ParameterReflection.php
@@ -57,9 +57,9 @@ public function getClass()
  public function getBuiltinType()
  {
  $type = $this->getType();
- if ($type === null || !$type->isBuiltin()) {
+ if (!$type instanceof \ReflectionNamedType) {
  return null;
  }
- return $type instanceof \ReflectionNamedType ? $type->getName() : (string)$type;
+ return $type->isBuiltin() ? $type->getName() : null;
  }
 }
diff --git a/Neos.Flow/Classes/SignalSlot/Dispatcher.php b/Neos.Flow/Classes/SignalSlot/Dispatcher.php
@@ -149,7 +149,7 @@ public function dispatch(string $signalClassName, string $signalName, array $sig
  }
 
  foreach ($this->slots[$signalClassName][$signalName] as $slotInformation) {
- $finalSignalArguments = $signalArguments;
+ $finalSignalArguments = array_values($signalArguments);
  if (isset($slotInformation['object'])) {
  $object = $slotInformation['object'];
  } elseif (strpos($slotInformation['method'], '::') === 0) {

diff --git a/Neos.Flow/Classes/Utility/PhpAnalyzer.php b/Neos.Flow/Classes/Utility/PhpAnalyzer.php
@@ -89,7 +89,7 @@ public function extractNamespace(): ?string
  return ltrim($value, '\\');
  }
  if ($type === T_STRING) {
- $namespaceParts[] = $value;
+ $namespaceParts[] = ltrim($value, '\\');
  continue;
  }
  if ($type !== T_NS_SEPARATOR && $type !== T_WHITESPACE) {