From 3d547eefea1998299290b71d8a1d5f1be0b47dda Mon Sep 17 00:00:00 2001 From: Art4 Date: Fri, 3 Oct 2025 21:34:27 +0200 Subject: [PATCH 1/3] Add tests with Redmine 6.1.0 --- composer.json | 1 + docker-compose.yml | 15 ++++++++++++++- tests/Behat/behat.yml | 10 ++++++++++ tests/RedmineExtension/RedmineVersion.php | 8 ++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dcf4b537..1197d941 100644 --- a/composer.json +++ b/composer.json @@ -53,6 +53,7 @@ "scripts": { "bdt": [ "Composer\\Config::disableProcessTimeout", + "@behat --format=progress --suite=redmine_6_1", "@behat --format=progress --suite=redmine_6_0", "@behat --format=progress --suite=redmine_5_1", "@behat --format=progress --suite=redmine_5_0" diff --git a/docker-compose.yml b/docker-compose.yml index 7122596b..da2bb394 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./:/var/www/project/ # Location of the project for php-fpm. Note this should be the same for NGINX.* redmine-dev: - image: redmine:6.0.7 + image: redmine:6.1.0 ports: - "3000:3000" environment: @@ -26,6 +26,19 @@ services: # Make sure the following services are configured in: # - /tests/Behat/behat.yml + redmine-6-1: + image: redmine:6.1.0 + ports: + - "5061:3000" + environment: + # Workaround: Remove secret for Rails 7.2 so it will be generated automatically + # @see https://github.com/docker-library/redmine/issues/349#issuecomment-2516634932 + # REDMINE_SECRET_KEY_BASE: supersecretkey + REDMINE_PLUGINS_MIGRATE: true + volumes: + - ./.docker/redmine-60100_data/files:/usr/src/redmine/files + - ./.docker/redmine-60100_data/sqlite:/usr/src/redmine/sqlite + redmine-6-0: image: redmine:6.0.7 ports: diff --git a/tests/Behat/behat.yml b/tests/Behat/behat.yml index 1a6a3ccb..6a7e734e 100644 --- a/tests/Behat/behat.yml +++ b/tests/Behat/behat.yml @@ -3,6 +3,11 @@ default: default: paths: - '%paths.base%/features' + redmine_6_1: + contexts: + - Redmine\Tests\Behat\Bootstrap\FeatureContext: + redmineVersion: '6.1.0' + rootPath: '%paths.base%/../../.docker' redmine_6_0: contexts: - Redmine\Tests\Behat\Bootstrap\FeatureContext: @@ -21,6 +26,11 @@ default: github-actions: suites: + redmine_6_1: + contexts: + - Redmine\Tests\Behat\Bootstrap\FeatureContext: + redmineVersion: '6.1.0' + rootPath: '/home/runner/work/_temp' redmine_6_0: contexts: - Redmine\Tests\Behat\Bootstrap\FeatureContext: diff --git a/tests/RedmineExtension/RedmineVersion.php b/tests/RedmineExtension/RedmineVersion.php index e5acedcc..dade4b2f 100644 --- a/tests/RedmineExtension/RedmineVersion.php +++ b/tests/RedmineExtension/RedmineVersion.php @@ -6,6 +6,14 @@ enum RedmineVersion: string { + /** + * Redmine 6.1.0 + * + * @link https://www.redmine.org/versions/198 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_6_1#610-2025-09-21 + */ + case V6_1_0 = '6.1.0'; + /** * Redmine 6.0.7 * From 757b338369ec0dd4e1f6f0cd2be29c6ee92569d0 Mon Sep 17 00:00:00 2001 From: Art4 Date: Fri, 3 Oct 2025 21:46:26 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md and README.md --- CHANGELOG.md | 5 +++++ README.md | 1 + 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 961e6e1e..caf84798 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/kbsali/php-redmine-api/compare/v2.8.0...v2.x) +### Added + +- Add support for PHP 8.5 +- Add support for Redmine 6.1. + ### Changed - Behaviour-driven tests are run against Redmine 6.0.7, 5.1.10, 5.0.14. diff --git a/README.md b/README.md index 7b08a74c..66fff9a7 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ like [Guzzle](https://github.com/guzzle/guzzle) for handling http connections We support (and run tests against) the [latest supported Redmine versions](https://www.redmine.org/projects/redmine/wiki/Download#Versions-status-and-releases-policy) that receive security updates. +- Redmine 6.1.x - Redmine 6.0.x - Redmine 5.1.x - Redmine 5.0.x From 5ccb1cd0acb3a6e55769710bab6022a68bce1535 Mon Sep 17 00:00:00 2001 From: Art4 Date: Fri, 3 Oct 2025 21:58:40 +0200 Subject: [PATCH 3/3] Drop support for redmine 5.0 --- CHANGELOG.md | 6 +++++- README.md | 1 - composer.json | 3 +-- docker-compose.yml | 12 ------------ tests/Behat/behat.yml | 10 ---------- 5 files changed, 6 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caf84798..7bea9d6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Behaviour-driven tests are run against Redmine 6.0.7, 5.1.10, 5.0.14. +- Behaviour-driven tests are run against Redmine 6.1.0, 6.0.7, 5.1.10. + +### Removed + +- Drop support for Redmine 5.0.x. ## [v2.8.0](https://github.com/kbsali/php-redmine-api/compare/v2.7.0...v2.8.0) - 2025-05-30 diff --git a/README.md b/README.md index 66fff9a7..1d003ef0 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,6 @@ that receive security updates. - Redmine 6.1.x - Redmine 6.0.x - Redmine 5.1.x -- Redmine 5.0.x Nevertheless, you can also use this library for all older Redmine versions. In this case, however, be aware that some features might not be supported by your Redmine server. diff --git a/composer.json b/composer.json index 1197d941..6f2a63c5 100644 --- a/composer.json +++ b/composer.json @@ -55,8 +55,7 @@ "Composer\\Config::disableProcessTimeout", "@behat --format=progress --suite=redmine_6_1", "@behat --format=progress --suite=redmine_6_0", - "@behat --format=progress --suite=redmine_5_1", - "@behat --format=progress --suite=redmine_5_0" + "@behat --format=progress --suite=redmine_5_1" ], "behat": "behat --config tests/Behat/behat.yml", "codestyle": "php-cs-fixer fix", diff --git a/docker-compose.yml b/docker-compose.yml index da2bb394..8b11af78 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,15 +63,3 @@ services: volumes: - ./.docker/redmine-50110_data/files:/usr/src/redmine/files - ./.docker/redmine-50110_data/sqlite:/usr/src/redmine/sqlite - - redmine-5-0: - image: redmine:5.0.12 # There is no tag for 5.0.14 on Docker hub - user: "1000:1000" - ports: - - "5050:3000" - environment: - REDMINE_SECRET_KEY_BASE: supersecretkey - REDMINE_PLUGINS_MIGRATE: true - volumes: - - ./.docker/redmine-50014_data/files:/usr/src/redmine/files - - ./.docker/redmine-50014_data/sqlite:/usr/src/redmine/sqlite diff --git a/tests/Behat/behat.yml b/tests/Behat/behat.yml index 6a7e734e..e9495383 100644 --- a/tests/Behat/behat.yml +++ b/tests/Behat/behat.yml @@ -18,11 +18,6 @@ default: - Redmine\Tests\Behat\Bootstrap\FeatureContext: redmineVersion: '5.1.10' rootPath: '%paths.base%/../../.docker' - redmine_5_0: - contexts: - - Redmine\Tests\Behat\Bootstrap\FeatureContext: - redmineVersion: '5.0.14' - rootPath: '%paths.base%/../../.docker' github-actions: suites: @@ -41,8 +36,3 @@ github-actions: - Redmine\Tests\Behat\Bootstrap\FeatureContext: redmineVersion: '5.1.10' rootPath: '/home/runner/work/_temp' - redmine_5_0: - contexts: - - Redmine\Tests\Behat\Bootstrap\FeatureContext: - redmineVersion: '5.0.14' - rootPath: '/home/runner/work/_temp'