Skip to content

Commit

Permalink
Merge pull request #78 from orkhanahmadov/patch-1
Browse files Browse the repository at this point in the history
Laravel 11 compatibility
  • Loading branch information
danharrin authored Mar 11, 2024
2 parents 6a988d9 + 11edefe commit dbe721f
Show file tree
Hide file tree
Showing 29 changed files with 49 additions and 45 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,22 @@ 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.*
testbench: 9.*
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*
- 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 }}
Expand All @@ -42,4 +48,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
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions monorepo-builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/airlines-en/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/airlines/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/airports-en/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/airports/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/continents-de/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/continents-en/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/continents-pl/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/continents/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-de/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-en/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-es/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-fr/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-pl/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/currencies-en/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/currencies/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/gb-counties-en/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/gb-counties/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/model/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/regions-en/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/regions/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/repository/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions packages/rule/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/timezones-en/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/timezones/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
14 changes: 6 additions & 8 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" colors="true" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" verbose="true">
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">packages</directory>
</include>
</coverage>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" colors="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache">
<testsuites>
<testsuite name="default">
<directory suffix="Test.php">tests</directory>
</testsuite>
</testsuites>
<source>
<include>
<directory suffix=".php">packages</directory>
</include>
</source>
</phpunit>

0 comments on commit dbe721f

Please sign in to comment.