Prevent error when close() called while writer already closed (#402)

src/Spout/Writer/AbstractWriter.php

@@ -350,6 +350,10 @@ private function resetRowStyleToDefault()
  */
  public function close()
  {
+ if (!$this->isWriterOpened) {
+ return;
+ }
+
  $this->closeWriter();
 
  if (is_resource($this->filePointer)) {
@@ -378,4 +382,3 @@ private function closeAndAttemptToCleanupAllFiles()
  }
  }
 }
-

tests/Spout/Writer/CSV/WriterTest.php

@@ -61,6 +61,23 @@ public function testAddRowsShouldThrowExceptionIfRowsAreNotArrayOfArrays()
  $writer->close();
  }
 
+ /**
+ * @return void
+ */
+ public function testCloseShouldNoopWhenWriterIsNotOpened()
+ {
+ $fileName = 'test_double_close_calls.csv';
+ $this->createGeneratedFolderIfNeeded($fileName);
+ $resourcePath = $this->getGeneratedResourcePath($fileName);
+
+ $writer = WriterFactory::create(Type::CSV);
+ $writer->close(); // This call should not cause any error
+
+ $writer->openToFile($fileName);
+ $writer->close();
+ $writer->close(); // This call should not cause any error
+ }
+
  /**
  * @return void
  */

tests/Spout/Writer/ODS/WriterTest.php

@@ -67,7 +67,7 @@ public function testSetTempFolderShouldThrowExceptionIfCalledAfterOpeningWriter(
  /**
  * @expectedException \Box\Spout\Writer\Exception\WriterAlreadyOpenedException
  */
- public function testsetShouldCreateNewSheetsAutomaticallyShouldThrowExceptionIfCalledAfterOpeningWriter()
+ public function testSetShouldCreateNewSheetsAutomaticallyShouldThrowExceptionIfCalledAfterOpeningWriter()
  {
  $fileName = 'file_that_wont_be_written.ods';
  $filePath = $this->getGeneratedResourcePath($fileName);
@@ -168,6 +168,23 @@ public function testSetCurrentSheet()
  $this->assertEquals($firstSheet, $writer->getCurrentSheet(), 'The current sheet should be the first one.');
  }
 
+ /**
+ * @return void
+ */
+ public function testCloseShouldNoopWhenWriterIsNotOpened()
+ {
+ $fileName = 'test_double_close_calls.ods';
+ $this->createGeneratedFolderIfNeeded($fileName);
+ $resourcePath = $this->getGeneratedResourcePath($fileName);
+
+ $writer = WriterFactory::create(Type::ODS);
+ $writer->close(); // This call should not cause any error
+
+ $writer->openToFile($fileName);
+ $writer->close();
+ $writer->close(); // This call should not cause any error
+ }
+
  /**
  * @return void
  */

tests/Spout/Writer/XLSX/WriterTest.php

@@ -194,6 +194,23 @@ public function testSetCurrentSheet()
  $this->assertEquals($firstSheet, $writer->getCurrentSheet(), 'The current sheet should be the first one.');
  }
 
+ /**
+ * @return void
+ */
+ public function testCloseShouldNoopWhenWriterIsNotOpened()
+ {
+ $fileName = 'test_double_close_calls.xlsx';
+ $this->createGeneratedFolderIfNeeded($fileName);
+ $resourcePath = $this->getGeneratedResourcePath($fileName);
+
+ $writer = WriterFactory::create(Type::XLSX);
+ $writer->close(); // This call should not cause any error
+
+ $writer->openToFile($fileName);
+ $writer->close();
+ $writer->close(); // This call should not cause any error
+ }
+
  /**
  * @return void
  */