Made compatible with PHP8.4 and Symfony 7

yohang · Jan 9, 2025 · 05fd9a2 · 05fd9a2
1 parent de04bd0
commit 05fd9a2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -10,6 +10,10 @@ docker_build:
 	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 build --build-arg PHP_VERSION=8.0 -t calendr:8.3 .
+	docker build --build-arg PHP_VERSION=8.0 --build-arg COMPOSER_FLAGS="--prefer-lowest" -t calendr:8.3-lowdeps .
+	docker build --build-arg PHP_VERSION=8.0 -t calendr:8.4 .
+	docker build --build-arg PHP_VERSION=8.0 --build-arg COMPOSER_FLAGS="--prefer-lowest" -t calendr:8.4-lowdeps .
 
 docker_test: docker_build
 	docker run -it --rm calendr:7.4 ./vendor/bin/phpunit tests --colors
@@ -20,3 +24,7 @@ docker_test: docker_build
 	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
+	docker run -it --rm calendr:8.3 ./vendor/bin/phpunit tests --colors
+	docker run -it --rm calendr:8.3-lowdeps ./vendor/bin/phpunit tests --colors
+	docker run -it --rm calendr:8.4 ./vendor/bin/phpunit tests --colors
+	docker run -it --rm calendr:8.4-lowdeps ./vendor/bin/phpunit tests --colors
diff --git a/README.md b/README.md
@@ -1,9 +1,6 @@
 # CalendR
 
-[![Build Status](https://travis-ci.org/yohang/CalendR.svg?branch=1.1)](https://travis-ci.org/yohang/CalendR)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/yohang/CalendR/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/yohang/CalendR/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/yohang/CalendR/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/yohang/CalendR/?branch=master)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/ac050bc0-c3b2-4d88-be63-059a0d968157/mini.png)](https://insight.sensiolabs.com/projects/ac050bc0-c3b2-4d88-be63-059a0d968157)
+![Build Status](https://github.com/yohang/CalendR/actions/workflows/ci.yml/badge.svg)
 
 CalendR is an Object Oriented Calendar management library on top of PHP5.3+ Date objects.
 You can use it to deal with all your needs about calendars and events.

diff --git a/composer.json b/composer.json
@@ -17,22 +17,22 @@
         }
     ],
     "require": {
-        "php": ">=7.4|>=8.1",
-        "symfony/options-resolver": "^4.4|^5.3|^6.0"
+        "php": ">=7.4",
+        "symfony/options-resolver": "^4.4|^5.3|^6.0|^7.0"
     },
     "require-dev": {
         "doctrine/cache": "^2.1.1",
         "doctrine/common": "^3.1.2",
-        "doctrine/orm": "^2.9.3",
+        "doctrine/orm": "^2.9.3|^3.0.0",
         "phpunit/phpunit": "^8.0|^9.0",
-        "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",
+        "symfony/dependency-injection": "^4.4|^5.3|^6.0|^7.0",
+        "symfony/config": "^4.4|^5.3|^6.0|^7.0",
+        "symfony/var-dumper": "^4.4|^5.3|^6.0|^7.0",
+        "symfony/yaml": "^4.4|^5.3|^6.0|^7.0",
         "twig/twig": "^3.3.2",
         "phpspec/prophecy-phpunit": "^2.0",
-        "symfony/cache": "^5.3|^6.0",
-        "symfony/http-kernel": "^5.3|^6.0"
+        "symfony/cache": "^5.3|^6.0|^7.0",
+        "symfony/http-kernel": "^5.3|^6.0|^7.0"
     },
     "autoload": {
         "psr-4": {