Skip to content

Commit f1202cd

Browse files
SMillerDevpprkut
authored andcommitted
fix: use CI tooling as defined in Composer
1 parent 929dca1 commit f1202cd

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/php-test.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
uses: shivammathur/setup-php@v2
2222
with:
2323
php-version: ${{ matrix.php-versions }}
24-
tools: phpunit:5
2524
extensions: redis
2625

2726
- name: Setup problem matchers for PHP
@@ -37,7 +36,7 @@ jobs:
3736
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
3837

3938
- name: Run PHPunit
40-
run: phpunit --configuration phpunit.xml.dist
39+
run: ./vendor/bin/phpunit --configuration phpunit.xml.dist
4140

4241
phpcs:
4342
runs-on: ubuntu-latest
@@ -51,13 +50,13 @@ jobs:
5150
uses: shivammathur/setup-php@v2
5251
with:
5352
php-version: '7.4'
54-
tools: cs2pr, phpcs
53+
tools: cs2pr
5554

5655
- name: Setup problem matchers for PHP
5756
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
5857

5958
- name: Run PHPCS
60-
run: phpcs -q --report=checkstyle lib | cs2pr
59+
run: ./vendor/bin/phpcs -q --report=checkstyle lib | cs2pr
6160

6261
phpstan:
6362
runs-on: ubuntu-latest
@@ -71,7 +70,6 @@ jobs:
7170
uses: shivammathur/setup-php@v2
7271
with:
7372
php-version: '7.4'
74-
tools: phpstan
7573

7674
- name: Setup problem matchers for PHP
7775
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -80,5 +78,5 @@ jobs:
8078
run: composer install
8179

8280
- name: Run PHPStan
83-
run: phpstan analyse lib -l1
81+
run: ./vendor/bin/phpstan analyse lib -l1
8482

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
"ext-redis": "Native PHP extension for Redis connectivity. Credis will automatically utilize when available."
3939
},
4040
"require-dev": {
41-
"phpunit/phpunit": "^5.7"
41+
"phpunit/phpunit": "^5.7",
42+
"squizlabs/php_codesniffer": "^3.10",
43+
"phpstan/phpstan": "^1.12"
4244
},
4345
"bin": [
4446
"bin/resque",

0 commit comments

Comments
 (0)