From 6ffd1bdd9c51272be5cc05edb0b1a76cd733283e Mon Sep 17 00:00:00 2001 From: Orkhan Ahmadov Date: Tue, 5 Mar 2024 08:43:12 +0100 Subject: [PATCH 1/5] Update composer.json --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 820b221..7c44cf6 100644 --- a/composer.json +++ b/composer.json @@ -13,14 +13,14 @@ "require": { "akaunting/laravel-money": "^1.2|^2.1|^3.0|^4.0|^5.1", "ext-pdo_sqlite": "*", - "illuminate/contracts": "^8.0|^9.0|^10.0", - "illuminate/database": "^8.40|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0", + "illuminate/database": "^8.40|^9.0|^10.0|^11.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "php": "^8.0" }, "require-dev": { - "orchestra/testbench": "^6.23|^7.0|^8.0", - "phpunit/phpunit": "^9.4", + "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0", + "phpunit/phpunit": "^9.4|^10.0", "symplify/monorepo-builder": "^9.4.21" }, "autoload": { From f5985e87c0f224094279cee476ff37d77f7170e9 Mon Sep 17 00:00:00 2001 From: Orkhan Ahmadov Date: Tue, 5 Mar 2024 08:45:28 +0100 Subject: [PATCH 2/5] Update tests.yml --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 16af317..d115018 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,6 +14,8 @@ jobs: laravel: [10.*, 9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: + - laravel: 11.* + testbench: 9.* - laravel: 10.* testbench: 8.* - laravel: 9.* @@ -21,6 +23,10 @@ jobs: - laravel: 8.* testbench: ^6.23 exclude: + - laravel: 11.* + php: 8.1 + - laravel: 11.* + php: 8.0 - laravel: 10.* php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} From c7255652559f4dab68dbc282ed077472b55aa3ec Mon Sep 17 00:00:00 2001 From: Orkhan Ahmadov Date: Tue, 5 Mar 2024 15:22:08 +0100 Subject: [PATCH 3/5] Update tests.yml --- .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 d115018..f9f096e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: php: [8.2, 8.1, 8.0] - laravel: [10.*, 9.*, 8.*] + laravel: [11.*, 10.*, 9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 11.* From 778ef58888ca2620e95bcb29cd61368f0137b0d2 Mon Sep 17 00:00:00 2001 From: Orkhan Ahmadov Date: Mon, 11 Mar 2024 11:56:36 +0100 Subject: [PATCH 4/5] Update monorepo setup --- .github/workflows/tests.yml | 2 +- monorepo-builder.php | 4 ++-- 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 | 4 ++-- packages/regions-en/composer.json | 2 +- packages/regions/composer.json | 2 +- packages/repository/composer.json | 2 +- packages/rule/composer.json | 6 +++--- packages/timezones-en/composer.json | 2 +- packages/timezones/composer.json | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 16af317..edf035d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,4 +42,4 @@ jobs: composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest - name: Execute tests - run: vendor/bin/phpunit --verbose + run: vendor/bin/phpunit diff --git a/monorepo-builder.php b/monorepo-builder.php index 16b8f09..0b46e83 100644 --- a/monorepo-builder.php +++ b/monorepo-builder.php @@ -20,8 +20,8 @@ ], ], 'require-dev' => [ - 'orchestra/testbench' => '^6.23|^7.0|^8.0', - 'phpunit/phpunit' => '^9.4', + 'orchestra/testbench' => '^6.23|^7.0|^8.0|^9.0', + 'phpunit/phpunit' => '^9.4|^10.0', 'symplify/monorepo-builder' => '^9.4.21', ], 'minimum-stability' => 'dev', diff --git a/packages/airlines-en/composer.json b/packages/airlines-en/composer.json index a239393..eb9a54e 100644 --- a/packages/airlines-en/composer.json +++ b/packages/airlines-en/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/airlines": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/airlines/composer.json b/packages/airlines/composer.json index c818e0b..951096f 100644 --- a/packages/airlines/composer.json +++ b/packages/airlines/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/airports-en/composer.json b/packages/airports-en/composer.json index 7b1c1fb..7885827 100644 --- a/packages/airports-en/composer.json +++ b/packages/airports-en/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/airports": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/airports/composer.json b/packages/airports/composer.json index 56569d9..0682d70 100644 --- a/packages/airports/composer.json +++ b/packages/airports/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/continents-de/composer.json b/packages/continents-de/composer.json index e4a68c1..52f792f 100644 --- a/packages/continents-de/composer.json +++ b/packages/continents-de/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/continents-en/composer.json b/packages/continents-en/composer.json index f53f480..6af0266 100644 --- a/packages/continents-en/composer.json +++ b/packages/continents-en/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/continents-pl/composer.json b/packages/continents-pl/composer.json index 42f5079..f9daa60 100644 --- a/packages/continents-pl/composer.json +++ b/packages/continents-pl/composer.json @@ -22,7 +22,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/continents": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/continents/composer.json b/packages/continents/composer.json index e962c2e..598ab4e 100644 --- a/packages/continents/composer.json +++ b/packages/continents/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/countries-de/composer.json b/packages/countries-de/composer.json index 795fe33..a91a823 100644 --- a/packages/countries-de/composer.json +++ b/packages/countries-de/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries-en/composer.json b/packages/countries-en/composer.json index d207a68..ee0bea1 100644 --- a/packages/countries-en/composer.json +++ b/packages/countries-en/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries-es/composer.json b/packages/countries-es/composer.json index a4c837d..d212e93 100644 --- a/packages/countries-es/composer.json +++ b/packages/countries-es/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries-fr/composer.json b/packages/countries-fr/composer.json index 79d8603..cd3693b 100644 --- a/packages/countries-fr/composer.json +++ b/packages/countries-fr/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries-pl/composer.json b/packages/countries-pl/composer.json index df8ef49..13a563a 100644 --- a/packages/countries-pl/composer.json +++ b/packages/countries-pl/composer.json @@ -22,7 +22,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/countries": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/countries/composer.json b/packages/countries/composer.json index 6ad6b5f..402495b 100644 --- a/packages/countries/composer.json +++ b/packages/countries/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/currencies-en/composer.json b/packages/currencies-en/composer.json index 9b75f9d..7aaa27e 100644 --- a/packages/currencies-en/composer.json +++ b/packages/currencies-en/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/currencies": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/currencies/composer.json b/packages/currencies/composer.json index c158856..d0c02f8 100644 --- a/packages/currencies/composer.json +++ b/packages/currencies/composer.json @@ -19,7 +19,7 @@ "require": { "php": "^8.0", "akaunting/laravel-money": "^1.2|^2.1|^3.0|^4.0|^5.1", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.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 7a397c0..484d493 100644 --- a/packages/gb-counties-en/composer.json +++ b/packages/gb-counties-en/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.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 805a473..b39e33f 100644 --- a/packages/gb-counties/composer.json +++ b/packages/gb-counties/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/model/composer.json b/packages/model/composer.json index 499fd25..fce2bdf 100644 --- a/packages/model/composer.json +++ b/packages/model/composer.json @@ -19,8 +19,8 @@ "require": { "php": "^8.0", "ext-pdo_sqlite": "*", - "illuminate/database": "^8.40|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0" + "illuminate/database": "^8.40|^9.0|^10.0|^11.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0" }, "autoload": { "psr-4": { diff --git a/packages/regions-en/composer.json b/packages/regions-en/composer.json index b922e91..d390833 100644 --- a/packages/regions-en/composer.json +++ b/packages/regions-en/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/regions": "self.version", "squirephp/repository": "self.version" }, diff --git a/packages/regions/composer.json b/packages/regions/composer.json index 15b0e22..cef487e 100644 --- a/packages/regions/composer.json +++ b/packages/regions/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, diff --git a/packages/repository/composer.json b/packages/repository/composer.json index 61c611b..f6c25ee 100644 --- a/packages/repository/composer.json +++ b/packages/repository/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0" + "illuminate/support": "^8.0|^9.0|^10.0|^11.0" }, "autoload": { "psr-4": { diff --git a/packages/rule/composer.json b/packages/rule/composer.json index 5c1a480..28973d8 100644 --- a/packages/rule/composer.json +++ b/packages/rule/composer.json @@ -18,9 +18,9 @@ ], "require": { "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" + "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0", + "illuminate/database": "^8.40|^9.0|^10.0|^11.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0" }, "autoload": { "psr-4": { diff --git a/packages/timezones-en/composer.json b/packages/timezones-en/composer.json index 5808b49..2fd0408 100644 --- a/packages/timezones-en/composer.json +++ b/packages/timezones-en/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/repository": "self.version", "squirephp/timezones": "self.version" }, diff --git a/packages/timezones/composer.json b/packages/timezones/composer.json index c70647e..e631fcb 100644 --- a/packages/timezones/composer.json +++ b/packages/timezones/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "squirephp/model": "self.version", "squirephp/rule": "self.version" }, From 11edefeb703a08247a55620bcdbb065a984a4e63 Mon Sep 17 00:00:00 2001 From: Orkhan Ahmadov Date: Mon, 11 Mar 2024 12:01:08 +0100 Subject: [PATCH 5/5] PHPUnit config update --- phpunit.xml.dist | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f5ce85d..698b0b5 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,15 +1,13 @@ - - - - - packages - - - + tests + + + packages + +