Skip to content

Commit

Permalink
[12.x] Laravel 9 support (#1302)
Browse files Browse the repository at this point in the history
* Laravel 9 support

* Apply fixes from StyleCI

Co-authored-by: StyleCI Bot <bot@styleci.io>
  • Loading branch information
driesvints and StyleCIBot committed Jan 18, 2022
1 parent 5eddb87 commit 16691e2
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 13 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ jobs:
fail-fast: true
matrix:
php: [7.2, 7.3, 7.4, 8.0]
laravel: [^6.0, ^7.0, ^8.0]
laravel: [^6.0, ^7.0, ^8.0, ^9.0]
exclude:
- php: 7.2
laravel: ^8.0
- php: 7.2
laravel: ^9.0
- php: 7.3
laravel: ^9.0
- php: 7.4
laravel: ^9.0

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}

Expand Down
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@
"php": "^7.2.5|^8.0",
"ext-json": "*",
"dompdf/dompdf": "^0.8.6|^1.0.1",
"illuminate/console": "^6.0|^7.0|^8.0",
"illuminate/contracts": "^6.0|^7.0|^8.0",
"illuminate/database": "^6.0|^7.0|^8.0",
"illuminate/http": "^6.0|^7.0|^8.0",
"illuminate/log": "^6.0|^7.0|^8.0",
"illuminate/notifications": "^6.0|^7.0|^8.0",
"illuminate/routing": "^6.0|^7.0|^8.0",
"illuminate/support": "^6.0|^7.0|^8.0",
"illuminate/view": "^6.0|^7.0|^8.0",
"illuminate/console": "^6.0|^7.0|^8.0|^9.0",
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",
"illuminate/database": "^6.0|^7.0|^8.0|^9.0",
"illuminate/http": "^6.0|^7.0|^8.0|^9.0",
"illuminate/log": "^6.0|^7.0|^8.0|^9.0",
"illuminate/notifications": "^6.0|^7.0|^8.0|^9.0",
"illuminate/routing": "^6.0|^7.0|^8.0|^9.0",
"illuminate/support": "^6.0|^7.0|^8.0|^9.0",
"illuminate/view": "^6.0|^7.0|^8.0|^9.0",
"moneyphp/money": "^3.2",
"nesbot/carbon": "^2.0",
"stripe/stripe-php": "^7.39",
"symfony/http-kernel": "^4.3|^5.0",
"symfony/http-kernel": "^4.3|^5.0|^6.0",
"symfony/polyfill-intl-icu": "^1.22.1"
},
"require-dev": {
"mockery/mockery": "^1.0",
"orchestra/testbench": "^4.0|^5.0|^6.0",
"orchestra/testbench": "^4.0|^5.0|^6.0|^7.0",
"phpunit/phpunit": "^8.0|^9.0"
},
"suggest": {
Expand Down
1 change: 1 addition & 0 deletions src/Concerns/ManagesSubscriptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ public function onPlan($plan)
* Get the tax percentage to apply to the subscription.
*
* @return int|float
*
* @deprecated Please migrate to the new Tax Rates API.
*/
public function taxPercentage()
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Controllers/WebhookController.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function handleWebhook(Request $request)
/**
* Handle customer subscription created.
*
* @param array $payload
* @param array $payload
* @return \Symfony\Component\HttpFoundation\Response
*/
protected function handleCustomerSubscriptionCreated(array $payload)
Expand Down
2 changes: 2 additions & 0 deletions src/Subscription.php
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,7 @@ public function cancelNowAndInvoice()
* Mark the subscription as cancelled.
*
* @return void
*
* @internal
*/
public function markAsCancelled()
Expand Down Expand Up @@ -1075,6 +1076,7 @@ public function latestInvoice()
* Sync the tax percentage of the user to the subscription.
*
* @return void
*
* @deprecated Please migrate to the new Tax Rates API.
*/
public function syncTaxPercentage()
Expand Down
1 change: 1 addition & 0 deletions src/SubscriptionBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ protected function getTrialEndForPayload()
* Get the tax percentage for the Stripe payload.
*
* @return int|float|null
*
* @deprecated Please migrate to the new Tax Rates API.
*/
protected function getTaxPercentageForPayload()
Expand Down

0 comments on commit 16691e2

Please sign in to comment.