Fixed CI

Author: Progi1984

.github/workflows/php.yml

@@ -78,7 +78,7 @@ jobs:
               coverage: xdebug
 
       -   name: Generate Locale (for tests)
-          run: sudo locale-gen de_DE.UTF-8
+          run: sudo locale-gen de_DE.UTF-8 && sudo update-locale
 
       -   uses: actions/checkout@v2
 

.gitignore

@@ -1,27 +1,7 @@
-.DS_Store
-._*
-.Spotlight-V100
-.Trashes
-Thumbs.db
-Desktop.ini
-.idea
-build/
-phpunit.xml
-composer.phar
-vendor
-*.settings
-*.project
-*.buildpath
-
-/samples/results
-/phpunit.bat
-/todo.txt
-/samples/Sample_00_Test.php
-/samples/#47
-/samples/#70
-/samples/#71
-/samples/Github_*.*
-/samples/#83/*.lnk
+## PHPCSFixer
+/.php-cs-fixer.cache
+## PHPUnit
+/.phpunit.result.cache
+## Dependencies
 /composer.lock
-
-/.php-cs-fixer.cache
+/vendor/

composer.json

@@ -4,7 +4,7 @@
     "keywords": ["PHP","Office","Common","component"],
     "homepage": "http://phpoffice.github.io",
     "type": "library",
-    "license": "LGPL",
+    "license": "LGPL-3.0-only",
     "authors": [
         {
             "name": "Mark Baker"
@@ -19,8 +19,7 @@
         "pclzip/pclzip": "^2.8"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^7.0",
-        "phpdocumentor/phpdocumentor":"2.*",
+        "phpunit/phpunit": ">=7.0",
         "phpmd/phpmd": "2.*",
         "phpstan/phpstan": "^0.12.88"
     },

phpunit.xml.dist

@@ -18,7 +18,6 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="coverage-html" target="./build/coverage" />
-        <log type="coverage-clover" target="./build/logs/clover.xml" />
+        <log type="coverage-clover" target="./build/clover.xml" />
     </logging>
 </phpunit>

src/Common/XMLReader.php

@@ -19,7 +19,6 @@
 
 use DOMDocument;
 use DOMElement;
-use DOMNode;
 use DOMNodeList;
 use DOMXpath;
 use ZipArchive;
@@ -55,7 +54,7 @@ class XMLReader
      *
      * @throws \Exception
      */
-    public function getDomFromZip($zipFile, $xmlFile)
+    public function getDomFromZip(string $zipFile, string $xmlFile)
     {
         if (file_exists($zipFile) === false) {
             throw new \Exception('Cannot find archive file.');
@@ -80,7 +79,7 @@ public function getDomFromZip($zipFile, $xmlFile)
      *
      * @return DOMDocument
      */
-    public function getDomFromString($content)
+    public function getDomFromString(string $content)
     {
         $originalLibXMLEntityValue = libxml_disable_entity_loader(true);
         $this->dom = new DOMDocument();
@@ -101,7 +100,7 @@ public function getDomFromString($content)
     public function getElements(string $path, DOMElement $contextNode = null)
     {
         if ($this->dom === null) {
-            return new DOMNodeList;
+            return new DOMNodeList();
         }
         if ($this->xpath === null) {
             $this->xpath = new DOMXpath($this->dom);

tests/Common/Tests/DrawingTest.php

@@ -104,7 +104,7 @@ public function testHTML(): void
         $this->assertNull(Drawing::htmlToRGB('0000'));
         $this->assertNull(Drawing::htmlToRGB('00000'));
 
-        $this->assertInternalType('array', Drawing::htmlToRGB('ABCDEF'));
+        $this->assertIsArray(Drawing::htmlToRGB('ABCDEF'));
         $this->assertCount(3, Drawing::htmlToRGB('ABCDEF'));
         $this->assertEquals([0xAB, 0xCD, 0xEF], Drawing::htmlToRGB('ABCDEF'));
         $this->assertEquals([0xAB, 0xCD, 0xEF], Drawing::htmlToRGB('#ABCDEF'));

tests/Common/Tests/FileTest.php

@@ -39,9 +39,9 @@ public function testFileExists(): void
     public function testGetFileContents(): void
     {
         $pathResources = PHPOFFICE_COMMON_TESTS_BASE_DIR . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR;
-        $this->assertInternalType('string', File::fileGetContents($pathResources . 'images' . DIRECTORY_SEPARATOR . 'PHPPowerPointLogo.png'));
+        $this->assertIsString(File::fileGetContents($pathResources . 'images' . DIRECTORY_SEPARATOR . 'PHPPowerPointLogo.png'));
         $this->assertNull(File::fileGetContents($pathResources . 'images' . DIRECTORY_SEPARATOR . 'PHPPowerPointLogo_404.png'));
-        $this->assertInternalType('string', File::fileGetContents('zip://' . $pathResources . 'files' . DIRECTORY_SEPARATOR . 'Sample_01_Simple.pptx#[Content_Types].xml'));
+        $this->assertIsString(File::fileGetContents('zip://' . $pathResources . 'files' . DIRECTORY_SEPARATOR . 'Sample_01_Simple.pptx#[Content_Types].xml'));
         $this->assertNull(File::fileGetContents('zip://' . $pathResources . 'files' . DIRECTORY_SEPARATOR . 'Sample_01_Simple.pptx#404.xml'));
         $this->assertNull(File::fileGetContents('zip://' . $pathResources . 'files' . DIRECTORY_SEPARATOR . '404.pptx#404.xml'));
     }

tests/Common/Tests/XMLReaderTest.php

@@ -17,14 +17,17 @@
 
 namespace PhpOffice\Common\Tests;
 
+use Exception;
+use InvalidArgumentException;
 use PhpOffice\Common\XMLReader;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test class for XMLReader
  *
  * @coversDefaultClass \PhpOffice\Common\XMLReader
  */
-class XMLReaderTest extends \PHPUnit\Framework\TestCase
+class XMLReaderTest extends TestCase
 {
     /**
      * Test reading XML from string
@@ -58,11 +61,12 @@ public function testDomFromZip(): void
 
     /**
      * Test that read from non existing archive throws exception
-     *
-     * @expectedException \Exception
      */
     public function testThrowsExceptionOnNonExistingArchive(): void
     {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Cannot find archive file.');
+
         $pathResources = PHPOFFICE_COMMON_TESTS_BASE_DIR . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR . 'files' . DIRECTORY_SEPARATOR;
 
         $reader = new XMLReader();
@@ -86,7 +90,7 @@ public function testCountElements(): void
     public function testReturnNullOnNonExistingNode(): void
     {
         $reader = new XMLReader();
-        $this->assertEmpty($reader->getElements('/element/children'));
+        $this->assertCount(0, $reader->getElements('/element/children'));
         $reader->getDomFromString('<element><child>AAA</child></element>');
 
         $this->assertNull($reader->getElement('/element/children'));
@@ -125,11 +129,12 @@ public function testShouldParseXmlWithCustomNamespace(): void
 
     /**
      * Test that xpath fails if custom namespace is not registered
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testShouldThowExceptionIfTryingToRegisterNamespaceBeforeReadingDoc(): void
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Dom needs to be loaded before registering a namespace');
+
         $reader = new XMLReader();
         $reader->registerNamespace('test', 'http://phpword.com/my/custom/namespace');
     }

tests/Common/Tests/XMLWriterTest.php

@@ -62,9 +62,15 @@ public function testWriteAttributeShouldWriteFloatValueLocaleIndependent(): void
         $xmlWriter->writeAttribute('name', $value);
         $xmlWriter->endElement();
 
+        // https://www.php.net/manual/en/language.types.string.php#language.types.string.casting
+        // As of PHP 8.0.0, the decimal point character is always ..
+        // Prior to PHP 8.0.0, the decimal point character is defined in the script's locale (category LC_NUMERIC).
         setlocale(LC_NUMERIC, 'de_DE.UTF-8', 'de');
-
-        $this->assertSame('1,2', (string) $value);
+        if (PHP_VERSION_ID > 80000) {
+            $this->assertSame('1.2', (string) $value);
+        } else {
+            $this->assertSame('1,2', (string) $value);
+        }
         $this->assertSame('<element name="1.2"/>' . chr(10), $xmlWriter->getData());
     }
 }

tests/Common/Tests/_includes/XmlDocument.php

@@ -155,9 +155,10 @@ public function getPath(): string
      *
      * @return string
      */
-    public function getElementAttribute(string $path, string $attribute, string $file = 'word/document.xml'): string 
+    public function getElementAttribute(string $path, string $attribute, string $file = 'word/document.xml'): string
     {
         $element = $this->getElement($path, $file);
+
         return $element instanceof DOMElement ? $element->getAttribute($attribute) : '';
     }
 
@@ -173,6 +174,7 @@ public function getElementAttribute(string $path, string $attribute, string $fil
     public function attributeElementExists(string $path, string $attribute, string $file = 'word/document.xml'): bool
     {
         $element = $this->getElement($path, $file);
+
         return $element instanceof DOMElement ? $element->hasAttribute($attribute) : false;
     }