Fix issue magento#31396

Author: thomas-kl1

lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php

@@ -153,19 +153,15 @@ public function applyDataPatch($moduleName = null)
                     new Phrase("Patch %1 should implement DataPatchInterface", [get_class($dataPatch)])
                 );
             }
+            if ($this->isApplied($dataPatch)) {
+                continue;
+            }
             if ($dataPatch instanceof NonTransactionableInterface) {
-                $dataPatch->apply();
-                $this->patchHistory->fixPatch(get_class($dataPatch));
+                $this->applyPatch($dataPatch);
             } else {
                 try {
                     $this->moduleDataSetup->getConnection()->beginTransaction();
-                    $dataPatch->apply();
-                    $this->patchHistory->fixPatch(get_class($dataPatch));
-                    foreach ($dataPatch->getAliases() as $patchAlias) {
-                        if (!$this->patchHistory->isApplied($patchAlias)) {
-                            $this->patchHistory->fixPatch($patchAlias);
-                        }
-                    }
+                    $this->applyPatch($dataPatch);
                     $this->moduleDataSetup->getConnection()->commit();
                 } catch (\Exception $e) {
                     $this->moduleDataSetup->getConnection()->rollBack();
@@ -187,35 +183,6 @@ public function applyDataPatch($moduleName = null)
         }
     }
 
-    /**
-     * Register all patches in registry in order to manipulate chains and dependencies of patches of patches
-     *
-     * @param string $moduleName
-     * @param string $patchType
-     * @return PatchRegistry
-     */
-    private function prepareRegistry($moduleName, $patchType)
-    {
-        $reader = $patchType === self::DATA_PATCH ? $this->dataPatchReader : $this->schemaPatchReader;
-        $registry = $this->patchRegistryFactory->create();
-
-        //Prepare modules to read
-        if ($moduleName === null) {
-            $patchNames = [];
-            foreach ($this->moduleList->getNames() as $moduleName) {
-                $patchNames += $reader->read($moduleName);
-            }
-        } else {
-            $patchNames = $reader->read($moduleName);
-        }
-
-        foreach ($patchNames as $patchName) {
-            $registry->registerPatch($patchName);
-        }
-
-        return $registry;
-    }
-
     /**
      * Apply all patches for one module
      *
@@ -240,12 +207,8 @@ public function applySchemaPatch($moduleName = null)
                  * @var SchemaPatchInterface $schemaPatch
                  */
                 $schemaPatch = $this->patchFactory->create($schemaPatch, ['schemaSetup' => $this->schemaSetup]);
-                $schemaPatch->apply();
-                $this->patchHistory->fixPatch(get_class($schemaPatch));
-                foreach ($schemaPatch->getAliases() as $patchAlias) {
-                    if (!$this->patchHistory->isApplied($patchAlias)) {
-                        $this->patchHistory->fixPatch($patchAlias);
-                    }
+                if (!$this->isApplied($schemaPatch)) {
+                    $this->applyPatch($schemaPatch);
                 }
             } catch (\Exception $e) {
                 $schemaPatchClass = is_object($schemaPatch) ? get_class($schemaPatch) : $schemaPatch;
@@ -281,7 +244,7 @@ public function revertDataPatches($moduleName = null)
                 '\\' . $dataPatch,
                 ['moduleDataSetup' => $this->moduleDataSetup]
             );
-            if ($dataPatch instanceof PatchRevertableInterface) {
+            if ($dataPatch instanceof PatchRevertableInterface && $this->isApplied($dataPatch)) {
                 try {
                     $adapter->beginTransaction();
                     /** @var PatchRevertableInterface|DataPatchInterface $dataPatch */
@@ -297,4 +260,63 @@ public function revertDataPatches($moduleName = null)
             }
         }
     }
+
+    /**
+     * Register all patches in registry in order to manipulate chains and dependencies of patches of patches
+     *
+     * @param string $moduleName
+     * @param string $patchType
+     * @return PatchRegistry
+     */
+    private function prepareRegistry($moduleName, $patchType)
+    {
+        $reader = $patchType === self::DATA_PATCH ? $this->dataPatchReader : $this->schemaPatchReader;
+        $registry = $this->patchRegistryFactory->create();
+
+        //Prepare modules to read
+        if ($moduleName === null) {
+            $patchNames = [];
+            foreach ($this->moduleList->getNames() as $moduleName) {
+                $patchNames += $reader->read($moduleName);
+            }
+        } else {
+            $patchNames = $reader->read($moduleName);
+        }
+
+        foreach ($patchNames as $patchName) {
+            $registry->registerPatch($patchName);
+        }
+
+        return $registry;
+    }
+
+    /**
+     * Apply the given patch. The patch is and its aliases are added to the history.
+     */
+    private function applyPatch((PatchInterface $patch): void
+    {
+        $patch->apply();
+        $this->patchHistory->fixPatch(get_class($schemaPatch));
+        foreach ($schemaPatch->getAliases() as $patchAlias) {
+            if (!$this->patchHistory->isApplied($patchAlias)) {
+                $this->patchHistory->fixPatch($patchAlias);
+            }
+        }
+    }
+
+    /**
+     * Check wether the given patch or any of its aliases are already applied or not.
+     */
+    private function isApplied(PatchInterface $patch): bool
+    {
+        if (!$this->patchHistory->isApplied(get_class($patch))) {
+            foreach ($patch->getAliases() as $alias) {
+                if ($this->patchHistory->isApplied($alias)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }