Skip to content

Commit a420773

Browse files
Fixes some analytics issues
1 parent b9cadeb commit a420773

File tree

3 files changed

+14
-93
lines changed

3 files changed

+14
-93
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,28 @@ name: CI
22

33
on:
44
pull_request:
5-
paths-ignore:
6-
- *.md
5+
paths-ignore: ["*.md"]
76
push:
8-
paths-ignore:
9-
- *.md
7+
paths-ignore: ["*.md"]
108

119
jobs:
1210
analysis:
13-
14-
1511
runs-on: ubuntu-latest
16-
17-
18-
1912
strategy:
2013
matrix:
21-
php: ['8.2', 8.3, '8.3', '8.4']
22-
23-
24-
14+
php: [8.3]
2515
steps:
2616
- uses: actions/checkout@v4
27-
28-
29-
3017
- name: Setup PHP
3118
uses: shivammathur/setup-php@v2
3219
with:
3320
php-version: ${{ matrix.php }}
3421
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, intl, gd, exif, iconv
3522
coverage: none
36-
37-
38-
3923
- name: Get Composer Cache Directory
4024
id: composer-cache
4125
run: |
4226
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
43-
44-
45-
4627
- name: Cache composer dependencies
4728
uses: actions/cache@v4
4829
env:
@@ -52,57 +33,30 @@ jobs:
5233
key: php-${{ matrix.php }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.json') }}
5334
restore-keys: |
5435
php-${{ matrix.php }}-build-${{ env.cache-name }}-
55-
56-
57-
5836
- name: Install composer dependencies
5937
run: composer install --prefer-dist
60-
61-
62-
6338
- name: Run static analysis
6439
run: composer analyse
65-
6640
test:
6741
name: Test (PHP ${{ matrix.php }})
68-
69-
70-
needs:
71-
- analysis
72-
73-
42+
needs: [analysis]
7443
runs-on: ubuntu-latest
75-
76-
77-
7844
strategy:
7945
matrix:
80-
php: [8.0, 8.1, 8.2]
81-
82-
83-
46+
php: [8.0, 8.1, 8.2, 8.3, 8.4]
8447
steps:
8548
- name: Checkout repository
8649
uses: actions/checkout@v4
87-
88-
89-
9050
- name: Set up PHP
9151
uses: shivammathur/setup-php@v2
9252
with:
9353
php-version: ${{ matrix.php }}
9454
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, intl, gd, exif, iconv
9555
coverage: none
96-
97-
98-
9956
- name: Get Composer Cache Directory
10057
id: composer-cache
10158
run: |
10259
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
103-
104-
105-
10660
- name: Cache composer dependencies
10761
uses: actions/cache@v4
10862
env:
@@ -112,76 +66,41 @@ jobs:
11266
key: php-${{ matrix.php }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.json') }}
11367
restore-keys: |
11468
php-${{ matrix.php }}-build-${{ env.cache-name }}-
115-
116-
117-
11869
- name: Install composer dependencies
11970
run: composer install --no-interaction --prefer-dist
120-
121-
122-
12371
- name: Run PHPUnit tests
12472
run: vendor/bin/phpunit
125-
12673
test-coverage:
12774
name: Test (PHP ${{ matrix.php }})
128-
129-
130-
needs:
131-
- analysis
132-
133-
75+
needs: [analysis]
13476
runs-on: ubuntu-latest
135-
136-
137-
13877
strategy:
13978
matrix:
140-
php: ['8.2', 8.3, '8.3', '8.4']
141-
142-
143-
79+
php: [8.3]
14480
steps:
14581
- name: Checkout repository
14682
uses: actions/checkout@v4
147-
148-
149-
15083
- name: Set up PHP
15184
uses: shivammathur/setup-php@v2
15285
with:
15386
php-version: ${{ matrix.php }}
15487
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, intl, gd, exif, iconv
155-
156-
157-
15888
- name: Get Composer Cache Directory
15989
id: composer-cache
16090
run: |
16191
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
162-
163-
164-
16592
- name: Cache composer dependencies
16693
uses: actions/cache@v4
16794
env:
16895
cache-name: eloquent-blameable-test
16996
with:
17097
path: ${{ steps.composer-cache.outputs.dir }}
17198
key: php-${{ matrix.php }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.json') }}
172-
restore-keys: php-${{ matrix.php }}-build-${{ env.cache-name }}-
173-
174-
175-
99+
restore-keys: |
100+
php-${{ matrix.php }}-build-${{ env.cache-name }}-
176101
- name: Install composer dependencies
177102
run: composer install --no-interaction --prefer-dist
178-
179-
180-
181103
- name: Run PHPUnit tests and generate code coverage
182104
run: vendor/bin/phpunit --coverage-clover=clover.xml
183-
184-
185-
186105
- name: Upload code coverage results
187106
run: bash <(curl -s https://codecov.io/bash)

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0"
2727
},
2828
"require-dev": {
29-
"ekino/phpstan-banned-code": "^1.0|^3.0",
30-
"larastan/larastan": "^1.0|^2.0",
29+
"ekino/phpstan-banned-code": "^1.0",
30+
"larastan/larastan": "^1.0|^2.0|^3.0",
3131
"mockery/mockery": "^1.4",
3232
"orchestra/testbench": "^6.0|^7.0|^8.0|^9.0|^10.0",
3333
"phpmd/phpmd": "^2.11",

phpstan.neon

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ includes:
66

77
parameters:
88
level: 8
9-
checkMissingIterableValueType: false
109
paths:
1110
- src
11+
ignoreErrors:
12+
- identifier: trait.unused
13+
- '#Dynamic call to static method Illuminate\\Contracts\\Auth\\Guard::user\(\).#'
1214
banned_code:
1315
nodes:
1416
- type: Expr_FuncCall

0 commit comments

Comments
 (0)