Remove duplicate code

magento · Sep 26, 2023 · c688fd3 · c688fd3
1 parent 880d4f7
commit c688fd3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 52 deletions.
diff --git a/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php b/Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
@@ -47,14 +47,7 @@ public function process(File $phpcsFile, $stackPtr)
         // instead, as it is the one we compare with $stackPtr later on.
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         if ($xml === false) {
-            $phpcsFile->addError(
-                "Couldn't parse contents of '%s', check that they are in valid XML format",
-                $stackPtr,
-                self::ERROR_CODE_CONFIG,
-                [
-                    $phpcsFile->getFilename(),
-                ]
-            );
+            return;
         }
 
         $classes = $this->collectClassesInConfig($xml);

diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -221,14 +221,6 @@ public function process(File $phpcsFile, $stackPtr)
         $layout = simplexml_load_string($this->getFormattedXML($phpcsFile));
 
         if ($layout === false) {
-            $phpcsFile->addError(
-                "Couldn't parse contents of '%s', check that they are in valid XML format",
-                $stackPtr,
-                self::ERROR_CODE_XML,
-                [
-                    $phpcsFile->getFilename(),
-                ]
-            );
             return;
         }
 

diff --git a/Magento2/Sniffs/Legacy/ModuleXMLSniff.php b/Magento2/Sniffs/Legacy/ModuleXMLSniff.php
@@ -46,14 +46,6 @@ public function process(File $phpcsFile, $stackPtr)
         // instead, as it is the one we compare with $stackPtr later on.
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         if ($xml === false) {
-            $phpcsFile->addError(
-                "Couldn't parse contents of '%s', check that they are in valid XML format",
-                $stackPtr,
-                self::ERROR_CODE,
-                [
-                    $phpcsFile->getFilename(),
-                ]
-            );
             return;
         }
 

diff --git a/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php b/Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
@@ -42,14 +42,7 @@ public function process(File $phpcsFile, $stackPtr)
         // instead, as it is the one we compare with $stackPtr later on.
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
         if ($xml === false) {
-            $phpcsFile->addError(
-                "Couldn't parse contents of '%s', check that they are in valid XML format",
-                $stackPtr,
-                self::ERROR_CODE_CONFIG,
-                [
-                    $phpcsFile->getFilename(),
-                ]
-            );
+            return;
         }
 
         foreach ($this->getObsoleteNodes() as $xpath => $suggestion) {

diff --git a/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php b/Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
@@ -39,7 +39,6 @@ public function process(File $phpcsFile, $stackPtr)
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
 
         if ($xml === false) {
-            $this->invalidXML($phpcsFile, $stackPtr);
             return;
         }
 

diff --git a/Magento2/Sniffs/Legacy/ParseXMLTrait.php b/Magento2/Sniffs/Legacy/ParseXMLTrait.php
@@ -12,24 +12,6 @@
 
 trait ParseXMLTrait
 {
-    /**
-     * Adds an invalid XML error
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     */
-    private function invalidXML(File $phpcsFile, int $stackPtr): void
-    {
-        $phpcsFile->addError(
-            "Couldn't parse contents of '%s', check that they are in valid XML format.",
-            $stackPtr,
-            'WrongXML',
-            [
-                $phpcsFile->getFilename(),
-            ]
-        );
-    }
-
     /**
      * Format the incoming XML to avoid tags split into several lines.
      *
@@ -45,6 +27,14 @@ private function getFormattedXML(File $phpcsFile)
             $doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
             return $doc->saveXML();
         } catch (\Exception $e) {
+            $phpcsFile->addError(
+                "Couldn't parse contents of '%s', check that they are in valid XML format.",
+                0,
+                'WrongXML',
+                [
+                    $phpcsFile->getFilename(),
+                ]
+            );
             return false;
         }
     }

diff --git a/Magento2/Sniffs/Legacy/WidgetXMLSniff.php b/Magento2/Sniffs/Legacy/WidgetXMLSniff.php
@@ -44,7 +44,6 @@ public function process(File $phpcsFile, $stackPtr)
         $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
 
         if ($xml === false) {
-            $this->invalidXML($phpcsFile, $stackPtr);
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,6 @@ public function process(File $phpcsFile, $stackPtr) @@
             $xml = simplexml_load_string($this->getFormattedXML($phpcsFile));
             if ($xml === false) {
-                $this->invalidXML($phpcsFile, $stackPtr);
                 return;
             }
@@ Expand Down @@