ENGCOM-6198: Fix #24019 #24947

 - Merge Pull Request #24947 from korostii/magento2:korostii-patch-24019
 - Merged commits:
   1. 602d6a1
   2. 5632f45
   3. 025d0de
   4. 3d6690a

Author: magento-engcom-team

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

@@ -56,9 +56,9 @@ public function __construct(ResourceConnection $resourceConnection)
      * Read and cache data patches from db
      *
      * All patches are store in patch_list table
-     * @see self::TABLE_NAME
      *
-     * @return array
+     * @see self::TABLE_NAME
+     * @return string[]
      */
     private function getAppliedPatches()
     {
@@ -87,12 +87,14 @@ public function fixPatch($patchName)
 
         $adapter = $this->resourceConnection->getConnection();
         $adapter->insert($this->resourceConnection->getTableName(self::TABLE_NAME), [self::CLASS_NAME => $patchName]);
+
+        $this->patchesRegistry[] = $patchName;
     }
 
     /**
      * Revert patch from history
      *
-     * @param $patchName
+     * @param string $patchName
      * @return void
      */
     public function revertPatchFromHistory($patchName)

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

@@ -83,4 +83,28 @@ public function testFixAppliedPatch()
         $adapterMock->expects($this->never())->method('insert');
         $this->patchHistory->fixPatch(get_class($patch1));
     }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessageRegExp "Patch [a-zA-Z0-9\_]+ cannot be applied twice"
+     */
+    public function testFixPatchTwice()
+    {
+        /** @var PatchInterface|\PHPUnit_Framework_MockObject_MockObject $patch1 */
+        $patch = $this->createMock(PatchInterface::class);
+        /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $adapterMock */
+        $adapterMock = $this->createMock(AdapterInterface::class);
+        $this->resourceConnectionMock->expects($this->any())->method('getConnection')->willReturn($adapterMock);
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getTableName')
+            ->willReturn(PatchHistory::TABLE_NAME);
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $selectMock->expects($this->once())->method('from');
+        $adapterMock->expects($this->any())->method('select')->willReturn($selectMock);
+        $adapterMock->expects($this->once())->method('fetchCol')->willReturn([]);
+        $adapterMock->expects($this->once())->method('insert');
+
+        $this->patchHistory->fixPatch(get_class($patch));
+        $this->patchHistory->fixPatch(get_class($patch));
+    }
 }