Merge pull request #36 from magento-gl/Hammer_PlatForm_Health_246_Scope_14102022

[Hammer]_Platform_Health_246_Scope_14102022

Author: glo71317

composer.json

@@ -8,7 +8,7 @@
     ],
     "bin": ["bin/svc"],
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~7.4.0||~8.1.0||~8.2.0",
         "ext-json": "*",
         "laminas/laminas-dependency-plugin": "^2.2.0",
         "laminas/laminas-stdlib": "~3.6.0",

composer.lock

@@ -24,11 +24,12 @@
 use Magento\SemanticVersionChecker\Operation\ExtendableClassConstructorOptionalParameterAdded;
 use Magento\SemanticVersionChecker\Operation\Visibility\MethodDecreased as VisibilityMethodDecreased;
 use Magento\SemanticVersionChecker\Operation\Visibility\MethodIncreased as VisibilityMethodIncreased;
-use PhpParser\Node\NullableType;
 use PhpParser\Node\Name;
+use PhpParser\Node\NullableType;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\UnionType;
 use PHPSemVerChecker\Comparator\Implementation;
 use PHPSemVerChecker\Operation\ClassMethodAdded;
 use PHPSemVerChecker\Operation\ClassMethodImplementationChanged;
@@ -410,12 +411,24 @@ private function isDeclarationReturnTypeChanged(ClassMethod $methodBefore, Class
         if (!$this->isReturnsEqualByNullability($methodBefore, $methodAfter)) {
             return true;
         }
-        $beforeMethodReturnType = $methodBefore->returnType instanceof NullableType
-            ? (string) $methodBefore->returnType->type
-            : (string) $methodBefore->returnType;
-        $afterMethodReturnType = $methodAfter->returnType instanceof NullableType
-            ? (string) $methodAfter->returnType->type
-            : (string) $methodAfter->returnType;
+
+        $methodBeforeReturnType = $methodBefore->returnType;
+        if ($methodBeforeReturnType instanceof NullableType) {
+            $beforeMethodReturnType = (string)$methodBeforeReturnType->type;
+        } elseif ($methodBeforeReturnType instanceof UnionType) {
+            $beforeMethodReturnType = implode('&', $methodBeforeReturnType->types);
+        } else {
+            $beforeMethodReturnType = (string)$methodBeforeReturnType;
+        }
+
+        $methodAfterReturnType = $methodAfter->returnType;
+        if ($methodAfterReturnType instanceof NullableType) {
+            $afterMethodReturnType = (string)$methodAfterReturnType->type;
+        } elseif ($methodAfterReturnType instanceof UnionType) {
+            $afterMethodReturnType = implode('&', $methodAfterReturnType->types);
+        } else {
+            $afterMethodReturnType = (string)$methodAfterReturnType;
+        }
 
         return $beforeMethodReturnType !== $afterMethodReturnType;
     }