Skip to content

Commit a309089

Browse files
authored
Merge pull request #45 from tighten/alk/nova-4-upgrade
Nova 4 upgrade
2 parents f7d17e1 + 785c364 commit a309089

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2632
-6402
lines changed

.env.testing.example

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
STRIPE_TEST_KEY=
2-
STRIPE_TEST_SECRET=
1+
STRIPE_TEST_SECRET=sk_test_123
32
STRIPE_API_BASE="stripemock:12111"

.github/workflows/build-test.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,28 @@ jobs:
1313
strategy:
1414
max-parallel: 1
1515
matrix:
16-
php: [7.3, 7.4, 8.0]
17-
laravel: [6.*, 7.*, 8.*]
16+
php: [ 8.0, 8.1 ]
17+
laravel: [ 8.*, 9.* ]
1818
include:
19-
- laravel: 6.*
20-
testbench: 4.*
21-
phpunit: 9.*
22-
- laravel: 7.*
23-
testbench: 5.*
24-
phpunit: 9.*
25-
- laravel: 8.*
19+
- php: 8.0
20+
laravel: 8.*
2621
testbench: 6.*
2722
phpunit: 9.*
28-
- php: 8.0
23+
- php: 8.1
2924
laravel: 8.*
3025
testbench: 6.*
3126
phpunit: 9.*
32-
27+
- php: 8.0
28+
laravel: 9.*
29+
testbench: 7.*
30+
phpunit: 9.*
31+
- php: 8.1
32+
laravel: 9.*
33+
testbench: 7.*
34+
phpunit: 9.*
3335
services:
3436
stripemock:
35-
image: stripemock/stripe-mock:latest
37+
image: stripe/stripe-mock:v0.141.0
3638
ports:
3739
- 12111
3840

@@ -49,7 +51,7 @@ jobs:
4951

5052
- name: Install dependencies
5153
run: |
52-
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}"
54+
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_LICENSE_KEY }}"
5355
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "phpunit/phpunit:${{ matrix.phpunit }}" --no-interaction --no-update
5456
composer update --prefer-dist --no-interaction --no-progress --no-suggest
5557

.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Install dependencies
2727
run: |
28-
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}"
28+
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_LICENSE_KEY }}"
2929
composer upgrade --no-interaction --no-suggest
3030
3131
- name: PHP-8 compatible PHPCS
@@ -50,7 +50,7 @@ jobs:
5050

5151
- name: Install dependencies
5252
run: |
53-
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}"
53+
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_LICENSE_KEY }}"
5454
composer install --no-interaction --no-suggest
5555
5656
- name: Tlint Lint

CONTRIBUTING.md

+16-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,22 @@ Before submitting a pull request:
2828

2929
To run the test suite locally:
3030

31-
- Run `cp .env.testing.example .env.testing` in the terminal
32-
- Update `.env.testing` with your Stripe **test** API keys
33-
- Run `vendor/bin/phpunit` in the terminal
31+
- Copy the test `env` file:
32+
```
33+
cp .env.testing.example .env.testing
34+
```
35+
- Start the stripe mock docker container:
36+
```
37+
docker run -d --rm -it -p 12111-12112:12111-12112 --name nova-stripe-stripe-mock stripe/stripe-mock:v0.141.0
38+
```
39+
- Run tests:
40+
```
41+
./vendor/bin/phpunit
42+
```
43+
- When done testing your feature, be sure to stop the stripe mock container:
44+
```
45+
docker stop nova-stripe-stripe-mock
46+
```
3447
3548
## Requirements
3649

charges-detail.png

173 Bytes
Loading

charges-index.png

59.5 KB
Loading

composer.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
}
2727
],
2828
"require": {
29-
"php": ">=7.1.0",
29+
"php": "^8.0|^8.1",
3030
"stripe/stripe-php": ">=5.0"
3131
},
3232
"require-dev": {
33-
"laravel/framework": ">=6.20.26",
34-
"laravel/nova": "*@dev",
33+
"laravel/nova": "^4.0",
3534
"orchestra/testbench": ">=3.6.x-dev",
3635
"phpunit/phpunit": "9.5.*",
3736
"tightenco/duster": "^0.3.2"
@@ -54,7 +53,10 @@
5453
}
5554
},
5655
"config": {
57-
"sort-packages": true
56+
"sort-packages": true,
57+
"allow-plugins": {
58+
"dealerdirect/phpcodesniffer-composer-installer": true
59+
}
5860
},
5961
"minimum-stability": "dev",
6062
"prefer-stable": true

customers-detail.png

198 KB
Loading

customers-index.png

146 KB
Loading

dist/css/tool.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)