Merge pull request #26 from magento-tsg/MC-40411

[Arrows] MC-40411: SVC false-positive: removing the leading slash from a class name in di.xml

Author: zakdma

src/Analyzer/DiXml/VirtualTypeAnalyzer.php

@@ -125,10 +125,31 @@ private function triggerNodeChange(VirtualType $nodeBefore, VirtualType $nodeAft
 
         foreach ($bcFieldBefore as $fieldName => $valueBefore) {
             $valueAfter = $bcFieldAfter[$fieldName];
-            if ($valueBefore !== $valueAfter) {
+            $changed = false;
+            switch ($fieldName) {
+                case 'type':
+                    $changed = $this->isTypeChanged($valueBefore, $valueAfter);
+                    break;
+                default:
+                    $changed = $valueBefore !== $valueAfter;
+                    break;
+            }
+            if ($changed) {
                 $operation = new VirtualTypeChanged($beforeFilePath, $fieldName);
                 $this->report->add('di', $operation);
             }
         }
     }
+
+    /**
+     * Trim leading backslashes and than compare types
+     *
+     * @param $typeBefore
+     * @param $typeAfter
+     * @return bool
+     */
+    private function isTypeChanged($typeBefore, $typeAfter): bool
+    {
+        return ltrim(trim($typeBefore), "\\") !== ltrim(trim($typeAfter), "\\");
+    }
 }

tests/Unit/Console/Command/CompareSourceCommandDiXmlTest.php

@@ -103,6 +103,14 @@ public function changesDataProvider()
                 ],
                 'Major change is detected.',
             ],
+            'removing-leading-slash-from-type' => [
+                $pathToFixtures . '/removing-leading-slash-from-type/source-code-before',
+                $pathToFixtures . '/removing-leading-slash-from-type/source-code-after',
+                [
+                    '#Suggested semantic versioning change: NONE#',
+                ],
+                'Patch change is detected.',
+            ],
         ];
     }
 }

tests/Unit/Console/Command/CompareSourceCommandTest/_files/di_xml/removing-leading-slash-from-type/source-code-after/Magento/TestModule/etc/di.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <virtualType name="testVirtualType" type="Path\To\Type">
+        <arguments>
+            <argument name="type" xsi:type="string">schema</argument>
+        </arguments>
+    </virtualType>
+
+    <preference for="Path\To\Interface" type="Path\To\Type" />
+
+    <type name="Path\To\Type">
+        <arguments>
+            <argument name="argumentName" xsi:type="array">
+                <item name="itemName" xsi:type="const">Path\To\Type\Item</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <type name="Path\To\Type">
+        <plugin name="pluginName" type="Path\To\Type\Plugin"/>
+    </type>
+</config>

tests/Unit/Console/Command/CompareSourceCommandTest/_files/di_xml/removing-leading-slash-from-type/source-code-before/Magento/TestModule/etc/di.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <virtualType name="testVirtualType" type="\Path\To\Type">
+        <arguments>
+            <argument name="type" xsi:type="string">schema</argument>
+        </arguments>
+    </virtualType>
+
+    <preference for="\Path\To\Interface" type="\Path\To\Type" />
+
+    <type name="\Path\To\Type">
+        <arguments>
+            <argument name="argumentName" xsi:type="array">
+                <item name="itemName" xsi:type="const">\Path\To\Type\Item</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <type name="\Path\To\Type">
+        <plugin name="pluginName" type="\Path\To\Type\Plugin"/>
+    </type>
+</config>