From d46796f55a0d8d697fe3107655a109c68a3e4acf Mon Sep 17 00:00:00 2001 From: dbogovoy Date: Mon, 4 Dec 2023 19:42:27 +0000 Subject: [PATCH 1/5] Update min symfony version to ^7.0.0 --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 73120fc..417ba8c 100644 --- a/composer.json +++ b/composer.json @@ -15,21 +15,21 @@ } ], "require": { - "php": "^8.1.0", + "php": "^8.2.0", "nyholm/psr7": "^1.8.1", "openai-php/client": "^0.8.0", "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", - "symfony/config": "^5.4.21|^6.3.8", - "symfony/dependency-injection": "^5.4.21|^6.3.8", - "symfony/http-client": "^5.4.21|^6.3.8", - "symfony/http-kernel": "^5.4.21|^6.3.8" + "symfony/config": "^7.0.0", + "symfony/dependency-injection": "^7.0.0", + "symfony/http-client": "^7.0.0", + "symfony/http-kernel": "^7.0.0" }, "require-dev": { "laravel/pint": "^1.13.6", "phpstan/phpstan": "^1.10.44", "rector/rector": "^0.14.8", - "symfony/phpunit-bridge": "^6.3.8" + "symfony/phpunit-bridge": "^7.0.0" }, "autoload": { "psr-4": { From ffd4ce93f72bdaa9f313f949e06503dd0ec82a38 Mon Sep 17 00:00:00 2001 From: dbogovoy Date: Mon, 4 Dec 2023 19:59:29 +0000 Subject: [PATCH 2/5] Update workflow for testing. Add symfony 6.4.* --- .github/workflows/tests.yml | 4 ++-- composer.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bdc3757..6628d01 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,8 +9,8 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.1, 8.2] - symfony: [5.4.*, 6.2.*] + php: [8.2] + symfony: [^6.4.*, 7.0.*] dependency-version: [prefer-lowest, prefer-stable] name: Tests P${{ matrix.php }} - SF${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency-version }} diff --git a/composer.json b/composer.json index 417ba8c..5534f1f 100644 --- a/composer.json +++ b/composer.json @@ -20,16 +20,16 @@ "openai-php/client": "^0.8.0", "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", - "symfony/config": "^7.0.0", - "symfony/dependency-injection": "^7.0.0", - "symfony/http-client": "^7.0.0", - "symfony/http-kernel": "^7.0.0" + "symfony/config": "^6.4.0|^7.0.0", + "symfony/dependency-injection": "^6.4.0|^7.0.0", + "symfony/http-client": "^6.4.0|^7.0.0", + "symfony/http-kernel": "^6.4.0|^7.0.0" }, "require-dev": { "laravel/pint": "^1.13.6", "phpstan/phpstan": "^1.10.44", "rector/rector": "^0.14.8", - "symfony/phpunit-bridge": "^7.0.0" + "symfony/phpunit-bridge": "^6.4.0|^7.0.0" }, "autoload": { "psr-4": { From a7bddbe60a2f444c891ce5510cbc71c3a70d4dce Mon Sep 17 00:00:00 2001 From: dbogovoy Date: Mon, 4 Dec 2023 20:03:49 +0000 Subject: [PATCH 3/5] Rollback minimum symfony versions --- .github/workflows/tests.yml | 2 +- composer.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6628d01..b20faa0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: matrix: os: [ubuntu-latest] php: [8.2] - symfony: [^6.4.*, 7.0.*] + symfony: [5.4.*, 6.3.*, 7.0.*] dependency-version: [prefer-lowest, prefer-stable] name: Tests P${{ matrix.php }} - SF${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency-version }} diff --git a/composer.json b/composer.json index 5534f1f..8d32ecc 100644 --- a/composer.json +++ b/composer.json @@ -20,16 +20,16 @@ "openai-php/client": "^0.8.0", "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", - "symfony/config": "^6.4.0|^7.0.0", - "symfony/dependency-injection": "^6.4.0|^7.0.0", - "symfony/http-client": "^6.4.0|^7.0.0", - "symfony/http-kernel": "^6.4.0|^7.0.0" + "symfony/config": "^5.4|^6.3|^7.0", + "symfony/dependency-injection": "^5.4|^6.3|^7.0", + "symfony/http-client": "^5.4|^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.3|^7.0" }, "require-dev": { "laravel/pint": "^1.13.6", "phpstan/phpstan": "^1.10.44", "rector/rector": "^0.14.8", - "symfony/phpunit-bridge": "^6.4.0|^7.0.0" + "symfony/phpunit-bridge": "^5.4|^6.3|^7.0" }, "autoload": { "psr-4": { From 3423a6b89f07e33f601da0274c3157fead9bfd7f Mon Sep 17 00:00:00 2001 From: dbogovoy Date: Mon, 4 Dec 2023 20:42:47 +0000 Subject: [PATCH 4/5] Update php versioning --- .github/workflows/tests.yml | 14 ++++++++++++-- composer.json | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b20faa0..40a99c4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,9 +9,19 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.2] - symfony: [5.4.*, 6.3.*, 7.0.*] + php: [8.1, 8.2] + symfony: [5.4.*, 6.3.*, 6.4.*, 7.0.*] dependency-version: [prefer-lowest, prefer-stable] + include: + - php: "8.1" + symfony: "^5.4" + - php: "8.1" + symfony: "^6.3" + - php: "8.1" + symfony: "^6.4" + exclude: + - php: "8.1" + symfony: "^7.0" name: Tests P${{ matrix.php }} - SF${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency-version }} steps: diff --git a/composer.json b/composer.json index 8d32ecc..dfc7ced 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^8.2.0", + "php": "^8.1.0", "nyholm/psr7": "^1.8.1", "openai-php/client": "^0.8.0", "psr/http-client": "^1.0.3", From e3c9145e116d957cc3c0ea29da75dc838da94ecf Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 5 Dec 2023 09:38:01 +0000 Subject: [PATCH 5/5] chore: bumps dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index dfc7ced..888715c 100644 --- a/composer.json +++ b/composer.json @@ -21,15 +21,15 @@ "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", "symfony/config": "^5.4|^6.3|^7.0", - "symfony/dependency-injection": "^5.4|^6.3|^7.0", + "symfony/dependency-injection": "^5.4|^6.3|^7.0.1", "symfony/http-client": "^5.4|^6.3|^7.0", - "symfony/http-kernel": "^5.4|^6.3|^7.0" + "symfony/http-kernel": "^5.4|^6.3|^7.0.1" }, "require-dev": { "laravel/pint": "^1.13.6", - "phpstan/phpstan": "^1.10.44", + "phpstan/phpstan": "^1.10.47", "rector/rector": "^0.14.8", - "symfony/phpunit-bridge": "^5.4|^6.3|^7.0" + "symfony/phpunit-bridge": "^5.4|^6.3|^7.0.1" }, "autoload": { "psr-4": {