Made compatible with Symfony 6

yohang · Feb 13, 2023 · 8087bf6 · 8087bf6
1 parent 456a925
commit 8087bf6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -6,9 +6,17 @@ docker_build:
 	docker build --build-arg PHP_VERSION=7.4 --build-arg COMPOSER_FLAGS="--prefer-lowest" -t calendr:7.4-lowdeps .
 	docker build --build-arg PHP_VERSION=8.0 -t calendr:8.0 .
 	docker build --build-arg PHP_VERSION=8.0 --build-arg COMPOSER_FLAGS="--prefer-lowest" -t calendr:8.0-lowdeps .
+	docker build --build-arg PHP_VERSION=8.0 -t calendr:8.1 .
+	docker build --build-arg PHP_VERSION=8.0 --build-arg COMPOSER_FLAGS="--prefer-lowest" -t calendr:8.1-lowdeps .
+	docker build --build-arg PHP_VERSION=8.0 -t calendr:8.2 .
+	docker build --build-arg PHP_VERSION=8.0 --build-arg COMPOSER_FLAGS="--prefer-lowest" -t calendr:8.2-lowdeps .
 
 docker_test: docker_build
 	docker run -it --rm calendr:7.4 ./vendor/bin/phpunit tests --colors
 	docker run -it --rm calendr:7.4-lowdeps ./vendor/bin/phpunit tests --colors
 	docker run -it --rm calendr:8.0 ./vendor/bin/phpunit tests --colors
 	docker run -it --rm calendr:8.0-lowdeps ./vendor/bin/phpunit tests --colors
+	docker run -it --rm calendr:8.1 ./vendor/bin/phpunit tests --colors
+	docker run -it --rm calendr:8.1-lowdeps ./vendor/bin/phpunit tests --colors
+	docker run -it --rm calendr:8.2 ./vendor/bin/phpunit tests --colors
+	docker run -it --rm calendr:8.2-lowdeps ./vendor/bin/phpunit tests --colors
diff --git a/composer.json b/composer.json
@@ -18,21 +18,21 @@
     ],
     "require": {
         "php": ">=7.4",
-        "symfony/options-resolver": "^4.4|^5.3"
+        "symfony/options-resolver": "^4.4|^5.3|^6.0"
     },
     "require-dev": {
         "doctrine/cache": "^2.1.1",
         "doctrine/common": "^3.1.2",
         "doctrine/orm": "^2.9.3",
         "phpunit/phpunit": "^8.0|^9.0",
-        "symfony/dependency-injection": "^4.4|^5.3",
-        "symfony/config": "^4.4|^5.3",
-        "symfony/var-dumper": "^4.4|^5.3",
-        "symfony/yaml": "^4.4|^5.3",
+        "symfony/dependency-injection": "^4.4|^5.3|^6.0",
+        "symfony/config": "^4.4|^5.3|^6.0",
+        "symfony/var-dumper": "^4.4|^5.3|^6.0",
+        "symfony/yaml": "^4.4|^5.3|^6.0",
         "twig/twig": "^3.3.2",
         "phpspec/prophecy-phpunit": "^2.0",
-        "symfony/cache": "^5.3",
-        "symfony/http-kernel": "^5.3"
+        "symfony/cache": "^5.3|^6.0",
+        "symfony/http-kernel": "^5.3|^6.0"
     },
     "autoload": {
         "psr-4": {