Finish Unneeded Separate Processes

Author: oleibman

src/PhpWord/Settings.php

@@ -537,6 +537,7 @@ public static function restoreDefaults(): void
         self::$defaultFontName = self::DEFAULT_FONT_NAME;
         self::$defaultFontSize = self::DEFAULT_FONT_SIZE;
         self::$defaultPaper = self::DEFAULT_PAPER;
+        self::$defaultRtl = null;
         self::$measurementUnit = self::UNIT_TWIP;
         self::$outputEscapingEnabled = false;
         self::$pdfRendererName = null;

tests/PhpWordTests/AbstractWebServerEmbedded.php

@@ -51,7 +51,7 @@ protected static function getRemoteImageUrl()
             return self::getBaseUrl() . '/images/new-php-logo.png';
         }
 
-        return 'http://php.net/images/logos/new-php-logo.png';
+        return 'https://www.php.net/images/logos/new-php-logo.png';
     }
 
     protected static function getRemoteImageUrlWithoutExtension(): string
@@ -69,7 +69,7 @@ protected static function getRemoteGifImageUrl()
             return self::getBaseUrl() . '/images/mario.gif';
         }
 
-        return 'http://php.net/images/logos/php-med-trans-light.gif';
+        return 'https://www.php.net/images/logos/php-med-trans-light.gif';
     }
 
     protected static function getRemoteBmpImageUrl()
@@ -78,6 +78,6 @@ protected static function getRemoteBmpImageUrl()
             return self::getBaseUrl() . '/images/duke_nukem.bmp';
         }
 
-        return 'https://samples.libav.org/image-samples/RACECAR.BMP';
+        return 'https://examplefiles.org/files/images/bmp-example-file-download-500x500.bmp';
     }
 }

tests/PhpWordTests/Element/FooterTest.php

@@ -113,6 +113,7 @@ public function testAddImage(): void
 
     /**
      * Add image by URL.
+     * Method getRemoteGifImageUrl seems to require separate process.
      *
      * @runInSeparateProcess
      */

tests/PhpWordTests/Element/HeaderTest.php

@@ -123,6 +123,7 @@ public function testAddImage(): void
 
     /**
      * Add image by URL.
+     * Method getRemoteGifImageUrl seems to require separate process.
      *
      * @runInSeparateProcess
      */

tests/PhpWordTests/PhpWordTest.php

@@ -35,6 +35,7 @@ class PhpWordTest extends \PHPUnit\Framework\TestCase
      */
     protected function tearDown(): void
     {
+        Style::resetStyles();
         Settings::restoreDefaults();
     }
 

tests/PhpWordTests/Reader/Word2007/StyleTableTest.php

@@ -20,15 +20,21 @@
 
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\Reader\Word2007 as DocxReader;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Table as TableStyle;
 
 /**
  * Test class for PhpOffice\PhpWord\Reader\Word2007\Styles.
- * Run in separate process because doc changes default font.
  */
 class StyleTableTest extends \PHPUnit\Framework\TestCase
 {
+    // Reading this doc changes default font.
+    protected function tearDown(): void
+    {
+        Settings::restoreDefaults();
+    }
+
     /**
      * Test reading of table layout.
      */

tests/PhpWordTests/SettingsRtlTest.php

@@ -31,17 +31,10 @@
  */
 class SettingsRtlTest extends TestCase
 {
-    /** @var bool */
-    private $defaultRtl;
-
-    protected function setUp(): void
-    {
-        $this->defaultRtl = Settings::isDefaultRtl();
-    }
-
     protected function tearDown(): void
     {
-        Settings::setDefaultRtl($this->defaultRtl);
+        Settings::restoreDefaults();
+        Style::resetStyles();
     }
 
     public function testSetGetDefaultRtl(): void

tests/PhpWordTests/Style/AbstractStyleTest.php

@@ -26,8 +26,6 @@
 
 /**
  * Test class for PhpOffice\PhpWord\Style\AbstractStyle.
- *
- * @runTestsInSeparateProcesses
  */
 class AbstractStyleTest extends \PHPUnit\Framework\TestCase
 {

tests/PhpWordTests/Style/CellTest.php

@@ -25,8 +25,6 @@
  * Test class for PhpOffice\PhpWord\Style\Cell.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Cell
- *
- * @runTestsInSeparateProcesses
  */
 class CellTest extends \PHPUnit\Framework\TestCase
 {

tests/PhpWordTests/Style/ChartTest.php

@@ -24,8 +24,6 @@
  * Test class for PhpOffice\PhpWord\Style\Chart.
  *
  * @coversDefaultClass          \PhpOffice\PhpWord\Style\Chart
- *
- * @runTestsInSeparateProcesses
  */
 class ChartTest extends \PHPUnit\Framework\TestCase
 {