Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 11.x Compatibility #46

Merged
merged 4 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Pint
on:
push:
paths:
- '**.php'
- **.php

jobs:
ci:
Expand All @@ -13,7 +13,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [8.1]
php: [8.1, '8.2']
stability: [prefer-lowest, prefer-stable]

name: Formats P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.stability }}
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '${{ matrix.php }}'
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip
tools: composer:v2

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Static analysis
on:
push:
paths:
- '**.php'
- 'phpstan.neon.dist'
- **.php
- phpstan.neon.dist

jobs:
static-analysis:
Expand All @@ -14,7 +14,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [8.1]
php: [8.1, '8.2']
stability: [prefer-stable]

name: Static Analysis P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.stability }}
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '${{ matrix.php }}'
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip
tools: composer:v2
coverage: none
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: PHP Tests

on:
push:
branches: [main]
branches:
- main
pull_request:
branches: [main]
branches:
- main

jobs:
ci:
Expand All @@ -16,12 +18,17 @@ jobs:
os: [ubuntu-latest]
php: [8.2, 8.1]
stability: [prefer-lowest, prefer-stable]
laravel: [^10.0, ^9.0]
laravel: ["11.0", ^9.0, ^10.0]
include:
- laravel: ^10.0
testbench: ^8.0
- laravel: ^9.0
testbench: ^7.0
- laravel: "11.0"
testbench: ^9.0
exclude:
- laravel: "11.0"
php: 8.1

name: Tests P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.stability }}

Expand All @@ -47,7 +54,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "${{ matrix.php }}"
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip
tools: composer:v2
coverage: pcov
Expand All @@ -73,9 +80,9 @@ jobs:
VIVA_ENVIRONMENT: demo
VIVA_MERCHANT_ID: ${{ secrets.VIVA_MERCHANT_ID }}
VIVA_SOURCE_CODE: ${{ secrets.VIVA_SOURCE_CODE }}
run: vendor/bin/phpunit --verbose --whitelist=src --coverage-clover=build/coverage/coverage.clover
run: vendor/bin/phpunit --coverage-clover=build/coverage/coverage.clover

- name: Upload coverage
uses: sudo-bot/action-scrutinizer@latest
with:
cli-args: "--format=php-clover build/coverage/coverage.clover"
cli-args: --format=php-clover build/coverage/coverage.clover
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to `sebdesign/laravel-viva-payments` will be documented in t
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [6.0.9] - 2024-03-12

### Fixes

- Laravel 11.x Compatibility ([#46](https://github.com/sebdesign/laravel-viva-payments/pull/46))

## [6.0.8] - 2024-02-26

### Fixes
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
"require": {
"php": "^8.1",
"guzzlehttp/guzzle": "^7.2",
"illuminate/config": "^9.0 | ^10.0",
"illuminate/routing": "^9.0 | ^10.0",
"illuminate/support": "^9.0 | ^10.0"
"illuminate/config": "^9.0 | ^10.0 | ^11.0",
"illuminate/routing": "^9.0 | ^10.0 | ^11.0",
"illuminate/support": "^9.0 | ^10.0 | ^11.0"
},
"require-dev": {
"laravel/pint": "^1.4",
"nunomaduro/larastan": "^2.4",
"orchestra/testbench": "^7.0 | ^8.0",
"orchestra/testbench": "^7.0 | ^8.0 | ^9.0",
"phpstan/phpstan-phpunit": "^1.3",
"phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "^9.5.16"
"phpunit/phpunit": "^9.5.16 | ^10.5"
},
"autoload": {
"psr-4": {
Expand Down
Loading