Fix PHP 7.0 local CI

Author: SbWereWolf

composer.json

@@ -48,7 +48,7 @@
   "scripts": {
     "test": "php ./vendor/phpunit/phpunit/phpunit --configuration ./continuous-integration/phpunit/phpunit.xml --testdox",
     "test-coverage": "php ./vendor/phpunit/phpunit/phpunit --configuration ./continuous-integration/phpunit/phpunit.xml --testdox --coverage-html ./continuous-integration/autotests-coverage-report --whitelist ./src",
-    "phpstan-check": "php ./vendor/bin/phpstan analyse -vvv --configuration continuous-integration/phpstan/phpstan.neon",
+    "phpstan-check": "php ./vendor/bin/phpstan analyse -vvv --level 7 src --configuration continuous-integration/phpstan/phpstan.neon",
     "check-style": "php ./vendor/bin/phpcs --standard=continuous-integration/phpcs/phpcs.xml -v",
     "fix-style": "php ./vendor/bin/phpcbf --standard=continuous-integration/phpcs/phpcs.xml -v"
   },

continuous-integration/phpstan/ignore-errors/baseline.neon

@@ -1 +1 @@
-parameters:
+parameters:

continuous-integration/phpstan/phpstan.neon

@@ -1,7 +1,6 @@
 includes:
     - ignore-errors/baseline.neon
 parameters:
-    level: 10
     tmpDir: tmp/
     paths:
         - ../../src

src/SbWereWolf/XmlNavigator/Conversion/FastXmlToArray.php

@@ -11,14 +11,11 @@
 
 /**
  * Converts an XML document into a PHP array with static methods
- *
- * @phpstan-import-type HierarchyNode from IFastXmlToArray
- * @phpstan-import-type PrettyNode from IFastXmlToArray
  */
 class FastXmlToArray implements IFastXmlToArray
 {
     /**
-     * @return HierarchyNode
+     * @return array<string, mixed>
      */
     public static function convert(
         string $xmlText = '',
@@ -57,7 +54,7 @@ static function (XMLReader $cursor): bool {
             );
         };
 
-        /** @var HierarchyNode $result */
+        /** @var array<string, mixed> $result */
         $result = self::parseRootElement(
             $xmlText,
             $xmlUri,
@@ -70,7 +67,7 @@ static function (XMLReader $cursor): bool {
     }
 
     /**
-     * @return PrettyNode
+     * @return array<string, mixed>
      */
     public static function prettyPrint(
         string $xmlText = '',
@@ -103,7 +100,7 @@ static function (XMLReader $cursor): bool {
             );
         };
 
-        /** @var PrettyNode $result */
+        /** @var array<string, mixed> $result */
         $result = self::parseRootElement(
             $xmlText,
             $xmlUri,
@@ -182,22 +179,30 @@ private static function createXmlReader(
             );
         }
 
+        $reader = new XMLReader();
+
         if ($xmlText !== '') {
-            /** @var XMLReader $reader */
-            $reader = @XMLReader::XML(
+            $loaded = @$reader->XML(
                 $xmlText,
                 $encoding,
                 $flags
             );
+            if ($loaded !== true) {
+                throw new InvalidArgumentException(
+                    'Unable to parse XML from $xmlText.' . self::formatLibxmlErrors(),
+                    -669
+                );
+            }
+
             return $reader;
         }
 
-        $reader = @XMLReader::open(
+        $opened = @$reader->open(
             $xmlUri,
             $encoding,
             $flags
         );
-        if (!$reader instanceof XMLReader) {
+        if ($opened !== true) {
             throw new InvalidArgumentException(
                 'Unable to open XML source from URI `' . $xmlUri . '`.',
                 -671
@@ -249,8 +254,9 @@ private static function formatLibxmlErrors(): string
         }
 
         $messages = array_map(
-            static function (\LibXMLError $error): string {
-                return trim($error->message);
+            static function ($error): string {
+                /** @var object $error */
+                return trim((string) $error->message);
             },
             $errors
         );

src/SbWereWolf/XmlNavigator/Conversion/XmlConverter.php

@@ -8,16 +8,13 @@
 
 /**
  * Converts an XML document into a PHP array
- *
- * @phpstan-import-type HierarchyNode from IFastXmlToArray
- * @phpstan-import-type PrettyNode from IFastXmlToArray
  */
 class XmlConverter implements IXmlConverter
 {
-    /** @var HierarchyNode
+    /** @var array<string, mixed>
      *      Normalized XML document structure */
     private $xmlStructure = [];
-    /** @var PrettyNode
+    /** @var array<string, mixed>
      *       Readable XML document representation */
     private $prettyXml = [];
     /** @var string Index for the element name */
@@ -62,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * @return PrettyNode
+     * @return array<string, mixed>
      */
     public function toPrettyPrint(
         string $xmlText = '',
@@ -88,7 +85,7 @@ public function toPrettyPrint(
     }
 
     /**
-     * @return HierarchyNode
+     * @return array<string, mixed>
      */
     public function toHierarchyOfElements(
         string $xmlText = '',

src/SbWereWolf/XmlNavigator/Extraction/HierarchyComposer.php

@@ -91,7 +91,7 @@ private static function composeElement(
             return $result;
         }
 
-        /** @var list<HierarchyNode> $children */
+        /** @var array<int, array<string, mixed>> $children */
         $children = [];
         $value = '';
         $hasValue = false;

src/SbWereWolf/XmlNavigator/Extraction/PrettyPrintComposer.php

@@ -9,19 +9,14 @@
 
 /**
  * Converts an XML element into a PHP array
- *
- * @phpstan-import-type PrettyNode from \SbWereWolf\XmlNavigator\Conversion\IFastXmlToArray
- * @phpstan-import-type PrettyNodeValue from \SbWereWolf\XmlNavigator\Conversion\IFastXmlToArray
- * @phpstan-import-type XmlAttributes from \SbWereWolf\XmlNavigator\Conversion\IFastXmlToArray
- * @phpstan-type PrettyChildren array<string, PrettyNodeValue>
  */
 class PrettyPrintComposer implements Notation
 {
     /**
      * @param XMLReader $reader
      * @param string $valueIndex index for element value
      * @param string $attributesIndex index for attributes collection
-     * @return PrettyNode
+     * @return array<string, mixed>
      */
     public static function compose(
         XMLReader $reader,
@@ -65,7 +60,7 @@ private static function needsReadToReachElement(
     /**
      * @param string $valueIndex
      * @param string $attributesIndex
-     * @return PrettyNode
+     * @return array<string, mixed>
      */
     private static function composeEmptyElement(
         XMLReader $reader,
@@ -91,7 +86,7 @@ private static function composeEmptyElement(
     /**
      * @param string $valueIndex
      * @param string $attributesIndex
-     * @return PrettyNode
+     * @return array<string, mixed>
      */
     private static function composeElement(
         XMLReader $reader,
@@ -115,7 +110,7 @@ private static function composeElement(
             ];
         }
 
-        /** @var PrettyChildren $children */
+        /** @var array<string, mixed> $children */
         $children = [];
         $value = '';
         $hasValue = false;
@@ -128,7 +123,6 @@ private static function composeElement(
                 );
                 /** @var string $childName */
                 $childName = self::firstKey($child);
-                /** @var PrettyNodeValue $childValue */
                 $childValue = $child[$childName];
                 self::appendChild($children, $childName, $childValue);
                 continue;
@@ -166,10 +160,10 @@ private static function composeElement(
     }
 
     /**
-     * @param PrettyChildren $target
+     * @param array<string, mixed> $target
      * @param string $childName
-     * @param PrettyNodeValue $childValue
-     * @param-out PrettyChildren $target
+     * @param mixed $childValue
+     * @param-out array<string, mixed> $target
      */
     private static function appendChild(
         array &$target,
@@ -197,9 +191,9 @@ private static function appendChild(
     }
 
     /**
-     * @param PrettyChildren $children
-     * @param XmlAttributes $attributes
-     * @return PrettyNodeValue
+     * @param array<string, mixed> $children
+     * @param array<string, string> $attributes
+     * @return mixed
      */
     private static function normalizeValue(
         array $children,
@@ -226,7 +220,7 @@ private static function normalizeValue(
             ];
         }
 
-        /** @var array<string, PrettyNodeValue> $result */
+        /** @var array<string, mixed> $result */
         $result = [];
         if ($attributes !== []) {
             $result[$attributesIndex] = $attributes;

src/SbWereWolf/XmlNavigator/Navigation/XmlElement.php

@@ -12,16 +12,14 @@
 /**
  * XML element value object
  *
- * @phpstan-import-type HierarchyNode from IFastXmlToArray
- * @phpstan-import-type XmlAttributes from IFastXmlToArray
  * @phpstan-consistent-constructor
  */
 class XmlElement implements IXmlElement
 {
     /** @var bool */
     private static $trustChildData = false;
 
-    /** @var HierarchyNode Serialized XML element representation */
+    /** @var array<string, mixed> Serialized XML element representation */
     private $data;
     /** @var string Index for the element name */
     private $name;
@@ -35,13 +33,13 @@ class XmlElement implements IXmlElement
     private $elementName;
     /** @var string XML element value */
     private $elementValue;
-    /** @var XmlAttributes XML element attributes */
+    /** @var array<string, string> XML element attributes */
     private $attributesData;
-    /** @var list<array<string, mixed>> Child elements */
+    /** @var array<int, array<string, mixed>> Child elements */
     private $sequenceData;
 
     /**
-     * @param HierarchyNode $initial Serialized XML element payload
+     * @param array<string, mixed> $initial Serialized XML element payload
      * @param string $name index for the element name
      * @param string $val index for the element value
      * @param string $attr index for element attributes
@@ -81,7 +79,7 @@ public function __construct(
         }
 
         $keys = [$name, $val, $attr, $seq];
-        /** @var HierarchyNode $data */
+        /** @var array<string, mixed> $data */
         $data = [];
         foreach ($keys as $key) {
             if (array_key_exists($key, $initial)) {
@@ -147,7 +145,6 @@ public function elements(string $name = ''): array
     public function pull(string $name = ''): Generator
     {
         foreach ($this->sequenceData as $elem) {
-            /** @var HierarchyNode $elem */
             if (
                 '' !== $name
                 && (($elem[$this->name] ?? null) !== $name)
@@ -224,7 +221,7 @@ public function serialize(): array
 
     /**
      * @param mixed $value Value that may contain XML attributes
-     * @phpstan-assert-if-true XmlAttributes $value
+     * @phpstan-assert-if-true array<string, string> $value
      */
     private static function isXmlAttributes($value): bool
     {
@@ -243,7 +240,7 @@ private static function isXmlAttributes($value): bool
 
     /**
      * @param mixed $value Value that may contain a list of child elements
-     * @phpstan-assert-if-true list<array<string, mixed>> $value
+     * @phpstan-assert-if-true array<int, array<string, mixed>> $value
      */
     private static function isHierarchySequence($value): bool
     {

tests/Compat/docker/Dockerfile

@@ -17,12 +17,14 @@ RUN apt-get update \
         libxml2-dev \
         $PHPIZE_DEPS \
     && docker-php-ext-install xml \
-    && if [ -n "$XDEBUG_VERSION" ]; then \
+    && if [ "$XDEBUG_VERSION" = "none" ]; then \
+        true; \
+    elif [ -n "$XDEBUG_VERSION" ]; then \
         pecl install xdebug-"$XDEBUG_VERSION"; \
     else \
         pecl install xdebug; \
     fi \
-    && docker-php-ext-enable xdebug \
+    && if php -m | grep -qi '^xdebug$'; then docker-php-ext-enable xdebug; fi \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

tests/Unit/Extraction/HierarchyComposerTest.php

@@ -94,7 +94,7 @@ public function testComposeReturnsEmptyArrayWhenReaderIsExhausted()
         $reader->close();
     }
 
-    public function testComposeMovesReaderPastTopLevelEmptyElement(): void
+    public function testComposeMovesReaderPastTopLevelEmptyElement()
     {
         $reader = XmlFixture::readerFromFixture('empty-elements.xml');