From f86a9a6f32dea17cc7421dad383064d45c0a194a Mon Sep 17 00:00:00 2001 From: Maxim Smakouz Date: Mon, 20 May 2024 12:52:30 +0300 Subject: [PATCH 1/6] Add support for RoadRunner 2024 --- composer.json | 4 +++- src/roadrunner-nyholm/composer.json | 4 +++- src/roadrunner-symfony-nyholm/composer.json | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index cdaea9b..a00e1cb 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,9 @@ "nyholm/psr7": "^1.3", "nyholm/psr7-server": "^1.0", "react/http": "^1.2", - "spiral/roadrunner": "^2.0", + "spiral/roadrunner": "^2.0 || ^2023.3 || ^2024.1", + "spiral/roadrunner-cli": "^2.6", + "spiral/roadrunner-http": "^2.2 || ^3.5.1", "symfony/console": "^5.2 || ^6.0", "symfony/dependency-injection": "^5.2 || ^6.0", "symfony/http-foundation": "^5.3 || ^6.0", diff --git a/src/roadrunner-nyholm/composer.json b/src/roadrunner-nyholm/composer.json index 9fee0ac..7899023 100644 --- a/src/roadrunner-nyholm/composer.json +++ b/src/roadrunner-nyholm/composer.json @@ -11,7 +11,9 @@ ], "require": { "nyholm/psr7": "^1.4", - "spiral/roadrunner": "^2.0", + "spiral/roadrunner": "^2.0 || ^2023.3 || ^2024.1", + "spiral/roadrunner-cli": "^2.6", + "spiral/roadrunner-http": "^2.2 || ^3.5.1", "symfony/runtime": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { diff --git a/src/roadrunner-symfony-nyholm/composer.json b/src/roadrunner-symfony-nyholm/composer.json index aa12b1b..2682694 100644 --- a/src/roadrunner-symfony-nyholm/composer.json +++ b/src/roadrunner-symfony-nyholm/composer.json @@ -12,14 +12,17 @@ "require": { "php": ">=8.0.5", "nyholm/psr7": "^1.4", - "spiral/roadrunner": "^2.0", + "spiral/roadrunner": "^2.0 || ^2023.3 || ^2024.1", + "spiral/roadrunner-cli": "^2.6", + "spiral/roadrunner-http": "^2.2 || ^3.5.1", "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", "symfony/psr-http-message-bridge": "^2.1 || ^6.4 || ^7.0", "symfony/runtime": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^9.5", + "symfony/console": "^6.4 || ^7.0" }, "minimum-stability": "dev", "prefer-stable": true, From c2afca9d652bb386b896b101b7fda45c9bd0b00c Mon Sep 17 00:00:00 2001 From: Maxim Smakouz Date: Mon, 20 May 2024 13:26:07 +0300 Subject: [PATCH 2/6] Add php-version option to Psalm --- .github/workflows/static.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 148098f..d43f5ae 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -88,7 +88,7 @@ jobs: composer-options: "--ignore-platform-reqs" # required for PHP 8.2 as not yet official supported - name: Psalm - run: psalm --no-progress --output-format=github + run: psalm --php-version=8.2 --no-progress --output-format=github composer-normalize: name: Composer Normalize From a0d0a5e3e5e51e116c4264b30e7921e96dc2587c Mon Sep 17 00:00:00 2001 From: Maxim Smakouz Date: Tue, 18 Jun 2024 16:29:09 +0300 Subject: [PATCH 3/6] Remove spiral/roadrunner dependency --- composer.json | 1 - src/roadrunner-nyholm/composer.json | 1 - src/roadrunner-symfony-nyholm/composer.json | 1 - 3 files changed, 3 deletions(-) diff --git a/composer.json b/composer.json index a00e1cb..19b4c9f 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "nyholm/psr7": "^1.3", "nyholm/psr7-server": "^1.0", "react/http": "^1.2", - "spiral/roadrunner": "^2.0 || ^2023.3 || ^2024.1", "spiral/roadrunner-cli": "^2.6", "spiral/roadrunner-http": "^2.2 || ^3.5.1", "symfony/console": "^5.2 || ^6.0", diff --git a/src/roadrunner-nyholm/composer.json b/src/roadrunner-nyholm/composer.json index 7899023..524891f 100644 --- a/src/roadrunner-nyholm/composer.json +++ b/src/roadrunner-nyholm/composer.json @@ -11,7 +11,6 @@ ], "require": { "nyholm/psr7": "^1.4", - "spiral/roadrunner": "^2.0 || ^2023.3 || ^2024.1", "spiral/roadrunner-cli": "^2.6", "spiral/roadrunner-http": "^2.2 || ^3.5.1", "symfony/runtime": "^5.4 || ^6.0 || ^7.0" diff --git a/src/roadrunner-symfony-nyholm/composer.json b/src/roadrunner-symfony-nyholm/composer.json index 2682694..51f96f6 100644 --- a/src/roadrunner-symfony-nyholm/composer.json +++ b/src/roadrunner-symfony-nyholm/composer.json @@ -12,7 +12,6 @@ "require": { "php": ">=8.0.5", "nyholm/psr7": "^1.4", - "spiral/roadrunner": "^2.0 || ^2023.3 || ^2024.1", "spiral/roadrunner-cli": "^2.6", "spiral/roadrunner-http": "^2.2 || ^3.5.1", "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", From 67da953c9420b19718a54f7a176d83115d1a093b Mon Sep 17 00:00:00 2001 From: Maxim Smakouz Date: Tue, 18 Jun 2024 19:17:33 +0300 Subject: [PATCH 4/6] Add symfony/console 5.4 --- src/roadrunner-symfony-nyholm/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/roadrunner-symfony-nyholm/composer.json b/src/roadrunner-symfony-nyholm/composer.json index 51f96f6..7a81de1 100644 --- a/src/roadrunner-symfony-nyholm/composer.json +++ b/src/roadrunner-symfony-nyholm/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "phpunit/phpunit": "^9.5", - "symfony/console": "^6.4 || ^7.0" + "symfony/console": "^5.4 || ^6.4 || ^7.0" }, "minimum-stability": "dev", "prefer-stable": true, From 48985172520986857a67a3b1aec3575fe71fcea3 Mon Sep 17 00:00:00 2001 From: Maxim Smakouz Date: Tue, 18 Jun 2024 19:58:52 +0300 Subject: [PATCH 5/6] Change spiral/roadrunner-http versions --- composer.json | 2 +- src/roadrunner-nyholm/composer.json | 2 +- src/roadrunner-symfony-nyholm/composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 19b4c9f..a02c7f9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "nyholm/psr7-server": "^1.0", "react/http": "^1.2", "spiral/roadrunner-cli": "^2.6", - "spiral/roadrunner-http": "^2.2 || ^3.5.1", + "spiral/roadrunner-http": "^2.0 || ^3.0", "symfony/console": "^5.2 || ^6.0", "symfony/dependency-injection": "^5.2 || ^6.0", "symfony/http-foundation": "^5.3 || ^6.0", diff --git a/src/roadrunner-nyholm/composer.json b/src/roadrunner-nyholm/composer.json index 524891f..365b6f6 100644 --- a/src/roadrunner-nyholm/composer.json +++ b/src/roadrunner-nyholm/composer.json @@ -12,7 +12,7 @@ "require": { "nyholm/psr7": "^1.4", "spiral/roadrunner-cli": "^2.6", - "spiral/roadrunner-http": "^2.2 || ^3.5.1", + "spiral/roadrunner-http": "^2.0 || ^3.0", "symfony/runtime": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { diff --git a/src/roadrunner-symfony-nyholm/composer.json b/src/roadrunner-symfony-nyholm/composer.json index 7a81de1..79297b0 100644 --- a/src/roadrunner-symfony-nyholm/composer.json +++ b/src/roadrunner-symfony-nyholm/composer.json @@ -13,7 +13,7 @@ "php": ">=8.0.5", "nyholm/psr7": "^1.4", "spiral/roadrunner-cli": "^2.6", - "spiral/roadrunner-http": "^2.2 || ^3.5.1", + "spiral/roadrunner-http": "^2.0 || ^3.0", "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", "symfony/psr-http-message-bridge": "^2.1 || ^6.4 || ^7.0", From 17ee7528a273184459e62363dffb3d116119f765 Mon Sep 17 00:00:00 2001 From: Maxim Smakouz Date: Tue, 18 Jun 2024 20:03:18 +0300 Subject: [PATCH 6/6] Add spiral/roadrunner-worker --- composer.json | 1 + src/roadrunner-nyholm/composer.json | 1 + src/roadrunner-symfony-nyholm/composer.json | 1 + 3 files changed, 3 insertions(+) diff --git a/composer.json b/composer.json index a02c7f9..db0e2ea 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,7 @@ "react/http": "^1.2", "spiral/roadrunner-cli": "^2.6", "spiral/roadrunner-http": "^2.0 || ^3.0", + "spiral/roadrunner-worker": "^2.0 || ^3.0", "symfony/console": "^5.2 || ^6.0", "symfony/dependency-injection": "^5.2 || ^6.0", "symfony/http-foundation": "^5.3 || ^6.0", diff --git a/src/roadrunner-nyholm/composer.json b/src/roadrunner-nyholm/composer.json index 365b6f6..e5b0392 100644 --- a/src/roadrunner-nyholm/composer.json +++ b/src/roadrunner-nyholm/composer.json @@ -13,6 +13,7 @@ "nyholm/psr7": "^1.4", "spiral/roadrunner-cli": "^2.6", "spiral/roadrunner-http": "^2.0 || ^3.0", + "spiral/roadrunner-worker": "^2.0 || ^3.0", "symfony/runtime": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { diff --git a/src/roadrunner-symfony-nyholm/composer.json b/src/roadrunner-symfony-nyholm/composer.json index 79297b0..8c95e35 100644 --- a/src/roadrunner-symfony-nyholm/composer.json +++ b/src/roadrunner-symfony-nyholm/composer.json @@ -14,6 +14,7 @@ "nyholm/psr7": "^1.4", "spiral/roadrunner-cli": "^2.6", "spiral/roadrunner-http": "^2.0 || ^3.0", + "spiral/roadrunner-worker": "^2.0 || ^3.0", "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", "symfony/psr-http-message-bridge": "^2.1 || ^6.4 || ^7.0",