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

Add Support to Laravel 11 #14

Merged
merged 20 commits into from
Apr 18, 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
27 changes: 12 additions & 15 deletions .github/workflows/analyse.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: analyse
name: Analyse

on:
push:
Expand All @@ -8,34 +8,31 @@ on:

jobs:
phpstan:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Checkout code
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.1
php-version: 8.3

- name: Get Composer Cache Directory
- name: Cache Composer packages
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"

- uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }}
path: vendor
key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ runner.os }}-composer-8.1
${{ runner.os }}-php-8.3-

- name: Install dependencies
if: steps.cache-descom-laravel-auth.outputs.cache-hit != 'true'
if: steps.composer-cache.outputs.cache-hit != 'true'
run: |
composer install
composer install --no-interaction --no-progress
composer dump

- name: Run analyse phpstan
run: vendor/bin/phpstan analyse --error-format github
run: vendor/bin/phpstan analyse --error-format github
67 changes: 32 additions & 35 deletions .github/workflows/style-fix.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,41 @@
name: style-fix
name: Style fix

on:
push:
branches: [master]

jobs:
style:

style-fix:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.1

- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"

- uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-8.1

- name: Install dependencies
if: steps.cache-descom-laravel-auth.outputs.cache-hit != 'true'
run: |
composer install
composer dump

- name: Fix styles
run: vendor/bin/php-cs-fixer fix

- uses: EndBug/add-and-commit@v9

- name: Run style
run: vendor/bin/php-cs-fixer fix --dry-run --diff --format junit
- name: Checkout code
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
with:
path: vendor
key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ runner.os }}-php-8.3-

- name: Install dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
run: |
composer install --no-interaction --no-progress
composer dump

- name: Fix styles
run: vendor/bin/php-cs-fixer fix

- name: Run style
run: vendor/bin/php-cs-fixer fix --dry-run --diff --format junit

- uses: EndBug/add-and-commit@v9
54 changes: 31 additions & 23 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: tests
name: Tests

on:
push:
Expand All @@ -8,31 +8,39 @@ on:

jobs:
phpunit:

runs-on: ubuntu-latest

strategy:
fail-fast: true
matrix:
php-versions: ['8.3', '8.2', '8.1', '8.0']
php: [8.1, 8.2, 8.3]

steps:
- uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, bcmath, intl, exif
coverage: xdebug


- name: Validate composer.json and composer.lock
run: composer validate

- name: Install dependencies
run: |
composer install
composer dump

- name: Run test phpunit
run: vendor/bin/phpunit
- name: Checkout code
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}

- name: Validate composer.json
run: composer validate

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
with:
path: vendor
key: ${{ runner.os }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-${{ matrix.php }}-

- name: Install dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
run: |
composer install --no-interaction --no-progress
composer dump

- name: Run test phpunit
run: vendor/bin/phpunit --stop-on-error --stop-on-failure
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"guzzlehttp/guzzle": "^7.4",
"league/omnipay": "^3.2",
"omnipay/common": "^3.2",
"illuminate/contracts": "^9.25|^10.0"
"illuminate/contracts": "^9.25|^10.0|^11.0"
},
"require-dev": {
"guzzlehttp/psr7": "^1",
"omnipay/tests": "^4.1",
"phpunit/phpunit": "^9.5",
"orchestra/testbench": "^7.0|^8.0",
"phpunit/phpunit": "^9.5|^10.0|^10.5",
"orchestra/testbench": "^7.0|^8.0|^9.0",
"friendsofphp/php-cs-fixer": "^3.10",
"phpstan/phpstan": "^1.8",
"nunomaduro/larastan": "^2.1"
Expand All @@ -44,4 +44,4 @@
]
}
}
}
}
8 changes: 4 additions & 4 deletions tests/PurchaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ public function testPurchaseRedirect()
$responseHtml = $this->gateway
->purchase(
[
'amount' => '12.00',
'description' => 'Test purchase',
'transactionId' => 1,
]
'amount' => '12.00',
'description' => 'Test purchase',
'transactionId' => 1,
]
)->send()
->getRedirectResponse()
->getContent();
Expand Down