Merge pull request #1419 from garak/sf7

allow Symfony 7
dustin10 · Dec 18, 2023 · 0d748cf · 0d748cf
2 parents 203f968 + b5a19ca
commit 0d748cf
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 31 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -60,13 +60,19 @@ jobs:
                       with_oneupbundle: false
                       max_deprecations: 5
                     - php: '8.1'
-                      symfony: '6.1.*'
+                      symfony: '6.3.*'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: true
                       max_deprecations: 0
                     - php: '8.2'
-                      symfony: '6.2.*'
+                      symfony: '6.4.*'
+                      dependencies: highest
+                      with_imagine: false
+                      with_oneupbundle: false
+                      max_deprecations: 0
+                    - php: '8.3'
+                      symfony: '7.0.*'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: false

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -51,7 +51,7 @@ make test TEST="Tests/Util/FilenameUtilsTest.php"
 
 will allow testing single Test Classes.
 
-There are two environments available: PHP 8.1 and PHP 8.2.
+There are three environments available: PHP 8.1, PHP 8.2, and PHP 8.3.
 Default environment is *PHP 8.1*. If you want to execute it against
 other PHP versions, please use environment variables as this:
 

diff --git a/composer.json b/composer.json
@@ -19,15 +19,15 @@
         "ext-simplexml": "*",
         "doctrine/persistence": "^3",
         "jms/metadata": "^2.4",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/event-dispatcher-contracts": "^3.0",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/mime": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/string": "^5.4 || ^6.0"
+        "symfony/config": "^5.4 || ^6.0 || ^7.0",
+        "symfony/console": "^5.4 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+        "symfony/event-dispatcher-contracts": "^3.1",
+        "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
+        "symfony/mime": "^5.4 || ^6.0 || ^7.0",
+        "symfony/property-access": "^5.4 || ^6.0 || ^7.0",
+        "symfony/string": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "ext-sqlite3": "*",
@@ -39,23 +39,23 @@
         "league/flysystem-bundle": "^2.3",
         "league/flysystem-memory": "^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3",
-        "mikey179/vfsstream": "^1.6.8",
+        "mikey179/vfsstream": "^1.6.11",
         "phpunit/phpunit": "^9.6",
         "symfony/asset": "^5.4 || ^6.0",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/css-selector": "^5.4 || ^6.0",
-        "symfony/doctrine-bridge": "^5.4 || ^6.0",
-        "symfony/dom-crawler": "^5.4 || ^6.0",
-        "symfony/form": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/phpunit-bridge": "^6.3",
-        "symfony/security-csrf": "^5.4 || ^6.0",
-        "symfony/translation": "^5.4 || ^6.0",
-        "symfony/twig-bridge": "^5.4 || ^6.0",
-        "symfony/twig-bundle": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0",
-        "symfony/var-dumper": "^5.4 || ^6.0",
-        "symfony/yaml": "^5.4 || ^6.0",
+        "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
+        "symfony/css-selector": "^5.4 || ^6.0 || ^7.0",
+        "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
+        "symfony/dom-crawler": "^5.4 || ^6.0 || ^7.0",
+        "symfony/form": "^5.4 || ^6.0 || ^7.0",
+        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/security-csrf": "^5.4 || ^6.0 || ^7.0",
+        "symfony/translation": "^5.4 || ^6.0 || ^7.0",
+        "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0",
+        "symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0",
+        "symfony/validator": "^5.4 || ^6.0 || ^7.0",
+        "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
+        "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
         "yoast/phpunit-polyfills": "^2.0"
     },
     "suggest": {

diff --git a/docker/Dockerfile81 b/docker/Dockerfile81
@@ -1,4 +1,4 @@
-FROM php:8.1.8-alpine
+FROM php:8.1-alpine
 
 ARG MONGODB_VERSION=1.14.0
 

diff --git a/docker/Dockerfile82 b/docker/Dockerfile82
@@ -1,4 +1,4 @@
-FROM php:8.2.0-alpine
+FROM php:8.2-alpine
 
 ARG MONGODB_VERSION=1.14.0
 

diff --git a/docker/Dockerfile83 b/docker/Dockerfile83
@@ -0,0 +1,44 @@
+FROM php:8.3-alpine
+
+ARG MONGODB_VERSION=1.17.0
+
+# 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"]
diff --git a/docs/installation.md b/docs/installation.md
@@ -9,7 +9,7 @@ your Symfony project:
 composer require vich/uploader-bundle
 ```
 
-Alternatively, you can add the requirement `"vich/uploader-bundle": "^2.0"` to your composer.json and run
+Alternatively, you can add the requirement `"vich/uploader-bundle": "^2.2"` to your composer.json and run
 `composer update`. This could be useful when the installation of VichUploaderBundle is not compatible with some
 currently installed dependencies. Anyway, the previous option is the preferred way, since composer can pick the
 best requirement constraint for you.

diff --git a/docs/symfony_support_policy.md b/docs/symfony_support_policy.md
@@ -1,7 +1,7 @@
 # Symfony support policy
 
 As indicated by the constraints defined in the `composer.json` file, this bundle
-supports Symfony `^5.4 || ^6.0` in its latest versions (>=`2.0.*`).
+supports Symfony `^5.4 || ^6.0 || ^7.0` in its latest versions (>=`2.2.*`).
 
 Only versions still actively maintained by the Symfony core team will be supported by
 the maintainers of this bundle. Older versions of Symfony can be still used with previous