MAGETWO-63899: Merge branch 'fix-csv-unit-test' of github.com:dmanners/magento2 into MAGETWO-63899

ishakhsuvarov · ishakhsuvarov · commit 93422ced8d47 · 2017-01-31T10:24:15.000+02:00
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php
@@ -59,14 +59,18 @@ public function write(Phrase $phrase)
      */
     public function __destructor()
     {
-        fclose($this->_fileHandler);
+        if (is_resource($this->_fileHandler)) {
+            fclose($this->_fileHandler);
+        }
     }
 
     /**
      * Destructor for closing file handler
      */
     public function __destruct()
     {
-        fclose($this->_fileHandler);
+        if (is_resource($this->_fileHandler)) {
+            fclose($this->_fileHandler);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,14 +59,18 @@ public function write(Phrase $phrase)`
`59`	`59`	`*/`
`60`	`60`	`public function __destructor()`
`61`	`61`	`{`
`62`		`- fclose($this->_fileHandler);`
	`62`	`+ if (is_resource($this->_fileHandler)) {`
	`63`	`+ fclose($this->_fileHandler);`
	`64`	`+ }`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`/**`
`66`	`68`	`* Destructor for closing file handler`
`67`	`69`	`*/`
`68`	`70`	`public function __destruct()`
`69`	`71`	`{`
`70`		`- fclose($this->_fileHandler);`
	`72`	`+ if (is_resource($this->_fileHandler)) {`
	`73`	`+ fclose($this->_fileHandler);`
	`74`	`+ }`
`71`	`75`	`}`
`72`	`76`	`}`