Skip to content

Commit f580523

Browse files
author
Andrey Helldar
authored
Merge pull request #6 from cashier-provider/2.x
Added Laravel 9 support
2 parents 6f8ae22 + e7b292d commit f580523

File tree

9 files changed

+101
-83
lines changed

9 files changed

+101
-83
lines changed

.codecov.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/laravel-6-8.yml renamed to .github/workflows/laravel-6.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Laravel 6-8"
1+
name: "Laravel 6"
22
on: [ push ]
33

44
jobs:
@@ -9,9 +9,9 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
php: [ "7.3", "7.4", "8.0" ]
12-
laravel: [ "6.0", "7.0", "8.0" ]
12+
laravel: [ "6.0" ]
1313

14-
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
14+
name: PHP ${{ matrix.php }}
1515

1616
services:
1717
mysql:

.github/workflows/laravel-7.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "Laravel 7"
2+
on: [ push ]
3+
4+
jobs:
5+
build:
6+
runs-on: ubuntu-latest
7+
8+
strategy:
9+
fail-fast: true
10+
matrix:
11+
php: [ "7.3", "7.4", "8.0" ]
12+
laravel: [ "7.0" ]
13+
14+
name: PHP ${{ matrix.php }}
15+
16+
services:
17+
mysql:
18+
image: mysql:5.7
19+
env:
20+
MYSQL_ROOT_PASSWORD: root
21+
MYSQL_DATABASE: default
22+
ports:
23+
- 3306:3306
24+
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
25+
26+
steps:
27+
- name: Checkout code
28+
uses: actions/checkout@v2
29+
30+
- name: Setup PHP
31+
uses: shivammathur/setup-php@v2
32+
with:
33+
php-version: ${{ matrix.php }}
34+
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, bcmath
35+
coverage: none
36+
37+
- name: Install dependencies
38+
run: composer require laravel/framework:^${{ matrix.laravel }} --prefer-stable --prefer-dist --no-progress --no-interaction
39+
40+
- name: Execute tests
41+
run: sudo vendor/bin/phpunit
42+
env:
43+
MYSQL_HOST: 127.0.0.1

.github/workflows/laravel-8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
php: [ "7.3", "7.4", "8.0", "8.1" ]
1212
laravel: [ "8.0" ]
1313

14-
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
14+
name: PHP ${{ matrix.php }}
1515

1616
services:
1717
mysql:

.github/workflows/laravel-9.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "Laravel 9"
2+
on: [ push ]
3+
4+
jobs:
5+
build:
6+
runs-on: ubuntu-latest
7+
8+
strategy:
9+
fail-fast: true
10+
matrix:
11+
php: [ "8.0", "8.1" ]
12+
laravel: [ "9.0" ]
13+
14+
name: PHP ${{ matrix.php }}
15+
16+
services:
17+
mysql:
18+
image: mysql:5.7
19+
env:
20+
MYSQL_ROOT_PASSWORD: root
21+
MYSQL_DATABASE: default
22+
ports:
23+
- 3306:3306
24+
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
25+
26+
steps:
27+
- name: Checkout code
28+
uses: actions/checkout@v2
29+
30+
- name: Setup PHP
31+
uses: shivammathur/setup-php@v2
32+
with:
33+
php-version: ${{ matrix.php }}
34+
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, bcmath
35+
coverage: none
36+
37+
- name: Install dependencies
38+
run: composer require laravel/framework:^${{ matrix.laravel }} --prefer-stable --prefer-dist --no-progress --no-interaction
39+
40+
- name: Execute tests
41+
run: sudo vendor/bin/phpunit
42+
env:
43+
MYSQL_HOST: 127.0.0.1

.github/workflows/lint-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
uses: actions/checkout@v2
1212

1313
- name: Checking PHP Syntax
14-
uses: TheDragonCode/php-codestyler@v1.10.8
14+
uses: TheDragonCode/php-codestyler@v1.8.6

.github/workflows/lint-fixer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
uses: actions/checkout@v2
1414

1515
- name: Checking PHP Syntax
16-
uses: TheDragonCode/php-codestyler@v1.10.8
16+
uses: TheDragonCode/php-codestyler@v1.8.6
1717
with:
1818
fix: true

.styleci.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "cashier-provider/cash",
33
"description": "Driver for managing cash payments (see cashier-provider/core)",
4-
"type": "library",
54
"license": "MIT",
5+
"type": "library",
66
"keywords": [
77
"bank",
88
"billing",
@@ -20,18 +20,20 @@
2020
"source": "https://github.com/cashier-provider/cash"
2121
},
2222
"require": {
23-
"php": "^7.3|^8.0",
24-
"cashier-provider/core": "^2.0",
23+
"php": "^7.3 || ^8.0",
24+
"cashier-provider/core": "^2.5",
2525
"psr/http-message": "^1.0"
2626
},
2727
"require-dev": {
2828
"ext-json": "*",
2929
"dragon-code/support": "^5.0",
30-
"illuminate/database": "^6.0|^7.0|^8.0",
31-
"orchestra/testbench": "^4.0|^5.0|^6.0",
30+
"illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0",
31+
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
3232
"phpunit/phpunit": "^9.0",
33-
"symfony/var-dumper": "^4.0|^5.0"
33+
"symfony/var-dumper": "^4.0 || ^5.0 || ^6.0"
3434
},
35+
"minimum-stability": "stable",
36+
"prefer-stable": true,
3537
"autoload": {
3638
"psr-4": {
3739
"CashierProvider\\Cash\\": "src"
@@ -45,7 +47,5 @@
4547
"config": {
4648
"preferred-install": "dist",
4749
"sort-packages": true
48-
},
49-
"minimum-stability": "stable",
50-
"prefer-stable": true
50+
}
5151
}

0 commit comments

Comments
 (0)