Skip to content

Commit

Permalink
Merge pull request #59 from manavo/3.x
Browse files Browse the repository at this point in the history 
Laravel 10 support
  • Loading branch information
@danharrin
danharrin authored Feb 18, 2023
2 parents 42c9dc1 + 1b8b6a1 commit e421406
Show file tree
Hide file tree
Showing 29 changed files with 42 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/monorepo-validate.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [8.1, '8.0']
laravel: [9.*, 8.*]
php: [8.2, 8.1, 8.0]
laravel: [10.*, 9.*, 8.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
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
Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"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.0"
},
"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"
},
Expand Down
2 changes: 1 addition & 1 deletion monorepo-builder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
Expand Down
2 changes: 1 addition & 1 deletion packages/airlines-en/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/airlines": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/airlines/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/model": "self.version",
"squirephp/rule": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/airports-en/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/airports": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/airports/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/model": "self.version",
"squirephp/rule": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/continents-de/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/continents": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/continents-en/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/continents": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/continents-pl/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/continents": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/continents/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/model": "self.version",
"squirephp/rule": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-de/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/countries": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-en/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/countries": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-es/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/countries": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-fr/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/countries": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries-pl/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/countries": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/countries/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/model": "self.version",
"squirephp/rule": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/currencies-en/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/currencies": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/currencies/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/model": "self.version",
"squirephp/rule": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/gb-counties-en/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/gb-counties": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/gb-counties/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/model": "self.version",
"squirephp/rule": "self.version"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/model/composer.json
View file
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",
"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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/regions-en/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/regions": "self.version",
"squirephp/repository": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/regions/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/model": "self.version",
"squirephp/rule": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/repository/composer.json
View file
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"
"illuminate/support": "^8.0|^9.0|^10.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions packages/rule/composer.json
View file
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",
"illuminate/database": "^8.40|^9.0",
"illuminate/support": "^8.0|^9.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"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion packages/timezones-en/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/repository": "self.version",
"squirephp/timezones": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/timezones/composer.json
View file
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",
"illuminate/support": "^8.0|^9.0|^10.0",
"squirephp/model": "self.version",
"squirephp/rule": "self.version"
},
Expand Down

0 comments on commit e421406

Please sign in to comment.