MAGETWO-57826: [PR] Bug fixes delivery

shiftedreality · shiftedreality · commit ac78dcf093ab · 2016-08-30T15:08:25.000+03:00
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/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`	`}`