[Fixed: #31396] Data/Schema Patches getAliases() not working as expected

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

@@ -159,13 +159,11 @@ public function applyDataPatch($moduleName = null)
             } 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);
-                        }
+                    if ($this->shouldApply($dataPatch)) {
+                        $dataPatch->apply();
+                        $this->patchHistory->fixPatch(get_class($dataPatch));
                     }
+                    $this->fixAliases($dataPatch);
                     $this->moduleDataSetup->getConnection()->commit();
                 } catch (\Exception $e) {
                     $this->moduleDataSetup->getConnection()->rollBack();
@@ -240,13 +238,11 @@ 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->shouldApply($schemaPatch)) {
+                    $schemaPatch->apply();
+                    $this->patchHistory->fixPatch(get_class($schemaPatch));
                 }
+                $this->fixAliases($schemaPatch);
             } catch (\Exception $e) {
                 throw new SetupException(
                     new Phrase(
@@ -296,4 +292,38 @@ public function revertDataPatches($moduleName = null)
             }
         }
     }
+
+    /**
+     * Checks if patch should be applied by already applied patch alias names
+     *
+     * @param DataPatchInterface|SchemaPatchInterface $patch
+     * @return bool
+     */
+    private function shouldApply(DataPatchInterface|SchemaPatchInterface$patch): bool
+    {
+        $shouldApply = true;
+        if ($patch = $patch->getAliases()) {
+            foreach ($patch as $patchAlias) {
+                if ($this->patchHistory->isApplied($patchAlias)) {
+                    $shouldApply = false;
+                }
+            }
+        }
+        return $shouldApply;
+    }
+
+    /**
+     * Save all patch aliases
+     *
+     * @param DataPatchInterface|SchemaPatchInterface $patch
+     * @return void
+     */
+    private function fixAliases(DataPatchInterface|SchemaPatchInterface $patch): void
+    {
+        foreach ($patch->getAliases() as $patchAlias) {
+            if (!$this->patchHistory->isApplied($patchAlias)) {
+                $this->patchHistory->fixPatch($patchAlias);
+            }
+        }
+    }
 }

lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php

@@ -24,6 +24,7 @@
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\SetupInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use phpDocumentor\Reflection\Types\True_;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -179,7 +180,7 @@ public function testApplyDataPatchForNewlyInstalledModule($moduleName, $dataPatc
         // phpstan:ignore "Class OtherDataPatch not found."
         $patch2 = $this->createMock(\OtherDataPatch::class);
         $patch2->expects($this->once())->method('apply');
-        $patch2->expects($this->once())->method('getAliases')->willReturn([]);
+        $patch2->expects($this->exactly(2))->method('getAliases')->willReturn([]);
 
         $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
             [
@@ -222,6 +223,7 @@ public function testApplyDataPatchForAlias($moduleName, $dataPatches, $moduleVer
 
         $patch1 = $this->getMockForAbstractClass(DataPatchInterface::class);
         $patch1->expects($this->once())->method('getAliases')->willReturn(['PatchAlias']);
+        $patch1->expects($this->never())->method('apply');
         $patchClass = get_class($patch1);
 
         $patchRegistryMock = $this->createAggregateIteratorMock(PatchRegistry::class, [$patchClass], ['registerPatch']);