From 50162f234ff85400e55357b42a1179a9a65c260d Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Wed, 15 Feb 2023 15:43:19 +0000 Subject: [PATCH 01/11] Update tests --- .github/workflows/tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 44f97e1..f6621c0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,10 +10,12 @@ jobs: strategy: fail-fast: false matrix: - php: [8.1, '8.0'] - laravel: [9.*, 8.*] + php: [8.2, 8.1] + laravel: [10.*, 9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: + - laravel: 10.* + testbench: 8.* - laravel: 9.* testbench: 7.* - laravel: 8.* From 3ba0fbfabc392e45e6ce6cb61de3ff7c1509708a Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Wed, 15 Feb 2023 15:44:29 +0000 Subject: [PATCH 02/11] Update composer for Laravel 10 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 59ea049..0ccf95f 100644 --- a/composer.json +++ b/composer.json @@ -13,13 +13,13 @@ "require": { "akaunting/laravel-money": "^1.2|^2.1", "ext-pdo_sqlite": "*", - "illuminate/contracts": "^8.0|^9.0", - "illuminate/database": "^8.40|^9.0", - "illuminate/support": "^8.0|^9.0", - "php": "^8.0" + "illuminate/contracts": "^8.0|^9.0|^10.0", + "illuminate/database": "^8.40|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0", + "php": "^8.1" }, "require-dev": { - "orchestra/testbench": "^6.23|^7.0", + "orchestra/testbench": "^6.23|^7.0|^8.0", "phpunit/phpunit": "^9.4", "symplify/monorepo-builder": "^9.4.21" }, From 48d907416cc7e3fe8997693aa29b49c08f603c07 Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Wed, 15 Feb 2023 15:46:31 +0000 Subject: [PATCH 03/11] PHP versions --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f6621c0..dea77d9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.2, 8.1] + php: [8.2, 8.1, 8.0] laravel: [10.*, 9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: From 65388d466d54db1df4b10b3345d20d413f237ca8 Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Wed, 15 Feb 2023 15:47:49 +0000 Subject: [PATCH 04/11] PHP 8.0 not supported by Laravel 10 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dea77d9..f6621c0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.2, 8.1, 8.0] + php: [8.2, 8.1] laravel: [10.*, 9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: From c2c7aff6c6fb5dbac36c0566c9b5648a9838eb78 Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Wed, 15 Feb 2023 15:49:32 +0000 Subject: [PATCH 05/11] Update monorepo-validate github action --- .github/workflows/monorepo-validate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/monorepo-validate.yml b/.github/workflows/monorepo-validate.yml index ca0852d..3c1b5ee 100644 --- a/.github/workflows/monorepo-validate.yml +++ b/.github/workflows/monorepo-validate.yml @@ -17,10 +17,10 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 extensions: mbstring, pdo, pdo_sqlite coverage: none - name: Install dependencies run: composer install -n --prefer-dist - - name: Valdidate Dependencies are consistent + - name: Validate Dependencies are consistent run: vendor/bin/monorepo-builder validate \ No newline at end of file From ac4f6b532b4aad1166c9366fa46d39062727cbdc Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Wed, 15 Feb 2023 15:55:17 +0000 Subject: [PATCH 06/11] Update package composer.json files --- monorepo-builder.php | 2 +- packages/airlines-en/composer.json | 4 ++-- packages/airlines/composer.json | 4 ++-- packages/airports-en/composer.json | 4 ++-- packages/airports/composer.json | 4 ++-- packages/continents-de/composer.json | 4 ++-- packages/continents-en/composer.json | 4 ++-- packages/continents-pl/composer.json | 4 ++-- packages/continents/composer.json | 4 ++-- packages/countries-de/composer.json | 4 ++-- packages/countries-en/composer.json | 4 ++-- packages/countries-es/composer.json | 4 ++-- packages/countries-fr/composer.json | 4 ++-- packages/countries-pl/composer.json | 4 ++-- packages/countries/composer.json | 4 ++-- packages/currencies-en/composer.json | 4 ++-- packages/currencies/composer.json | 4 ++-- packages/gb-counties-en/composer.json | 4 ++-- packages/gb-counties/composer.json | 4 ++-- packages/model/composer.json | 6 +++--- packages/regions-en/composer.json | 4 ++-- packages/regions/composer.json | 4 ++-- packages/repository/composer.json | 4 ++-- packages/rule/composer.json | 8 ++++---- packages/timezones-en/composer.json | 4 ++-- packages/timezones/composer.json | 4 ++-- 26 files changed, 54 insertions(+), 54 deletions(-) diff --git a/monorepo-builder.php b/monorepo-builder.php index 62bd637..16b8f09 100644 --- a/monorepo-builder.php +++ b/monorepo-builder.php @@ -20,7 +20,7 @@ ], ], 'require-dev' => [ - 'orchestra/testbench' => '^6.23|^7.0', + 'orchestra/testbench' => '^6.23|^7.0|^8.0', 'phpunit/phpunit' => '^9.4', 'symplify/monorepo-builder' => '^9.4.21', ], diff --git a/packages/airlines-en/composer.json b/packages/airlines-en/composer.json index 913644f..c7225d7 100644 --- a/packages/airlines-en/composer.json +++ b/packages/airlines-en/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/airlines": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/airlines/composer.json b/packages/airlines/composer.json index 6144587..7f628d8 100644 --- a/packages/airlines/composer.json +++ b/packages/airlines/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/airports-en/composer.json b/packages/airports-en/composer.json index a6928b1..d60e579 100644 --- a/packages/airports-en/composer.json +++ b/packages/airports-en/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/airports": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/airports/composer.json b/packages/airports/composer.json index 2454a9e..fe9af29 100644 --- a/packages/airports/composer.json +++ b/packages/airports/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/continents-de/composer.json b/packages/continents-de/composer.json index 53814b3..c6c7ec9 100644 --- a/packages/continents-de/composer.json +++ b/packages/continents-de/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/continents-en/composer.json b/packages/continents-en/composer.json index a1be53c..fb1bc91 100644 --- a/packages/continents-en/composer.json +++ b/packages/continents-en/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/continents-pl/composer.json b/packages/continents-pl/composer.json index e6d5015..4a331e1 100644 --- a/packages/continents-pl/composer.json +++ b/packages/continents-pl/composer.json @@ -21,8 +21,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/continents/composer.json b/packages/continents/composer.json index 40190f7..03a7384 100644 --- a/packages/continents/composer.json +++ b/packages/continents/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/countries-de/composer.json b/packages/countries-de/composer.json index 22bfc78..c511885 100644 --- a/packages/countries-de/composer.json +++ b/packages/countries-de/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries-en/composer.json b/packages/countries-en/composer.json index 48d8bde..830e209 100644 --- a/packages/countries-en/composer.json +++ b/packages/countries-en/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries-es/composer.json b/packages/countries-es/composer.json index 9abc31c..5c235ca 100644 --- a/packages/countries-es/composer.json +++ b/packages/countries-es/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries-fr/composer.json b/packages/countries-fr/composer.json index e23acf3..1e58de0 100644 --- a/packages/countries-fr/composer.json +++ b/packages/countries-fr/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries-pl/composer.json b/packages/countries-pl/composer.json index 72fc644..7bd2912 100644 --- a/packages/countries-pl/composer.json +++ b/packages/countries-pl/composer.json @@ -21,8 +21,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries/composer.json b/packages/countries/composer.json index aefc295..4c1a044 100644 --- a/packages/countries/composer.json +++ b/packages/countries/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/currencies-en/composer.json b/packages/currencies-en/composer.json index 14ecb99..4c9672c 100644 --- a/packages/currencies-en/composer.json +++ b/packages/currencies-en/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/currencies": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/currencies/composer.json b/packages/currencies/composer.json index c7de6c1..ea6250e 100644 --- a/packages/currencies/composer.json +++ b/packages/currencies/composer.json @@ -17,9 +17,9 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "akaunting/laravel-money": "^1.2|^2.1", - "illuminate/support": "^8.0|^9.0", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/gb-counties-en/composer.json b/packages/gb-counties-en/composer.json index c22a1c4..419b79c 100644 --- a/packages/gb-counties-en/composer.json +++ b/packages/gb-counties-en/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/gb-counties": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/gb-counties/composer.json b/packages/gb-counties/composer.json index bd3fb0a..750a5d4 100644 --- a/packages/gb-counties/composer.json +++ b/packages/gb-counties/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/model/composer.json b/packages/model/composer.json index 3c7cec0..83f58f8 100644 --- a/packages/model/composer.json +++ b/packages/model/composer.json @@ -17,10 +17,10 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "ext-pdo_sqlite": "*", - "illuminate/database": "^8.40|^9.0", - "illuminate/support": "^8.0|^9.0" + "illuminate/database": "^8.40|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0" }, "autoload": { "psr-4": { diff --git a/packages/regions-en/composer.json b/packages/regions-en/composer.json index ad7376d..9514c25 100644 --- a/packages/regions-en/composer.json +++ b/packages/regions-en/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/regions": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/regions/composer.json b/packages/regions/composer.json index 0988d82..04756a9 100644 --- a/packages/regions/composer.json +++ b/packages/regions/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/repository/composer.json b/packages/repository/composer.json index 61432c5..5555ccb 100644 --- a/packages/repository/composer.json +++ b/packages/repository/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0" + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0" }, "autoload": { "psr-4": { diff --git a/packages/rule/composer.json b/packages/rule/composer.json index 06abe31..6c17be4 100644 --- a/packages/rule/composer.json +++ b/packages/rule/composer.json @@ -17,10 +17,10 @@ } ], "require": { - "php": "^8.0", - "illuminate/contracts": "^8.0|^9.0", - "illuminate/database": "^8.40|^9.0", - "illuminate/support": "^8.0|^9.0" + "php": "^8.1", + "illuminate/contracts": "^8.0|^9.0|^10.0", + "illuminate/database": "^8.40|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0" }, "autoload": { "psr-4": { diff --git a/packages/timezones-en/composer.json b/packages/timezones-en/composer.json index 52bd32b..0f009cc 100644 --- a/packages/timezones-en/composer.json +++ b/packages/timezones-en/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/repository": "self.version", "squirephp/timezones": "self.version" }, diff --git a/packages/timezones/composer.json b/packages/timezones/composer.json index 23c4f9d..262a76e 100644 --- a/packages/timezones/composer.json +++ b/packages/timezones/composer.json @@ -17,8 +17,8 @@ } ], "require": { - "php": "^8.0", - "illuminate/support": "^8.0|^9.0", + "php": "^8.1", + "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, From 5b70592a4bd2fceef75ce34ad752b56805296c64 Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Fri, 17 Feb 2023 11:49:35 +0000 Subject: [PATCH 07/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0ccf95f..c9eccc3 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "illuminate/contracts": "^8.0|^9.0|^10.0", "illuminate/database": "^8.40|^9.0|^10.0", "illuminate/support": "^8.0|^9.0|^10.0", - "php": "^8.1" + "php": "^8.0" }, "require-dev": { "orchestra/testbench": "^6.23|^7.0|^8.0", From e1e13fd6a13171f083d8807b4f5cb6669a26e2dc Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Fri, 17 Feb 2023 11:54:03 +0000 Subject: [PATCH 08/11] Allow PHP 8.0 in packages too --- packages/airlines-en/composer.json | 2 +- packages/airlines/composer.json | 2 +- packages/airports-en/composer.json | 2 +- packages/airports/composer.json | 2 +- packages/continents-de/composer.json | 2 +- packages/continents-en/composer.json | 2 +- packages/continents-pl/composer.json | 2 +- packages/continents/composer.json | 2 +- packages/countries-de/composer.json | 2 +- packages/countries-en/composer.json | 2 +- packages/countries-es/composer.json | 2 +- packages/countries-fr/composer.json | 2 +- packages/countries-pl/composer.json | 2 +- packages/countries/composer.json | 2 +- packages/currencies-en/composer.json | 2 +- packages/currencies/composer.json | 2 +- packages/gb-counties-en/composer.json | 2 +- packages/gb-counties/composer.json | 2 +- packages/model/composer.json | 2 +- packages/regions-en/composer.json | 2 +- packages/regions/composer.json | 2 +- packages/repository/composer.json | 2 +- packages/rule/composer.json | 2 +- packages/timezones-en/composer.json | 2 +- packages/timezones/composer.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/airlines-en/composer.json b/packages/airlines-en/composer.json index c7225d7..a239393 100644 --- a/packages/airlines-en/composer.json +++ b/packages/airlines-en/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/airlines": "self.version", "squirephp/repository": "self.version" diff --git a/packages/airlines/composer.json b/packages/airlines/composer.json index 7f628d8..c818e0b 100644 --- a/packages/airlines/composer.json +++ b/packages/airlines/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" diff --git a/packages/airports-en/composer.json b/packages/airports-en/composer.json index d60e579..7b1c1fb 100644 --- a/packages/airports-en/composer.json +++ b/packages/airports-en/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/airports": "self.version", "squirephp/repository": "self.version" diff --git a/packages/airports/composer.json b/packages/airports/composer.json index fe9af29..56569d9 100644 --- a/packages/airports/composer.json +++ b/packages/airports/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" diff --git a/packages/continents-de/composer.json b/packages/continents-de/composer.json index c6c7ec9..e4a68c1 100644 --- a/packages/continents-de/composer.json +++ b/packages/continents-de/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" diff --git a/packages/continents-en/composer.json b/packages/continents-en/composer.json index fb1bc91..f53f480 100644 --- a/packages/continents-en/composer.json +++ b/packages/continents-en/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" diff --git a/packages/continents-pl/composer.json b/packages/continents-pl/composer.json index 4a331e1..42f5079 100644 --- a/packages/continents-pl/composer.json +++ b/packages/continents-pl/composer.json @@ -21,7 +21,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" diff --git a/packages/continents/composer.json b/packages/continents/composer.json index 03a7384..e962c2e 100644 --- a/packages/continents/composer.json +++ b/packages/continents/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" diff --git a/packages/countries-de/composer.json b/packages/countries-de/composer.json index c511885..795fe33 100644 --- a/packages/countries-de/composer.json +++ b/packages/countries-de/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" diff --git a/packages/countries-en/composer.json b/packages/countries-en/composer.json index 830e209..d207a68 100644 --- a/packages/countries-en/composer.json +++ b/packages/countries-en/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" diff --git a/packages/countries-es/composer.json b/packages/countries-es/composer.json index 5c235ca..a4c837d 100644 --- a/packages/countries-es/composer.json +++ b/packages/countries-es/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" diff --git a/packages/countries-fr/composer.json b/packages/countries-fr/composer.json index 1e58de0..79d8603 100644 --- a/packages/countries-fr/composer.json +++ b/packages/countries-fr/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" diff --git a/packages/countries-pl/composer.json b/packages/countries-pl/composer.json index 7bd2912..df8ef49 100644 --- a/packages/countries-pl/composer.json +++ b/packages/countries-pl/composer.json @@ -21,7 +21,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" diff --git a/packages/countries/composer.json b/packages/countries/composer.json index 4c1a044..6ad6b5f 100644 --- a/packages/countries/composer.json +++ b/packages/countries/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" diff --git a/packages/currencies-en/composer.json b/packages/currencies-en/composer.json index 4c9672c..9b75f9d 100644 --- a/packages/currencies-en/composer.json +++ b/packages/currencies-en/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/currencies": "self.version", "squirephp/repository": "self.version" diff --git a/packages/currencies/composer.json b/packages/currencies/composer.json index ea6250e..6aac374 100644 --- a/packages/currencies/composer.json +++ b/packages/currencies/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "akaunting/laravel-money": "^1.2|^2.1", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", diff --git a/packages/gb-counties-en/composer.json b/packages/gb-counties-en/composer.json index 419b79c..7a397c0 100644 --- a/packages/gb-counties-en/composer.json +++ b/packages/gb-counties-en/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/gb-counties": "self.version", "squirephp/repository": "self.version" diff --git a/packages/gb-counties/composer.json b/packages/gb-counties/composer.json index 750a5d4..805a473 100644 --- a/packages/gb-counties/composer.json +++ b/packages/gb-counties/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" diff --git a/packages/model/composer.json b/packages/model/composer.json index 83f58f8..499fd25 100644 --- a/packages/model/composer.json +++ b/packages/model/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "ext-pdo_sqlite": "*", "illuminate/database": "^8.40|^9.0|^10.0", "illuminate/support": "^8.0|^9.0|^10.0" diff --git a/packages/regions-en/composer.json b/packages/regions-en/composer.json index 9514c25..b922e91 100644 --- a/packages/regions-en/composer.json +++ b/packages/regions-en/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/regions": "self.version", "squirephp/repository": "self.version" diff --git a/packages/regions/composer.json b/packages/regions/composer.json index 04756a9..15b0e22 100644 --- a/packages/regions/composer.json +++ b/packages/regions/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" diff --git a/packages/repository/composer.json b/packages/repository/composer.json index 5555ccb..61c611b 100644 --- a/packages/repository/composer.json +++ b/packages/repository/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0" }, "autoload": { diff --git a/packages/rule/composer.json b/packages/rule/composer.json index 6c17be4..5c1a480 100644 --- a/packages/rule/composer.json +++ b/packages/rule/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/contracts": "^8.0|^9.0|^10.0", "illuminate/database": "^8.40|^9.0|^10.0", "illuminate/support": "^8.0|^9.0|^10.0" diff --git a/packages/timezones-en/composer.json b/packages/timezones-en/composer.json index 0f009cc..5808b49 100644 --- a/packages/timezones-en/composer.json +++ b/packages/timezones-en/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/repository": "self.version", "squirephp/timezones": "self.version" diff --git a/packages/timezones/composer.json b/packages/timezones/composer.json index 262a76e..c70647e 100644 --- a/packages/timezones/composer.json +++ b/packages/timezones/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.0", "illuminate/support": "^8.0|^9.0|^10.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" From 378433a00de3fffa3e83a23520565bd6f37bc3f7 Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Fri, 17 Feb 2023 11:58:14 +0000 Subject: [PATCH 09/11] Add PHP 8 in the test matrix --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f6621c0..dea77d9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.2, 8.1] + php: [8.2, 8.1, 8.0] laravel: [10.*, 9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: From 00e201c861af66d6684ef36ac60a42d0d38851d8 Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Fri, 17 Feb 2023 12:00:23 +0000 Subject: [PATCH 10/11] Try and exclude Laravel 10 and PHP 8 test case --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dea77d9..ff8dc99 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,6 +20,9 @@ jobs: testbench: 7.* - laravel: 8.* testbench: ^6.23 + exclude: + - laravel: 10.* + - php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} steps: - uses: actions/checkout@v2 From 1b8b6a154aff30f696049ffca535486f74e88e78 Mon Sep 17 00:00:00 2001 From: Philip Manavopoulos Date: Fri, 17 Feb 2023 12:01:31 +0000 Subject: [PATCH 11/11] Fix exclusion case --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ff8dc99..16af317 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: testbench: ^6.23 exclude: - laravel: 10.* - - php: 8.0 + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} steps: - uses: actions/checkout@v2