Merge pull request #45 from magento-gl/AC-8781

AC-8781:Fatal Error when introducing Union Type in SVC

Author: sidolov

src/Comparator/Signature.php

@@ -9,7 +9,7 @@
 
 namespace Magento\SemanticVersionChecker\Comparator;
 
-use PHPSemVerChecker\Comparator\Type;
+use PHPSemVerChecker\Comparator\Node;
 
 class Signature extends \PHPSemVerChecker\Comparator\Signature
 {
@@ -74,7 +74,59 @@ public static function isObjectParams(array $params)
      */
     public static function analyze(array $parametersA, array $parametersB)
     {
-        $changes = parent::analyze($parametersA, $parametersB);
+        // @TODO need to revert this change once new version of tomzx/php-semver-checker is released
+        // After https://github.com/tomzx/php-semver-checker/issues/179 issue is addressed.
+        // Moving the implementation of library to core to fix critical failure due to this library issue
+        $changes = [
+            'parameter_added'                 => false,
+            'parameter_removed'               => false,
+            'parameter_renamed'               => false,
+            'parameter_typing_added'          => false,
+            'parameter_typing_removed'        => false,
+            'parameter_default_added'         => false,
+            'parameter_default_removed'       => false,
+            'parameter_default_value_changed' => false,
+        ];
+        $lengthA = count($parametersA);
+        $lengthB = count($parametersB);
+
+        // TODO([email protected]): This is only true if newer params do not have defaults
+        if ($lengthA < $lengthB) {
+            $changes['parameter_added'] = true;
+        } elseif ($lengthA > $lengthB) {
+            $changes['parameter_removed'] = true;
+        }
+
+        $iterations = min($lengthA, $lengthB);
+        for ($i = 0; $i < $iterations; ++$i) {
+            // Name checking
+            if ($parametersA[$i]->var->name !== $parametersB[$i]->var->name) {
+                $changes['parameter_renamed'] = true;
+            }
+
+            // Type checking
+            if (Type::get($parametersA[$i]->type) !== Type::get($parametersB[$i]->type)) {
+                if ($parametersA[$i]->type !== null) {
+                    $changes['parameter_typing_removed'] = true;
+                }
+                if ($parametersB[$i]->type !== null) {
+                    $changes['parameter_typing_added'] = true;
+                }
+            }
+
+            // Default checking
+            if ($parametersA[$i]->default === null && $parametersB[$i]->default === null) {
+                // Do nothing
+            } elseif ($parametersA[$i]->default !== null && $parametersB[$i]->default === null) {
+                $changes['parameter_default_removed'] = true;
+            } elseif ($parametersA[$i]->default === null && $parametersB[$i]->default !== null) {
+                $changes['parameter_default_added'] = true;
+                // TODO([email protected]): Not all nodes have a value property
+            } elseif (!Node::isEqual($parametersA[$i]->default, $parametersB[$i]->default)) {
+                $changes['parameter_default_value_changed'] = true;
+            }
+        }
+
         $changes = array_merge($changes, [
             'parameter_typing_added'          => false,
             'parameter_typing_removed'        => false,

src/Comparator/Type.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SemanticVersionChecker\Comparator;
+
+use PhpParser\Node\Name;
+use PhpParser\Node\NullableType;
+use PhpParser\Node\UnionType;
+
+class Type extends \PHPSemVerChecker\Comparator\Type
+{
+    /**
+     * @param Name|NullableType|string|null $type
+     * @return string|null
+     */
+    public static function get($type)
+    {
+        if (! is_object($type)) {
+            return $type;
+        }
+
+        if ($type instanceof NullableType) {
+            return '?' . static::get($type->type);
+        }
+
+        if ($type instanceof UnionType) {
+            return $type->getType();
+        }
+
+        return $type->toString();
+    }
+}