PHP 8.5 compatibility fixes

Now also runs test suite on PHP 8.5 by default

Author: gocom

CHANGELOG.textile

@@ -2,7 +2,9 @@ h1. Changelog
 
 Here's a summary of changes in each release. The list doesn't include some small changes or updates to test cases.
 
-h2. Version 4.1.4 - upcoming
+h2. "Version 4.1.4 - 2025/12/20":https://github.com/textile/php-textile/releases/tag/v4.1.4
+
+* Fix PHP 8.5 compatibility issues with note list rendering.
 
 h2. "Version 4.1.3 - 2025/01/07":https://github.com/textile/php-textile/releases/tag/v4.1.3
 

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   php:
-    build: ./docker/image/${IMAGE:-php_8_4}
+    build: ./docker/image/${IMAGE:-php_8_5}
     volumes:
       - .:/app
       - ${COMPOSER_HOME:-$HOME/.composer}:/composer

docker/image/php_8_5/Dockerfile

@@ -0,0 +1,16 @@
+FROM php:8.5-cli
+
+RUN apt-get update && apt-get install -y \
+    bash \
+    git \
+    libz-dev \
+    zip \
+    wget
+
+RUN pecl install xdebug-3.5.0
+
+RUN docker-php-ext-enable xdebug
+
+COPY --from=composer:2.9 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /app

phpstan.neon

@@ -1,6 +1,7 @@
 parameters:
-	ignoreErrors:
-		- '#Parameter \#2 \$callback of function preg_replace_callback#'
-		- "#Cannot access offset '[a-zA-Z0-9\\_]+' on non-empty-array#"
-		- '#Cannot access offset [0-9]+ on array#'
-		- "#Offset '[a-zA-Z0-9\\_]+' does not exist on array#"
+    reportUnmatchedIgnoredErrors: false
+    ignoreErrors:
+        - '#Parameter \#2 \$callback of function preg_replace_callback#'
+        - "#Cannot access offset '[a-zA-Z0-9\\_]+' on non-empty-array#"
+        - '#Cannot access offset [0-9]+ on array#'
+        - "#Offset '[a-zA-Z0-9\\_]+' does not exist on array#"

src/Netcarver/Textile/Parser.php

@@ -384,7 +384,7 @@ class Parser
      *
      * @var string
      */
-    protected $ver = '4.1.4-dev';
+    protected $ver = '4.1.4';
 
     /**
      * Regular expression snippets.
@@ -3865,7 +3865,12 @@ protected function makeBackrefLink($info, $g_links, $i)
             foreach ($items as $id) {
                 $out[] = '<sup><a href="#noteref'.$id.'">'. (($decode) ? $this->decodeHigh($i_) : $i_) .'</a></sup>';
                 if ($allow_inc) {
-                    $i_++;
+                    if (function_exists('str_increment')) {
+                        // @phpstan-ignore-next-line
+                        $i_ = str_increment($i_);
+                    } else {
+                        $i_++;
+                    }
                 }
             }