Convert More Separate Process Tests

oleibman · oleibman · commit 763e34c14d0c · 2025-09-30T21:36:52.000-07:00
diff --git a/tests/PhpWordTests/ComplexType/FootnotePropertiesTest.php b/tests/PhpWordTests/ComplexType/FootnotePropertiesTest.php
@@ -26,8 +26,6 @@
  * Test class for PhpOffice\PhpWord\ComplexType\FootnoteProperties.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\ComplexType\FootnoteProperties
- *
- * @runTestsInSeparateProcesses
  */
 class FootnotePropertiesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/ComplexType/RubyPropertiesTest.php b/tests/PhpWordTests/ComplexType/RubyPropertiesTest.php
@@ -23,8 +23,6 @@
 
 /**
  * Test class for PhpOffice\PhpWord\ComplexType\RubyProperties.
- *
- * @runTestsInSeparateProcesses
  */
 class RubyPropertiesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/Exception/ExceptionTest.php b/tests/PhpWordTests/Exception/ExceptionTest.php
@@ -25,8 +25,6 @@
  * Test class for PhpOffice\PhpWord\Exception\Exception.
  *
  * @coversDefaultClass \Exception
- *
- * @runTestsInSeparateProcesses
  */
 class ExceptionTest extends TestCase
 {
diff --git a/tests/PhpWordTests/Exception/InvalidImageExceptionTest.php b/tests/PhpWordTests/Exception/InvalidImageExceptionTest.php
@@ -24,8 +24,6 @@
  * Test class for PhpOffice\PhpWord\Exception\InvalidImageException.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Exception\InvalidImageException
- *
- * @runTestsInSeparateProcesses
  */
 class InvalidImageExceptionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/Exception/InvalidStyleExceptionTest.php b/tests/PhpWordTests/Exception/InvalidStyleExceptionTest.php
@@ -24,8 +24,6 @@
  * Test class for PhpOffice\PhpWord\Exception\InvalidStyleException.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Exception\InvalidStyleException
- *
- * @runTestsInSeparateProcesses
  */
 class InvalidStyleExceptionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/Exception/UnsupportedImageTypeExceptionTest.php b/tests/PhpWordTests/Exception/UnsupportedImageTypeExceptionTest.php
@@ -22,8 +22,6 @@
 
 /**
  * Test class for PhpOffice\PhpWord\Exception\UnsupportedImageTypeExceptionTest.
- *
- * @runTestsInSeparateProcesses
  */
 class UnsupportedImageTypeExceptionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/IOFactoryTest.php b/tests/PhpWordTests/IOFactoryTest.php
@@ -31,8 +31,6 @@
 
 /**
  * Test class for PhpOffice\PhpWord\IOFactory.
- *
- * @runTestsInSeparateProcesses
  */
 class IOFactoryTest extends TestCase
 {
@@ -43,6 +41,11 @@ protected function setUp(): void
         Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
     }
 
+    protected function tearDown(): void
+    {
+        Settings::restoreDefaults();
+    }
+
     /**
      * Create all possible writers.
      *
diff --git a/tests/PhpWordTests/MediaTest.php b/tests/PhpWordTests/MediaTest.php
@@ -24,8 +24,6 @@
 
 /**
  * Test class for PhpOffice\PhpWord\Media.
- *
- * @runTestsInSeparateProcesses
  */
 class MediaTest extends AbstractWebServerEmbedded
 {
diff --git a/tests/PhpWordTests/Metadata/DocInfoTest.php b/tests/PhpWordTests/Metadata/DocInfoTest.php
@@ -22,8 +22,6 @@
 
 /**
  * Test class for PhpOffice\PhpWord\Metadata\DocInfo.
- *
- * @runTestsInSeparateProcesses
  */
 class DocInfoTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/Metadata/SettingsTest.php b/tests/PhpWordTests/Metadata/SettingsTest.php
@@ -26,8 +26,6 @@
 
 /**
  * Test class for PhpOffice\PhpWord\Metadata\Settings.
- *
- * @runTestsInSeparateProcesses
  */
 class SettingsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/SettingsRtlTest.php b/tests/PhpWordTests/SettingsRtlTest.php
@@ -28,8 +28,6 @@
  * Test class for PhpOffice\PhpWord\Settings.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Settings
- *
- * @runTestsInSeparateProcesses
  */
 class SettingsRtlTest extends TestCase
 {
diff --git a/tests/PhpWordTests/Shared/ZipArchiveTest.php b/tests/PhpWordTests/Shared/ZipArchiveTest.php
@@ -25,39 +25,47 @@
  * Test class for PhpOffice\PhpWord\Shared\ZipArchive.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Shared\ZipArchive
- *
- * @runTestsInSeparateProcesses
  */
 class ZipArchiveTest extends \PHPUnit\Framework\TestCase
 {
-//     /**
-//      * Test close method exception: Working in local, not working in Travis
-//      *
-//      * expectedException \PhpOffice\PhpWord\Exception\Exception
-//      * expectedExceptionMessage Could not close zip file
-//      * covers ::close
-//      */
-//     public function testCloseException()
-//     {
-//         $zipFile = __DIR__ . "/../_files/documents/ziptest.zip";
-
-//         $object = new ZipArchive();
-//         $object->open($zipFile, ZipArchive::CREATE);
-//         $object->addFromString('content/string.txt', 'Test');
-
-//         // Lock the file
-//         $resource = fopen($zipFile, "w");
-//         flock($resource, LOCK_EX);
-
-//         // Closing the file should throws an exception
-//         $object->close();
-
-//         // Unlock the file
-//         flock($resource, LOCK_UN);
-//         fclose($resource);
-
-//         @unlink($zipFile);
-//     }
+    /** @var string */
+    private $zipFile;
+
+    protected function tearDown(): void
+    {
+        if (file_exists($this->zipFile)) {
+            unlink($this->zipFile);
+        }
+        Settings::restoreDefaults();
+    }
+
+    /**
+     * Test close method exception.
+     *
+     * covers ::close
+     */
+    public function testCloseException(): void
+    {
+        $this->zipFile = __DIR__ . '/../_files/documents/ziptest1.zip';
+        $this->expectException(\PhpOffice\PhpWord\Exception\Exception::class);
+        $this->expectExceptionMessage('Could not close zip file');
+
+        $object = new ZipArchive();
+        $object->open($this->zipFile, ZipArchive::CREATE);
+        $object->addFromString('content/string.txt', 'Test');
+
+        // Lock the file
+        $resource = fopen($this->zipFile, 'wb');
+        self::assertNotFalse($resource);
+        flock($resource, LOCK_EX);
+
+        // Closing the file should throws an exception
+        $object->close();
+
+        // Unlock the file
+        flock($resource, LOCK_UN);
+        fclose($resource);
+    }
 
     /**
      * Test all methods.
@@ -68,7 +76,7 @@ public function testZipArchive($zipClass = 'ZipArchive'): void
     {
         // Preparation
         $existingFile = __DIR__ . '/../_files/documents/sheet.xls';
-        $zipFile = __DIR__ . '/../_files/documents/ziptest.zip';
+        $this->zipFile = __DIR__ . '/../_files/documents/ziptest2.zip';
         $destination1 = __DIR__ . '/../_files/documents/extract1';
         $destination2 = __DIR__ . '/../_files/documents/extract2';
         @mkdir($destination1);
@@ -77,11 +85,11 @@ public function testZipArchive($zipClass = 'ZipArchive'): void
         Settings::setZipClass($zipClass);
 
         $object = new ZipArchive();
-        $object->open($zipFile, ZipArchive::CREATE);
+        $object->open($this->zipFile, ZipArchive::CREATE);
         $object->addFile($existingFile, 'xls/new.xls');
         $object->addFromString('content/string.txt', 'Test');
         $object->close();
-        $object->open($zipFile);
+        $object->open($this->zipFile);
 
         // Run tests
         self::assertEquals(0, $object->locateName('xls/new.xls'));
@@ -101,7 +109,6 @@ public function testZipArchive($zipClass = 'ZipArchive'): void
         // Cleanup
         $this->deleteDir($destination1);
         $this->deleteDir($destination2);
-        @unlink($zipFile);
     }
 
     /**
diff --git a/tests/PhpWordTests/StyleTest.php b/tests/PhpWordTests/StyleTest.php
@@ -25,8 +25,6 @@
  * Test class for PhpOffice\PhpWord\Style.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style
- *
- * @runTestsInSeparateProcesses
  */
 class StyleTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/TemplateProcessorSectionTest.php b/tests/PhpWordTests/TemplateProcessorSectionTest.php
@@ -27,8 +27,6 @@
  * @covers \PhpOffice\PhpWord\TemplateProcessor
  *
  * @coversDefaultClass \PhpOffice\PhpWord\TemplateProcessor
- *
- * @runTestsInSeparateProcesses
  */
 final class TemplateProcessorSectionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PhpWordTests/WriteReadback/ODTextTest.php b/tests/PhpWordTests/WriteReadback/ODTextTest.php
@@ -27,8 +27,6 @@
  * Test class for PhpOffice\PhpWord\Reader\ODText and PhpOffice\PhpWord\Writer\ODText.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Reader\ODText
- *
- * @runTestsInSeparateProcesses
  */
 class ODTextTest extends \PHPUnit\Framework\TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@`
`26`	`26`	`* Test class for PhpOffice\PhpWord\ComplexType\FootnoteProperties.`
`27`	`27`	`*`
`28`	`28`	`* @coversDefaultClass \PhpOffice\PhpWord\ComplexType\FootnoteProperties`
`29`		`- *`
`30`		`- * @runTestsInSeparateProcesses`
`31`	`29`	`*/`
`32`	`30`	`class FootnotePropertiesTest extends \PHPUnit\Framework\TestCase`
`33`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* Test class for PhpOffice\PhpWord\ComplexType\RubyProperties.`
`26`		`- *`
`27`		`- * @runTestsInSeparateProcesses`
`28`	`26`	`*/`
`29`	`27`	`class RubyPropertiesTest extends \PHPUnit\Framework\TestCase`
`30`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@`
`25`	`25`	`* Test class for PhpOffice\PhpWord\Exception\Exception.`
`26`	`26`	`*`
`27`	`27`	`* @coversDefaultClass \Exception`
`28`		`- *`
`29`		`- * @runTestsInSeparateProcesses`
`30`	`28`	`*/`
`31`	`29`	`class ExceptionTest extends TestCase`
`32`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@`
`24`	`24`	`* Test class for PhpOffice\PhpWord\Exception\InvalidImageException.`
`25`	`25`	`*`
`26`	`26`	`* @coversDefaultClass \PhpOffice\PhpWord\Exception\InvalidImageException`
`27`		`- *`
`28`		`- * @runTestsInSeparateProcesses`
`29`	`27`	`*/`
`30`	`28`	`class InvalidImageExceptionTest extends \PHPUnit\Framework\TestCase`
`31`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* Test class for PhpOffice\PhpWord\Exception\UnsupportedImageTypeExceptionTest.`
`25`		`- *`
`26`		`- * @runTestsInSeparateProcesses`
`27`	`25`	`*/`
`28`	`26`	`class UnsupportedImageTypeExceptionTest extends \PHPUnit\Framework\TestCase`
`29`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* Test class for PhpOffice\PhpWord\IOFactory.`
`34`		`- *`
`35`		`- * @runTestsInSeparateProcesses`
`36`	`34`	`*/`
`37`	`35`	`class IOFactoryTest extends TestCase`
`38`	`36`	`{`
`@@ -43,6 +41,11 @@ protected function setUp(): void`
`43`	`41`	`Settings::setPdfRenderer($rendererName, $rendererLibraryPath);`
`44`	`42`	`}`
`45`	`43`
	`44`	`+ protected function tearDown(): void`
	`45`	`+ {`
	`46`	`+ Settings::restoreDefaults();`
	`47`	`+ }`
	`48`	`+`
`46`	`49`	`/**`
`47`	`50`	`* Create all possible writers.`
`48`	`51`	`*`