Skip to content

Commit eb33b2e

Browse files
Lukasss93Lukasss93
authored
chore: update PHP and Laravel versions in CI configuration
1 parent 0c4756e commit eb33b2e

File tree

4 files changed

+35
-47
lines changed

4 files changed

+35
-47
lines changed

‎.github/workflows/php.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
php: [ 8.2, 8.3 ]
13-
laravel: [9.*, 10.*, 11.*]
12+
php: [ 8.2, 8.3, 8.4 ]
13+
laravel: [ 9.*, 10.*, 11.*, 12.* ]
1414
include:
15+
- laravel: 12.*
16+
testbench: 10.*
17+
termwind: 2.*
18+
pest: 3.*
1519
- laravel: 11.*
1620
testbench: 9.*
1721
termwind: 2.*
@@ -27,7 +31,7 @@ jobs:
2731

2832
name: PHP ${{ matrix.php }} + Laravel ${{ matrix.laravel }}
2933
steps:
30-
- uses: actions/checkout@v2
34+
- uses: actions/checkout@v4
3135

3236
- name: Setup PHP
3337
uses: shivammathur/setup-php@v2
@@ -41,7 +45,7 @@ jobs:
4145
- name: Install dependencies
4246
run: |
4347
composer require "laravel/framework:${{ matrix.laravel }}" "nunomaduro/termwind:${{ matrix.termwind }}" --no-interaction --no-update
44-
composer require "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" "pestphp/pest-plugin-mock:${{ matrix.pest }}" --dev --no-interaction --no-update
48+
composer require "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" --dev --no-interaction --no-update
4549
composer update --prefer-dist --no-interaction
4650
4751
- name: Run test suite
@@ -51,7 +55,7 @@ jobs:
5155
needs: [ tests ]
5256
runs-on: ubuntu-latest
5357
steps:
54-
- uses: actions/checkout@v2
58+
- uses: actions/checkout@v4
5559
- name: Setup PHP
5660
uses: shivammathur/setup-php@v2
5761
with:
@@ -63,7 +67,7 @@ jobs:
6367

6468
- name: Cache Composer packages
6569
id: composer-cache
66-
uses: actions/cache@v2
70+
uses: actions/cache@v4
6771
with:
6872
path: vendor
6973
key: ${{ runner.os }}-php-8.2-${{ hashFiles('**/composer.json') }}
@@ -75,7 +79,7 @@ jobs:
7579
run: composer install --prefer-dist --no-interaction --no-suggest
7680

7781
- name: Run test suite
78-
uses: paambaati/codeclimate-action@v3.2.0
82+
uses: paambaati/codeclimate-action@v9
7983
env:
8084
CC_TEST_REPORTER_ID: ${{ secrets.CC_REPORTER_ID }}
8185
with:
@@ -85,7 +89,7 @@ jobs:
8589
runs-on: ubuntu-latest
8690
name: Psalm
8791
steps:
88-
- uses: actions/checkout@v2
92+
- uses: actions/checkout@v4
8993

9094
- name: Setup PHP
9195
uses: shivammathur/setup-php@v2
@@ -98,7 +102,7 @@ jobs:
98102

99103
- name: Cache Composer packages
100104
id: composer-cache
101-
uses: actions/cache@v2
105+
uses: actions/cache@v4
102106
with:
103107
path: vendor
104108
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.json') }}

‎composer.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@
3333
"nutgram/nutgram": "^4.17.0"
3434
},
3535
"require-dev": {
36-
"illuminate/testing": "^9.0|^10.0|^11.0",
37-
"orchestra/testbench": "^7.0|^8.0|^9.0",
38-
"pestphp/pest": "^1.1|^2.0",
39-
"pestphp/pest-plugin-mock": "^1.0|^2.0",
40-
"roave/security-advisories": "dev-latest",
41-
"vimeo/psalm": "^5.0"
36+
"illuminate/testing": "^9.0|^10.0|^11.0|^12.0",
37+
"orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
38+
"pestphp/pest": "^1.1|^2.0|^3.0",
39+
"vimeo/psalm": "^6.0"
4240
},
4341
"autoload": {
4442
"psr-4": {

‎phpunit.xml.dist

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,31 @@
33
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
44
bootstrap="vendor/autoload.php"
55
colors="true"
6-
>
6+
cacheDirectory=".phpunit.cache">
7+
78
<testsuites>
89
<testsuite name="Test Suite">
9-
<directory suffix="Test.php">./tests</directory>
10+
<directory>./tests</directory>
1011
</testsuite>
1112
</testsuites>
12-
<coverage processUncoveredFiles="true">
13+
14+
<php>
15+
<env name="TELEGRAM_TOKEN" value="TELEGRAM_TOKEN_HERE" force="true"/>
16+
</php>
17+
18+
<source>
1319
<include>
14-
<directory suffix=".php">./src</directory>
20+
<directory>./src</directory>
1521
</include>
1622
<exclude>
17-
<directory suffix=".php">./tests</directory>
18-
<directory suffix=".php">./src/Facades</directory>
19-
<directory suffix=".php">./src/Log</directory>
23+
<directory>./tests</directory>
24+
<directory>./src/Facades</directory>
25+
<directory>./src/Log</directory>
2026
<file>./src/NutgramServiceProvider.php</file>
2127
<file>./src/Console/RunCommand.php</file>
2228
<file>./src/Console/BaseMakeCommand.php</file>
2329
<file>./src/Mixins/MixinUtils.php</file>
30+
<file>./src/RunningMode/LaravelWebhook.php</file>
2431
</exclude>
25-
</coverage>
26-
<php>
27-
<env name="TELEGRAM_TOKEN" value="TELEGRAM_TOKEN_HERE" force="true"/>
28-
</php>
32+
</source>
2933
</phpunit>

‎psalm.xml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0"?>
22
<psalm
33
errorLevel="8"
4+
ensureOverrideAttribute="false"
5+
findUnusedCode="false"
46
resolveFromConfigFile="true"
57
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
68
xmlns="https://getpsalm.org/schema/config"
@@ -18,21 +20,6 @@
1820
<directory name="src"/>
1921
</errorLevel>
2022
</PropertyNotSetInConstructor>
21-
<InvalidThrow>
22-
<errorLevel type="suppress">
23-
<referencedClass name="Psr\SimpleCache\InvalidArgumentException"/>
24-
</errorLevel>
25-
</InvalidThrow>
26-
<UndefinedMethod>
27-
<errorLevel type="suppress">
28-
<referencedMethod name="ReflectionType::getName"/>
29-
</errorLevel>
30-
</UndefinedMethod>
31-
<PossiblyNullPropertyAssignmentValue>
32-
<errorLevel type="suppress">
33-
<directory name="src"/>
34-
</errorLevel>
35-
</PossiblyNullPropertyAssignmentValue>
3623
<UndefinedInterfaceMethod>
3724
<errorLevel type="suppress">
3825
<referencedMethod name="Psr\Container\ContainerInterface::getNew"/>
@@ -43,10 +30,5 @@
4330
<referencedMethod name="Illuminate\Contracts\Filesystem\Filesystem::putFileAs"/>
4431
</errorLevel>
4532
</UndefinedInterfaceMethod>
46-
<InvalidScope>
47-
<errorLevel type="suppress">
48-
<directory name="tests/"/>
49-
</errorLevel>
50-
</InvalidScope>
5133
</issueHandlers>
52-
</psalm>
34+
</psalm>

0 commit comments

Comments
 (0)