Skip to content

Commit 73c2015

Browse files
authored
Merge pull request #2770 from yajra/l9-patch
[10.x] Laravel DataTables for Laravel 9
2 parents 82657ed + 9767cbe commit 73c2015

33 files changed

+1094
-1926
lines changed

.github/workflows/tests.yml renamed to .github/workflows/continuous-integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: tests
1+
name: "Continuous Integration"
22

33
on:
44
push:
@@ -7,14 +7,14 @@ on:
77
- cron: '0 0 * * *'
88

99
jobs:
10-
tests:
10+
phpunit:
1111

1212
runs-on: ubuntu-latest
1313

1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: [7.3, 7.4, 8.0]
17+
php: [8.0, 8.1]
1818
stability: [prefer-stable]
1919

2020
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: "Static Analysis"
2+
3+
on:
4+
push:
5+
paths:
6+
- .github/workflows/static-analysis.yml
7+
- composer.*
8+
- phpstan.neon.dist
9+
- src/**
10+
- tests/**
11+
12+
pull_request:
13+
paths:
14+
- .github/workflows/static-analysis.yml
15+
- composer.*
16+
- phpstan.neon.dist
17+
- src/**
18+
- tests/**
19+
20+
schedule:
21+
- cron: '0 0 * * *'
22+
23+
jobs:
24+
static-analysis-phpstan:
25+
name: "Static Analysis with PHPStan"
26+
runs-on: ubuntu-latest
27+
28+
strategy:
29+
matrix:
30+
php-version:
31+
- "8.1"
32+
33+
steps:
34+
- name: "Checkout code"
35+
uses: "actions/checkout@v2"
36+
37+
- name: "Install PHP"
38+
uses: "shivammathur/setup-php@v2"
39+
with:
40+
coverage: "none"
41+
php-version: "${{ matrix.php-version }}"
42+
tools: "cs2pr"
43+
44+
- name: "Install dependencies with Composer"
45+
uses: "ramsey/composer-install@v1"
46+
47+
- name: "Run a static analysis with phpstan/phpstan"
48+
run: "vendor/bin/phpstan --error-format=checkstyle | cs2pr"

.php_cs

Lines changed: 0 additions & 77 deletions
This file was deleted.

.scrutinizer.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.styleci.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1 @@
11
preset: laravel
2-
3-
enabled:
4-
- align_double_arrow
5-
- align_equals
6-
- no_useless_else
7-
8-
disabled:
9-
- concat_without_spaces
10-
- unalign_equals

0 commit comments

Comments
 (0)