Modernize PHP 8 tests and fix extension and FPM provisioning

docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.2-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.2/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.3/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.4/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-apache-dev/8.5/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.2-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.2/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.3/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.4/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-dev/8.5/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.2-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.2/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-php.sh

@@ -18,7 +18,7 @@ else
     # listen on public IPv6 port
     go-replace --mode=line --regex \
         -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
-        -- /opt/docker/etc/php/fpm/pool.d/application.conf \
-           /opt/docker/etc/php/fpm/php-fpm.conf
+        --path=/opt/docker/etc/php/fpm/ \
+        --path-pattern='*.conf'
 
 fi

docker/php-official/8.1/Dockerfile

@@ -106,6 +106,8 @@ RUN set -x \
         libpng16-16 \
         libmcrypt4 \
         libzip4 \
+        libyaml-0-2 \
+        libc-client2007e \
         # Dev and headers
         libavif-dev \
         libjpeg62-turbo-dev \
@@ -130,6 +132,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libyaml-dev \
     # Install guetzli
     && wget https://github.com/google/guetzli/archive/master.zip \
     && unzip master.zip \
@@ -183,6 +186,7 @@ RUN set -x \
     && pecl install protobuf-4.33.5 \
     && pecl install xmlrpc-1.0.0RC3 \
     && pecl install vips \
+    && pecl install yaml \
     && pecl install redis \
     && pecl install mongodb \
     && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
@@ -193,6 +197,7 @@ RUN set -x \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
     && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \
+    && echo extension=yaml.so > /usr/local/etc/php/conf.d/yaml.ini \
     && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \
     # Uninstall dev and header packages
     && apt-get purge -y -f --force-yes \
@@ -216,6 +221,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libyaml-dev \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \

docker/php-official/8.2/Dockerfile

@@ -106,6 +106,7 @@ RUN set -x \
         libpng16-16 \
         libmcrypt4 \
         libzip4 \
+        libyaml-0-2 \
         libc-client2007e \
         # Dev and headers
         libavif-dev \
@@ -131,6 +132,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libyaml-dev \
         libssl-dev \
     # Install guetzli
     && wget https://github.com/google/guetzli/archive/master.zip \
@@ -186,6 +188,7 @@ RUN set -x \
     && pecl install protobuf \
     && pecl install xmlrpc-1.0.0RC3 \
     && pecl install vips \
+    && pecl install yaml \
     && pecl install redis \
     && pecl install mongodb \
     && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
@@ -196,6 +199,7 @@ RUN set -x \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
     && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \
+    && echo extension=yaml.so > /usr/local/etc/php/conf.d/yaml.ini \
     && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \
     # Uninstall dev and header packages
     && apt-get purge -y -f --force-yes \
@@ -219,6 +223,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libyaml-dev \
         libssl-dev \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \