From aee5ec8769e84420ef0bb69adc4d6d2159f7b787 Mon Sep 17 00:00:00 2001 From: eivydas Date: Thu, 4 Apr 2024 11:55:30 +0300 Subject: [PATCH 1/2] Allow PHP 8.3 --- .github/workflows/main.yml | 1 + composer.json | 18 ++++++++++++++---- tests/laminas-runner/composer.json | 7 ++++++- tests/mezzio-runner/composer.json | 7 ++++++- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ee26ba8..07d9236 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,7 @@ jobs: - "8.0" - "8.1" - "8.2" + - "8.3" dependencies: - "highest" - "lowest" diff --git a/composer.json b/composer.json index 580a22f..daa7e7a 100644 --- a/composer.json +++ b/composer.json @@ -26,17 +26,17 @@ } ], "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "laminas/laminas-eventmanager": "^3.4", "laminas/laminas-router": "^3.5", - "slm/queue": "^3.1", + "slm/queue": "dev-feature/php8.3", "doctrine/dbal": "^3.1.2", "doctrine/annotations": "^1.8", "laminas/laminas-config": "^3.7" }, "require-dev": { "ext-sqlite3": "*", - "doctrine/doctrine-orm-module": "^4.1 || ^5.0", + "doctrine/doctrine-orm-module": "^4.1 || ^5.0 || ^6.0", "laminas/laminas-modulemanager": "^2.11", "laminas/laminas-view": "^2.13", "laminas/laminas-log": "^2.15", @@ -47,13 +47,23 @@ "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.6.2" }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/eivydas/SlmQueue", + "canonical": true + } + ], + "conflict": { + "doctrine/cache": ">2.0" + }, "suggest": { "doctrine/doctrine-orm-module": "If you use Doctrine in combination with Laminas", "roave/psr-container-doctrine": "Configures Doctrine services automatically." }, "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-feature/php8.3": "3.1.x-dev" }, "laminas": { "module": "SlmQueueDoctrine\\Module", diff --git a/tests/laminas-runner/composer.json b/tests/laminas-runner/composer.json index 91bf5fe..c7fca33 100644 --- a/tests/laminas-runner/composer.json +++ b/tests/laminas-runner/composer.json @@ -1,7 +1,7 @@ { "require": { "slm/queue-doctrine": "*", - "doctrine/doctrine-orm-module": "^4.1 || ^5.0" + "doctrine/doctrine-orm-module": "^4.1 || ^5.0 || ^6.0" }, "replace": { "laminas/laminas-cache-storage-adapter-apc": "*", @@ -14,6 +14,11 @@ "laminas/laminas-cache-storage-adapter-zend-server": "*" }, "repositories": [ + { + "type": "git", + "url": "https://github.com/eivydas/SlmQueue", + "canonical": true + }, { "type": "path", "url": "../.." diff --git a/tests/mezzio-runner/composer.json b/tests/mezzio-runner/composer.json index ea77043..684f598 100644 --- a/tests/mezzio-runner/composer.json +++ b/tests/mezzio-runner/composer.json @@ -4,7 +4,7 @@ "mezzio/mezzio": "^3.2.1", "laminas/laminas-diactoros": "^2.3.0", "laminas/laminas-config-aggregator": "^1.2", - "doctrine/doctrine-orm-module": "^4.1 || ^5.0" + "doctrine/doctrine-orm-module": "^4.1 || ^5.0 || ^6.0" }, "replace": { "laminas/laminas-cache-storage-adapter-apc": "*", @@ -17,6 +17,11 @@ "laminas/laminas-cache-storage-adapter-zend-server": "*" }, "repositories": [ + { + "type": "git", + "url": "https://github.com/eivydas/SlmQueue", + "canonical": true + }, { "type": "path", "url": "../.." From 1fc5eecdff65984b4dd61d8f9842262cb83bbf2a Mon Sep 17 00:00:00 2001 From: eivydas Date: Fri, 5 Apr 2024 12:58:45 +0300 Subject: [PATCH 2/2] Allow PHP 8.3 --- composer.json | 13 +++---------- tests/laminas-runner/composer.json | 5 ----- tests/mezzio-runner/composer.json | 5 ----- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index daa7e7a..eb3a32b 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "laminas/laminas-eventmanager": "^3.4", "laminas/laminas-router": "^3.5", - "slm/queue": "dev-feature/php8.3", + "slm/queue": "^3.1", "doctrine/dbal": "^3.1.2", "doctrine/annotations": "^1.8", "laminas/laminas-config": "^3.7" @@ -47,15 +47,8 @@ "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.6.2" }, - "repositories": [ - { - "type": "git", - "url": "https://github.com/eivydas/SlmQueue", - "canonical": true - } - ], "conflict": { - "doctrine/cache": ">2.0" + "doctrine/cache": ">=2.0" }, "suggest": { "doctrine/doctrine-orm-module": "If you use Doctrine in combination with Laminas", @@ -63,7 +56,7 @@ }, "extra": { "branch-alias": { - "dev-feature/php8.3": "3.1.x-dev" + "dev-master": "3.1.x-dev" }, "laminas": { "module": "SlmQueueDoctrine\\Module", diff --git a/tests/laminas-runner/composer.json b/tests/laminas-runner/composer.json index c7fca33..89dc4b6 100644 --- a/tests/laminas-runner/composer.json +++ b/tests/laminas-runner/composer.json @@ -14,11 +14,6 @@ "laminas/laminas-cache-storage-adapter-zend-server": "*" }, "repositories": [ - { - "type": "git", - "url": "https://github.com/eivydas/SlmQueue", - "canonical": true - }, { "type": "path", "url": "../.." diff --git a/tests/mezzio-runner/composer.json b/tests/mezzio-runner/composer.json index 684f598..788e567 100644 --- a/tests/mezzio-runner/composer.json +++ b/tests/mezzio-runner/composer.json @@ -17,11 +17,6 @@ "laminas/laminas-cache-storage-adapter-zend-server": "*" }, "repositories": [ - { - "type": "git", - "url": "https://github.com/eivydas/SlmQueue", - "canonical": true - }, { "type": "path", "url": "../.."