Merge remote-tracking branch 'origin/AC-9619' into Hammer-SVC-False-Positive-Build

Author: glo71317

src/Analyzer/DiXml/VirtualTypeAnalyzer.php

@@ -13,6 +13,7 @@
 use Magento\SemanticVersionChecker\Node\VirtualType;
 use Magento\SemanticVersionChecker\Operation\DiXml\VirtualTypeChanged;
 use Magento\SemanticVersionChecker\Operation\DiXml\VirtualTypeRemoved;
+use Magento\SemanticVersionChecker\Operation\DiXml\VirtualTypeToTypeChanged;
 use Magento\SemanticVersionChecker\Registry\XmlRegistry;
 use PHPSemVerChecker\Registry\Registry;
 use PHPSemVerChecker\Report\Report;
@@ -60,7 +61,7 @@ public function analyze($registryBefore, $registryAfter)
  foreach ($moduleNodes as $name => $nodeBefore) {
  // search nodesAfter the by name
  $nodeAfter = $nodesAfter[$moduleName][$name] ?? false;
-
+ $fileAfter = $registryAfter->mapping[XmlRegistry::NODES_KEY][$moduleName];
  if ($nodeAfter !== false && $nodeBefore !== $nodeAfter) {
  /* @var VirtualType $nodeAfter */
  $this->triggerNodeChange($nodeBefore, $nodeAfter, $fileBefore);
@@ -78,14 +79,68 @@ public function analyze($registryBefore, $registryAfter)
  }
  }
 
- $operation = new VirtualTypeRemoved($fileBefore, $name);
+ $finalPath = $this->convertClassNameToFilePath($fileAfter, $name, '.php');
+
+ if (file_exists($finalPath)) {
+ $operation = new VirtualTypeToTypeChanged($fileBefore, $name);
+ } else {
+ $operation = new VirtualTypeRemoved($fileBefore, $name);
+ }
  $this->report->add('di', $operation);
  }
  }
 
  return $this->report;
  }
 
+ /**
+ * Method to convert class name to file path
+ *
+ * @param string $filePath
+ * @param string $className
+ * @param string $extraString
+ * @return string
+ */
+ private function convertClassNameToFilePath($filePath, $className, $extraString = ''): string
+ {
+ // Split the initial file path to get the base directory.
+ $parts = explode('/', $filePath);
+ $classParts = explode('\\', $className);
+
+ // Find the common part between the file path and class name.
+ $baseDirParts = [];
+ foreach ($parts as $part) {
+ $baseDirParts[] = $part;
+
+ if (in_array($part, $classParts)) {
+ break;
+ }
+ }
+
+ // Reconstruct the base directory path.
+ $baseDir = implode('/', $baseDirParts);
+
+ // Replace namespace separators with directory separators in the class name.
+ $classFilePath = str_replace('\\', '/', $className);
+
+ $position = strpos($classFilePath, "/");
+
+ if ($position !== false) {
+ $classFilePath = substr($classFilePath, $position);
+ }
+
+ // Combine the base directory and class file path.
+ $fullPath = rtrim($baseDir, '/') . $classFilePath;
+
+
+ // Append the extra string if provided.
+ if ($extraString) {
+ $fullPath .= $extraString;
+ }
+ return $fullPath;
+ }
+
+
  /**
  * Return a filtered node list from type {@link VirtualType}
  *

src/Operation/DiXml/VirtualTypeToTypeChanged.php

@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SemanticVersionChecker\Operation\DiXml;
+
+use PHPSemVerChecker\Operation\Operation;
+use PHPSemVerChecker\SemanticVersioning\Level;
+
+/**
+ * When a virtual type was changed.
+ */
+class VirtualTypeToTypeChanged extends Operation
+{
+ /**
+ * Error codes.
+ *
+ * @var array
+ */
+ protected $code = 'M201';
+
+ /**
+ * Change level.
+ *
+ * @var int
+ */
+ protected $level = Level::PATCH;
+
+ /**
+ * Operation message.
+ *
+ * @var string
+ */
+ protected $reason = 'Virtual Type was changed to type';
+ /**
+ * File path before changes.
+ *
+ * @var string
+ */
+ protected $fileBefore;
+
+ /**
+ * Property context before changes.
+ *
+ * @var \PhpParser\Node\Stmt
+ */
+ protected $contextBefore;
+
+ /**
+ * Property before changes.
+ *
+ * @var \PhpParser\Node\Stmt\Property
+ */
+ protected $propertyBefore;
+
+ /**
+ * @param string $fileBefore
+ * @param string $target
+ */
+ public function __construct($fileBefore, $target)
+ {
+ $this->fileBefore = $fileBefore;
+ $this->target = $target;
+ }
+
+ /**
+ * Returns file path before changes.
+ *
+ * @return string
+ */
+ public function getLocation(): string
+ {
+ return $this->fileBefore;
+ }
+
+ /**
+ * Returns line position of existed property.
+ *
+ * @return int
+ */
+ public function getLine(): int
+ {
+ return 0;
+ }
+ /**
+ * Get level.
+ *
+ * @return mixed
+ */
+ public function getLevel(): int
+ {
+ return $this->level;
+ }
+}