Use PSR autoload mechanism for tests

Author: PowerKiKi

composer.json

@@ -68,6 +68,7 @@
     "require-dev": {
         "ext-zip": "*",
         "ext-gd": "*",
+        "ext-libxml": "*",
         "dompdf/dompdf": "^2.0",
         "friendsofphp/php-cs-fixer": "^3.11",
         "mpdf/mpdf": "^8.1",
@@ -90,6 +91,11 @@
             "PhpOffice\\PhpWord\\": "src/PhpWord"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "PhpOffice\\PhpWordTests\\": "tests/PhpWordTests"
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-develop": "0.19-dev"

phpunit.xml.dist

@@ -9,14 +9,14 @@
          stopOnFailure="false">
     <testsuites>
         <testsuite name="PhpWord Test Suite">
-            <directory>./tests/PhpWord</directory>
+            <directory>./tests/PhpWordTests</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
             <directory suffix=".php">./src</directory>
             <exclude>
-                <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
+                <directory suffix=".php">./src/PhpWordTests/Shared/PCLZip</directory>
             </exclude>
         </whitelist>
     </filter>

tests/PhpWord/_includes/AbstractTestReader.php renamed to tests/PhpWordTests/AbstractTestReader.php

@@ -15,8 +15,9 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord;
+namespace PhpOffice\PhpWordTests;
 
+use PhpOffice\PhpWord\PhpWord;
 use ZipArchive;
 
 /**
@@ -39,9 +40,9 @@ abstract class AbstractTestReader extends \PHPUnit\Framework\TestCase
      */
     protected function getDocumentFromString(array $partXmls = [])
     {
-        $file = __DIR__ . '/../_files/temp.docx';
+        $file = __DIR__ . '/_files/temp.docx';
         $zip = new ZipArchive();
-        $zip->open($file, ZipArchive::CREATE);
+        $zip->open($file, ZipArchive::CREATE | ZipArchive::OVERWRITE);
         foreach ($this->parts as $partName => $part) {
             if (array_key_exists($partName, $partXmls)) {
                 $zip->addFromString("{$partName}.xml", str_replace('{toReplace}', $partXmls[$partName], $this->parts[$partName]['xml']));

tests/PhpWord/_includes/AbstractWebServerEmbeddedTest.php renamed to tests/PhpWordTests/AbstractWebServerEmbeddedTest.php

@@ -15,7 +15,7 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord;
+namespace PhpOffice\PhpWordTests;
 
 use Symfony\Component\Process\Process;
 
@@ -25,7 +25,7 @@ abstract class AbstractWebServerEmbeddedTest extends \PHPUnit\Framework\TestCase
 
     public static function setUpBeforeClass(): void
     {
-        $commandLine = 'php -S localhost:8080 -t tests/PhpWord/_files';
+        $commandLine = 'php -S localhost:8080 -t tests/PhpWordTests/_files';
 
         self::$httpServer = Process::fromShellCommandline($commandLine);
         self::$httpServer->start();

tests/PhpWord/Collection/CollectionTest.php renamed to tests/PhpWordTests/Collection/CollectionTest.php

@@ -15,9 +15,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Collection;
+namespace PhpOffice\PhpWordTests\Collection;
 
 use PhpOffice\PhpWord\Element\Footnote;
+use PhpOffice\PhpWord\Collection\Footnotes;
 
 /**
  * Test class for PhpOffice\PhpWord\Collection subnamespace.

tests/PhpWord/ComplexType/FootnotePropertiesTest.php renamed to tests/PhpWordTests/ComplexType/FootnotePropertiesTest.php

@@ -15,9 +15,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\ComplexType;
+namespace PhpOffice\PhpWordTests\ComplexType;
 
 use InvalidArgumentException;
+use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**

tests/PhpWord/ComplexType/ProofStateTest.php renamed to tests/PhpWordTests/ComplexType/ProofStateTest.php

@@ -15,9 +15,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\ComplexType;
+namespace PhpOffice\PhpWordTests\ComplexType;
 
 use InvalidArgumentException;
+use PhpOffice\PhpWord\ComplexType\ProofState;
 
 /**
  * Test class for PhpOffice\PhpWord\ComplexType\ProofState.

tests/PhpWord/Element/AbstractElementTest.php renamed to tests/PhpWordTests/Element/AbstractElementTest.php

@@ -15,7 +15,7 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Element;
+namespace PhpOffice\PhpWordTests\Element;
 
 /**
  * Test class for PhpOffice\PhpWord\Element\AbstractElement.

tests/PhpWord/Element/BookmarkTest.php renamed to tests/PhpWordTests/Element/BookmarkTest.php

@@ -15,7 +15,9 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Element;
+namespace PhpOffice\PhpWordTests\Element;
+
+use PhpOffice\PhpWord\Element\Bookmark;
 
 /**
  * Test class for PhpOffice\PhpWord\Element\Footer.

tests/PhpWord/Element/CellTest.php renamed to tests/PhpWordTests/Element/CellTest.php

@@ -15,10 +15,11 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Element;
+namespace PhpOffice\PhpWordTests\Element;
 
 use BadMethodCallException;
-use PhpOffice\PhpWord\AbstractWebServerEmbeddedTest;
+use PhpOffice\PhpWord\Element\Cell;
+use PhpOffice\PhpWordTests\AbstractWebServerEmbeddedTest;
 
 /**
  * Test class for PhpOffice\PhpWord\Element\Cell.