Merge remote-tracking branch 'origin/MAGETWO-87551' into MAGETWO-87551

Author: Sergii Kovalenko

app/code/Magento/Tax/Setup/Patch/Data/AddTacAttributeAndTaxClasses.php renamed to app/code/Magento/Tax/Setup/Patch/Data/AddTaxAttributeAndTaxClasses.php

@@ -17,7 +17,7 @@
  * Class AddTacAttributeAndTaxClasses
  * @package Magento\Tax\Setup\Patch
  */
-class AddTacAttributeAndTaxClasses implements DataPatchInterface, PatchVersionInterface
+class AddTaxAttributeAndTaxClasses implements DataPatchInterface, PatchVersionInterface
 {
     /**
      * @param TaxSetupFactory $taxSetupFactory

app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxClassAttributeVisibility.php

@@ -67,7 +67,7 @@ public function apply()
     public static function getDependencies()
     {
         return [
-            AddTacAttributeAndTaxClasses::class
+            AddTaxAttributeAndTaxClasses::class
         ];
     }
 

lib/internal/Magento/Framework/Module/DbVersionInfo.php

@@ -130,7 +130,6 @@ private function getDataInfo($moduleName)
      * @param string $moduleName
      * @param string|bool $version
      * @return bool
-     * @throws \UnexpectedValueException
      */
     private function isModuleVersionEqual($moduleName, $version)
     {

setup/src/Magento/Setup/Model/Patch/PatchApplier.php

@@ -164,7 +164,7 @@ public function applyDataPatch($moduleName = null)
             }
             if ($dataPatch instanceof NonTransactionableInterface) {
                 $dataPatch->apply();
-                $this->patchHistory->fixPatch($dataPatch);
+                $this->patchHistory->fixPatch(get_class($dataPatch));
             } else {
                 try {
                     $this->moduleDataSetup->getConnection()->beginTransaction();

setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchApplierTest.php

@@ -23,6 +23,7 @@
 /**
  * Class PatchApplierTest
  * @package Magento\Setup\Test\Unit\Model\Patch
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PatchApplierTest extends \PHPUnit\Framework\TestCase
 {
@@ -117,8 +118,8 @@ protected function setUp()
                 'moduleDataSetup' => $this->moduleDataSetupMock,
             ]
         );
-        require_once '../_files/data_patch_classes.php';
-        require_once '../_files/schema_patch_classes.php';
+        require_once __DIR__ . '/../_files/data_patch_classes.php';
+        require_once __DIR__ . '/../_files/schema_patch_classes.php';
     }
 
     /**
@@ -365,7 +366,7 @@ public function testNonTransactionablePatch()
         $this->connectionMock->expects($this->never())->method('beginTransaction');
         $this->connectionMock->expects($this->never())->method('commit');
         $this->connectionMock->expects($this->never())->method('rollback');
-        $this->patchHistoryMock->expects($this->once())->method('fixPatch')->with($patch1);
+        $this->patchHistoryMock->expects($this->once())->method('fixPatch')->with(get_class($patch1));
         $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
             [
                 [
@@ -543,4 +544,4 @@ private function createAggregateIteratorMock($className, array $items = [], arra
 
         return $mockIteratorAggregate;
     }
-}
+}

setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchFactoryTest.php

@@ -34,8 +34,6 @@ protected function setUp()
     {
         $objectManager = new ObjectManager($this);
         $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
-
-
         $this->patchFactory = $objectManager->getObject(
             PatchFactory::class,
             [

setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchHistoryTest.php

@@ -32,8 +32,6 @@ protected function setUp()
     {
         $objectManager = new ObjectManager($this);
         $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
-        
-
         $this->patchHistory = $objectManager->getObject(
             PatchHistory::class,
             [
@@ -61,7 +59,7 @@ public function testFixPatch()
             ->willReturn(PatchHistory::TABLE_NAME);
         $adapterMock->expects($this->once())->method('insert')
             ->with(PatchHistory::TABLE_NAME, [PatchHistory::CLASS_NAME => get_class($patch1)]);
-        $this->patchHistory->fixPatch($patch1);
+        $this->patchHistory->fixPatch(get_class($patch1));
     }
 
     /**
@@ -83,7 +81,6 @@ public function testFixAppliedPatch()
             ->method('getTableName')
             ->willReturn(PatchHistory::TABLE_NAME);
         $adapterMock->expects($this->never())->method('insert');
-        $this->patchHistory->fixPatch($patch1);
+        $this->patchHistory->fixPatch(get_class($patch1));
     }
-
 }

setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchRegirtryTest.php

@@ -97,4 +97,4 @@ public function testGetIterator()
             'Failed to assert that actual non-apllied patches sequence is valid.'
         );
     }
-}
+}

setup/src/Magento/Setup/Test/Unit/Model/_files/data_patch_classes.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile - as of namespace absence
+
 class OtherDataPatch implements \Magento\Setup\Model\Patch\DataPatchInterface
 {
     /**
@@ -131,4 +133,4 @@ public function apply()
     public function revert()
     {
     }
-}
+}

setup/src/Magento/Setup/Test/Unit/Model/_files/schema_patch_classes.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile - as of namespace absence
+
 class OtherSchemaPatch implements \Magento\Setup\Model\Patch\SchemaPatchInterface
 {
     /**