Skip to content

Commit 9696f09

Browse files
Merge pull request #23 from TheDragonCode/2.x
Added Laravel 10 support
2 parents 2045349 + fcf9a0a commit 9696f09

File tree

5 files changed

+38
-108
lines changed

5 files changed

+38
-108
lines changed

Diff for: .github/workflows/code-style.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: code-style
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
permissions: write-all
8+
9+
jobs:
10+
check:
11+
if: ${{ ! (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v3
18+
19+
- name: Checking PHP Syntax
20+
uses: TheDragonCode/[email protected]
21+
22+
fix:
23+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
24+
25+
runs-on: ubuntu-latest
26+
27+
steps:
28+
- name: Checkout code
29+
uses: actions/checkout@v3
30+
31+
- name: Checking PHP Syntax
32+
uses: TheDragonCode/[email protected]
33+
with:
34+
github_token: ${{ secrets.COMPOSER_TOKEN }}
35+
fix: true

Diff for: .github/workflows/lint-check.yml

-14
This file was deleted.

Diff for: .github/workflows/lint-fixer.yml

-19
This file was deleted.

Diff for: .styleci.yml

-67
This file was deleted.

Diff for: composer.json

+3-8
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
"require": {
4343
"php": "^7.3 || ^8.0",
4444
"ext-dom": "*",
45-
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
46-
"illuminate/validation": "^6.0 || ^7.0 || ^8.0 || ^9.0",
45+
"illuminate/support": ">=6.0 <11.0",
46+
"illuminate/validation": ">=6.0 <11.0",
4747
"symfony/http-kernel": "^4.0 || ^5.0 || ^6.0"
4848
},
4949
"require-dev": {
50-
"phpunit/phpunit": "^9.0",
50+
"phpunit/phpunit": "^9.6",
5151
"symfony/var-dumper": "^5.0 || ^6.0"
5252
},
5353
"minimum-stability": "stable",
@@ -57,11 +57,6 @@
5757
"DragonCode\\Core\\Xml\\": "src"
5858
}
5959
},
60-
"autoload-dev": {
61-
"psr-4": {
62-
"Tests\\": "tests"
63-
}
64-
},
6560
"config": {
6661
"allow-plugins": {
6762
"dragon-code/codestyler": true,

0 commit comments

Comments
 (0)