Skip to content

Commit

Permalink
Merge pull request #45 from tighten/alk/nova-4-upgrade
Browse files Browse the repository at this point in the history
Nova 4 upgrade
  • Loading branch information
faxblaster authored Aug 12, 2022
2 parents f7d17e1 + 785c364 commit a309089
Show file tree
Hide file tree
Showing 53 changed files with 2,632 additions and 6,402 deletions.
3 changes: 1 addition & 2 deletions .env.testing.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
STRIPE_TEST_KEY=
STRIPE_TEST_SECRET=
STRIPE_TEST_SECRET=sk_test_123
STRIPE_API_BASE="stripemock:12111"
28 changes: 15 additions & 13 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,28 @@ jobs:
strategy:
max-parallel: 1
matrix:
php: [7.3, 7.4, 8.0]
laravel: [6.*, 7.*, 8.*]
php: [ 8.0, 8.1 ]
laravel: [ 8.*, 9.* ]
include:
- laravel: 6.*
testbench: 4.*
phpunit: 9.*
- laravel: 7.*
testbench: 5.*
phpunit: 9.*
- laravel: 8.*
- php: 8.0
laravel: 8.*
testbench: 6.*
phpunit: 9.*
- php: 8.0
- php: 8.1
laravel: 8.*
testbench: 6.*
phpunit: 9.*

- php: 8.0
laravel: 9.*
testbench: 7.*
phpunit: 9.*
- php: 8.1
laravel: 9.*
testbench: 7.*
phpunit: 9.*
services:
stripemock:
image: stripemock/stripe-mock:latest
image: stripe/stripe-mock:v0.141.0
ports:
- 12111

Expand All @@ -49,7 +51,7 @@ jobs:

- name: Install dependencies
run: |
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}"
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_LICENSE_KEY }}"
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "phpunit/phpunit:${{ matrix.phpunit }}" --no-interaction --no-update
composer update --prefer-dist --no-interaction --no-progress --no-suggest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

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

- name: Install dependencies
run: |
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}"
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_LICENSE_KEY }}"
composer install --no-interaction --no-suggest
- name: Tlint Lint
Expand Down
19 changes: 16 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,22 @@ Before submitting a pull request:

To run the test suite locally:

- Run `cp .env.testing.example .env.testing` in the terminal
- Update `.env.testing` with your Stripe **test** API keys
- Run `vendor/bin/phpunit` in the terminal
- Copy the test `env` file:
```
cp .env.testing.example .env.testing
```
- Start the stripe mock docker container:
```
docker run -d --rm -it -p 12111-12112:12111-12112 --name nova-stripe-stripe-mock stripe/stripe-mock:v0.141.0
```
- Run tests:
```
./vendor/bin/phpunit
```
- When done testing your feature, be sure to stop the stripe mock container:
```
docker stop nova-stripe-stripe-mock
```

## Requirements

Expand Down
Binary file modified charges-detail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified charges-index.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@
}
],
"require": {
"php": ">=7.1.0",
"php": "^8.0|^8.1",
"stripe/stripe-php": ">=5.0"
},
"require-dev": {
"laravel/framework": ">=6.20.26",
"laravel/nova": "*@dev",
"laravel/nova": "^4.0",
"orchestra/testbench": ">=3.6.x-dev",
"phpunit/phpunit": "9.5.*",
"tightenco/duster": "^0.3.2"
Expand All @@ -54,7 +53,10 @@
}
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"minimum-stability": "dev",
"prefer-stable": true
Expand Down
Binary file added customers-detail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added customers-index.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions dist/css/tool.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a309089

Please sign in to comment.