Skip to content

Commit

Permalink
Merge pull request #60 from TheDragonCode/3.x
Browse files Browse the repository at this point in the history
Added Laravel 10 support
  • Loading branch information
andrey-helldar authored Feb 15, 2023
2 parents 0372d3f + 9c56e87 commit b0adb6c
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 172 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: code-style

on:
push:
pull_request:

permissions: write-all

jobs:
check:
if: ${{ ! (github.event_name == 'push' && github.ref == 'refs/heads/main') }}

runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Checking PHP Syntax
uses: TheDragonCode/codestyler@v2.6.2

fix:
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Checking PHP Syntax
uses: TheDragonCode/codestyler@v2.6.2
with:
github_token: ${{ secrets.COMPOSER_TOKEN }}
fix: true
34 changes: 0 additions & 34 deletions .github/workflows/laravel-6.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/laravel-7.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/laravel-8.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/laravel-9.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/lint-check.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/lint-fixer.yml

This file was deleted.

56 changes: 56 additions & 0 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: phpunit

on: [ push ]

jobs:
build:
runs-on: ubuntu-latest

strategy:
fail-fast: true
matrix:
php: [ "8.0", "8.1", "8.2" ]
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
exclude:
- laravel: "6.0"
php: "8.1"

- laravel: "6.0"
php: "8.2"

- laravel: "7.0"
php: "8.1"

- laravel: "7.0"
php: "8.2"

- laravel: "9.0"
php: "7.4"

- laravel: "10.0"
php: "7.4"

- laravel: "10.0"
php: "8.0"

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

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Redis
uses: zhulik/redis-action@1.1.0

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
coverage: none

- name: Install dependencies
run: composer require --dev laravel/framework:^${{ matrix.laravel }}

- name: Execute tests
run: sudo vendor/bin/phpunit
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"php": "^8.0",
"dragon-code/contracts": "^2.16",
"dragon-code/support": "^6.1",
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0"
"illuminate/support": ">=6.0 <11.0"
},
"require-dev": {
"dragon-code/simple-dto": "^2.3",
"nesbot/carbon": "^2.62",
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
"phpunit/phpunit": "^8.5 || ^9.0"
"orchestra/testbench": ">=4.0 <9.0",
"phpunit/phpunit": "^8.5 || ^9.6"
},
"conflict": {
"andrey-helldar/cache": "*"
Expand Down

0 comments on commit b0adb6c

Please sign in to comment.