Skip to content

Commit 4735cb0

Browse files
authored
Merge branch 'master' into HardFilterLimit
2 parents 36aad90 + 178a25d commit 4735cb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3236
-2820
lines changed

.gitattributes

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.editorconfig export-ignore
66
.gitattributes export-ignore
77
.gitignore export-ignore
8-
.php_cs export-ignore
98
.scrutinizer.yml export-ignore
10-
.travis.yml export-ignore
11-
phpunit.xml export-ignore
9+
.styleci.yml export-ignore
10+
phpstan.neon.dist export-ignore
11+
phpunit.xml.dist export-ignore

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
github: yajra
12
patreon: yajra
23
custom: https://www.paypal.me/yajra

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

Lines changed: 6 additions & 6 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,15 +7,15 @@ 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]
18-
stability: [prefer-lowest, prefer-stable]
17+
php: [8.2, 8.3]
18+
stability: [prefer-stable]
1919

2020
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
2121

@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
timeout_minutes: 5
4141
max_attempts: 5
42-
command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
42+
command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
4343

4444
- name: Execute tests
45-
run: vendor/bin/phpunit --verbose
45+
run: vendor/bin/phpunit
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Lock Closed Issues
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *"
6+
7+
permissions:
8+
issues: write
9+
10+
jobs:
11+
action:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: dessant/lock-threads@v3
15+
with:
16+
github-token: ${{ secrets.GITHUB_TOKEN }}
17+
issue-inactive-days: "14"
18+
#issue-comment: |
19+
# This issue has been locked since it has been closed for more than 14 days.
20+
issue-lock-reason: ""
21+
process-only: "issues"

.github/workflows/pint.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PHP Linting
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- master
7+
jobs:
8+
phplint:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: "laravel-pint"
13+
uses: aglipanci/[email protected]
14+
with:
15+
preset: laravel
16+
verboseMode: true
17+
- uses: stefanzweifel/git-auto-commit-action@v5
18+
with:
19+
commit_message: "fix: pint"

.github/workflows/stale.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Close inactive issues
2+
on:
3+
schedule:
4+
- cron: "0 0 * * *"
5+
6+
jobs:
7+
close-issues:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
steps:
13+
- uses: actions/stale@v5
14+
with:
15+
exempt-issue-labels: "bug,security,enhancement,pinned"
16+
days-before-issue-stale: 30
17+
days-before-issue-close: 7
18+
stale-issue-label: "stale"
19+
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity. Remove stale label or comment or this will be closed in 7 days."
20+
close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale."
21+
days-before-pr-stale: -1
22+
days-before-pr-close: -1
23+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/static-analysis.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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+
26+
name: "Static Analysis with PHPStan"
27+
runs-on: ubuntu-latest
28+
29+
strategy:
30+
fail-fast: true
31+
matrix:
32+
php: [8.2, 8.3]
33+
stability: [prefer-stable]
34+
35+
steps:
36+
- name: Checkout code
37+
uses: actions/checkout@v2
38+
39+
- name: Setup PHP
40+
uses: shivammathur/setup-php@v2
41+
with:
42+
php-version: ${{ matrix.php }}
43+
tools: composer:v2
44+
coverage: none
45+
46+
- name: Install dependencies
47+
uses: nick-invision/retry@v1
48+
with:
49+
timeout_minutes: 5
50+
max_attempts: 5
51+
command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
52+
53+
- name: "Run a static analysis with phpstan/phpstan"
54+
run: "vendor/bin/phpstan --error-format=table"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/coverage
33
composer.phar
44
composer.lock
5+
/.phpunit.cache

.php_cs

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

.scrutinizer.yml

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

0 commit comments

Comments
 (0)