Merge pull request #308 from magento-falcons/MAGETWO-57826

magicbunneh · web-flow · commit d0495a9aff54 · 2016-09-05T17:57:02.000+03:00
Bug Fixes:
MAGETWO-56530: Magento\ConfigurableImportExport\Model\ConfigurableTest::testImportReplace integration test fail
MAGETWO-53549: [Github][PR] Replace fabpot/php-cs-fixer with friendsofphp/php-cs-fixer
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -544,4 +544,12 @@ public function setWriter(AbstractAdapter $writer)
 
         return $this;
     }
+
+    /**
+     * Clean cached values
+     */
+    public function __destruct()
+    {
+        self::$attrCodes = null;
+    }
 }
diff --git a/composer.json b/composer.json
@@ -73,7 +73,7 @@
         "squizlabs/php_codesniffer": "1.5.3",
         "phpmd/phpmd": "@stable",
         "pdepend/pdepend": "2.2.2",
-        "fabpot/php-cs-fixer": "~1.2",
+        "friendsofphp/php-cs-fixer": "~1.2",
         "lusitanian/oauth": "~0.3 <=0.7.0",
         "sebastian/phpcpd": "2.0.0"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
@@ -107,7 +107,6 @@ public function importReplaceDataProvider()
      */
     public function testImportReplace($fixtures, $skus, $skippedAttributes = [])
     {
-        $this->markTestSkipped('MAGETWO-56530');
         parent::testImportReplace($fixtures, $skus, $skippedAttributes);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -544,4 +544,12 @@ public function setWriter(AbstractAdapter $writer)`
`544`	`544`
`545`	`545`	`return $this;`
`546`	`546`	`}`
	`547`	`+`
	`548`	`+ /**`
	`549`	`+ * Clean cached values`
	`550`	`+ */`
	`551`	`+ public function __destruct()`
	`552`	`+ {`
	`553`	`+ self::$attrCodes = null;`
	`554`	`+ }`
`547`	`555`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ public function importReplaceDataProvider()`
`107`	`107`	`*/`
`108`	`108`	`public function testImportReplace($fixtures, $skus, $skippedAttributes = [])`
`109`	`109`	`{`
`110`		`- $this->markTestSkipped('MAGETWO-56530');`
`111`	`110`	`parent::testImportReplace($fixtures, $skus, $skippedAttributes);`
`112`	`111`	`}`
`113`	`112`	`}`