Upgrade Phpstan

Author: oleibman

phpstan.neon.php7.dist

@@ -20,13 +20,13 @@ parameters:
 
         ## <=PHP7.4
         -
-            message: '#Parameter \#1 \$argument of class ReflectionClass constructor expects class-string<T of object>\|T of object, string given.#'
+            message: '#Parameter \#1 \$objectOrClass of class ReflectionClass constructor expects class-string<T of object>\|T of object, string given.#'
             path: src/PhpWord/Element/AbstractContainer.php
         -
             message: '#Parameter \#1 \$function of function call_user_func expects callable\(\): mixed, string given.#'
             path: src/PhpWord/Element/Image.php
         -
-            message: '#Parameter \#1 \$argument of class ReflectionClass constructor expects class-string<T of object>\|T of object, string given.#'
+            message: '#Parameter \#1 \$objectOrClass of class ReflectionClass constructor expects class-string<T of object>\|T of object, string given.#'
             path: src/PhpWord/IOFactory.php
         -
             message: '#Parameter \#1 \$function of function call_user_func_array expects callable\(\): mixed,#'
@@ -44,7 +44,7 @@ parameters:
             message: '#PHPDoc tag @var with type PhpOffice\\PhpWord\\Style\\AbstractStyle is not subtype of native type #'
             path: tests/PhpWordTests/Style/AbstractStyleTest.php
         -
-            message: '#Parameter \#1 \$argument of class ReflectionClass constructor expects class-string<object>\|object, class-string\|false given.#'
+            message: '#Parameter \#1 \$objectOrClass of class ReflectionClass constructor expects class-string<object>\|object, class-string\|false given.#'
             path: tests/PhpWordTests/Style/AbstractStyleTest.php
         -
             message: '#PHPDoc tag @var with type PhpOffice\\PhpWord\\Writer\\Word2007\\Part\\AbstractPart is not subtype of native type #'

src/PhpWord/Reader/Word2007/AbstractPart.php

@@ -369,7 +369,11 @@ private function readFormField(XMLReader $xmlReader, array $domNodes, $parent, $
                     }
                     $formField->setEntries($listEntries);
                     if (null !== $formField->getValue()) {
-                        $formField->setText($listEntries[$formField->getValue()]);
+                        /** @var int */
+                        $temp = $formField->getValue();
+                        $formField->setText(
+                            $listEntries[$temp]
+                        );
                     }
 
                     break;

tests/PhpWordTests/Writer/HTML/Element/TableTest.php

@@ -162,7 +162,7 @@ public function testWriteTableBorders(): void
         self::assertEquals('tstyle', Helper::getTextContent($xpath, '/html/body/div/table[6]', 'class'));
         $style = Helper::getTextContent($xpath, '/html/head/style');
         self::assertNotFalse(preg_match('/^[.]tstyle[^\\r\\n]*/m', $style, $matches));
-        self::assertEquals(".tstyle {table-layout: auto; $cssnone}", $matches[0]);
+        self::assertEquals(".tstyle {table-layout: auto; $cssnone}", $matches[0] ?? '');
     }
 
     public function testWriteTableCellVAlign(): void

tests/PhpWordTests/Writer/HTML/FontTest.php

@@ -275,7 +275,7 @@ public function testWhiteSpace(): void
 
         $style = Helper::getTextContent($xpath, '/html/head/style');
         self::assertNotFalse(preg_match('/^body[^\\r\\n]*/m', $style, $matches));
-        self::assertEquals('body {font-family: \'Arial\'; font-size: 12pt; color: #000000; white-space: pre-wrap;}', $matches[0]);
+        self::assertEquals('body {font-family: \'Arial\'; font-size: 12pt; color: #000000; white-space: pre-wrap;}', $matches[0] ?? '');
         $prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
         self::assertNotEmpty($matches);
         self::assertNotFalse($prg);

tests/PhpWordTests/Writer/HTML/ParagraphTest.php

@@ -55,7 +55,7 @@ public function testParagraphStyles(): void
 
         $style = Helper::getTextContent($xpath, '/html/head/style');
         self::assertNotFalse(preg_match('/^[.]indented[^\\r\\n]*/m', $style, $matches));
-        self::assertEquals('.indented {margin-left: 0.5in; margin-right: 0.6in;}', $matches[0]);
+        self::assertEquals('.indented {margin-left: 0.5in; margin-right: 0.6in;}', $matches[0] ?? '');
     }
 
     /**
@@ -88,9 +88,9 @@ public function testParagraphAndFontStyles(): void
 
         $style = Helper::getTextContent($xpath, '/html/head/style');
         self::assertNotFalse(preg_match('/^[.]indented[^\\r\\n]*/m', $style, $matches));
-        self::assertEquals('.indented {margin-left: 0.5in; margin-right: 0.6in;}', $matches[0]);
+        self::assertEquals('.indented {margin-left: 0.5in; margin-right: 0.6in;}', $matches[0] ?? '');
         self::assertNotFalse(preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches));
-        self::assertEquals('.style1 {font-family: \'Courier New\', monospace; font-size: 10pt; white-space: pre-wrap;}', $matches[0]);
+        self::assertEquals('.style1 {font-family: \'Courier New\', monospace; font-size: 10pt; white-space: pre-wrap;}', $matches[0] ?? '');
     }
 
     /**