👷 improve CI

Author: garak

.github/workflows/build.yaml

@@ -85,13 +85,13 @@ jobs:
                       with_oneupbundle: false
                       max_deprecations: 0
                     - php: '8.3'
-                      symfony: '7.2.*'
+                      symfony: '7.3.*'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: false
                       max_deprecations: 0
                     - php: '8.4'
-                      symfony: '7.3.*@dev'
+                      symfony: '7.4.*@dev'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: false
@@ -111,11 +111,9 @@ jobs:
                   php-version: ${{ matrix.php }}
                   extensions: mongodb-stable, pdo_sqlite
             - run: composer require --no-update doctrine/annotations:^1.14
-            - run: |
-                  sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0",\n"symfony\/http-kernel": "6.4.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json
             - run: |
                   composer global config --no-plugins allow-plugins.symfony/flex true
-                  composer global require --no-interaction --no-progress symfony/flex:^2.2
+                  composer global require --no-interaction --no-progress symfony/flex:^2.8
                   composer config extra.symfony.require ${{ matrix.symfony }}
               if: matrix.symfony != '*'
             - name: use possible dev deps

CONTRIBUTING.md

@@ -49,7 +49,7 @@ make test TEST="Tests/Util/FilenameUtilsTest.php"
 
 will allow testing single Test classes.
 
-Four environments are available: PHP 8.1, PHP 8.2, PHP 8.3, and PHP 8.4.
+Five environments are available: PHP 8.1, PHP 8.2, PHP 8.3, PHP 8.4, and PHP 8.5.
 The default environment is *PHP 8.1*. If you want to execute tests against
 other PHP versions, please use the environment variables as this:
 

docker/Dockerfile82

@@ -38,7 +38,6 @@ WORKDIR /srv/vich-uploader
 COPY . ./
 
 RUN set -eux; \
-    sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0", "symfony\/http-kernel": "6.0.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json; \
 	composer update --prefer-dist --ignore-platform-reqs; \
 	composer clear-cache
 

docker/Dockerfile83

@@ -38,7 +38,6 @@ WORKDIR /srv/vich-uploader
 COPY . ./
 
 RUN set -eux; \
-    sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0", "symfony\/http-kernel": "6.0.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json; \
 	composer update --prefer-dist --ignore-platform-reqs; \
 	composer clear-cache
 

docker/Dockerfile84

@@ -38,7 +38,6 @@ WORKDIR /srv/vich-uploader
 COPY . ./
 
 RUN set -eux; \
-    sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0", "symfony\/http-kernel": "6.0.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json; \
 	composer update --prefer-dist --ignore-platform-reqs; \
 	composer clear-cache
 

docker/Dockerfile85

@@ -0,0 +1,45 @@
+FROM php:8.5.0beta1-alpine
+
+# TODO this doesn't work for now. It looks like there's no Mongo available for PHP 8.5 yet
+ARG MONGODB_VERSION=2.1.1
+
+# Install mongo
+RUN set -eux; \
+	apk add --no-cache --virtual .build-deps \
+		$PHPIZE_DEPS \
+    	openssl-dev \
+	; \
+	pecl install \
+	    mongodb-${MONGODB_VERSION} \
+    ; \
+	docker-php-ext-enable \
+	    mongodb \
+	; \
+	pecl clear-cache; \
+	\
+	runDeps="$( \
+    scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+      | tr ',' '\n' \
+      | sort -u \
+      | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+	)"; \
+	apk add --no-cache --virtual .api-add-phpexts-rundeps $runDeps \
+	curl \
+	;
+
+RUN curl -s https://getcomposer.org/installer | php
+
+RUN mv composer.phar /usr/local/bin/composer
+
+WORKDIR /srv/vich-uploader
+
+# prevent the reinstallation of vendors at every changes in the source code
+
+#COPY ./docker/script/runTests.sh ./runTests.sh
+COPY . ./
+
+RUN set -eux; \
+	composer update --prefer-dist --ignore-platform-reqs; \
+	composer clear-cache
+
+CMD ["/init"]

tests/VichUploaderBundleTest.php

@@ -20,8 +20,11 @@ final class VichUploaderBundleTest extends TestCase
 {
     protected function setUp(): void
     {
-        if (SimpleAppKernel::VERSION_ID >= 70200) { // @phpstan-ignore-line
-            self::markTestSkipped('Kernels above 7.1.0 are not supported in these tests');
+        if (\PHP_VERSION_ID <= 80200) {
+            self::markTestSkipped('PHP 8.1 is not supported in these tests');
+        }
+        if (SimpleAppKernel::VERSION_ID >= 60400) { // @phpstan-ignore-line
+            self::markTestSkipped('Kernels above 6.4.0 are not supported in these tests');
         }
     }