Skip to content

Commit 02a70b7

Browse files
pl-githubtemp
authored andcommitted
chore: Use development tools as composer dependencies
1 parent 5de0ace commit 02a70b7

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches:
99
- "master"
10+
- "fix/composer-devtools"
1011

1112
jobs:
1213
tests:
@@ -40,26 +41,19 @@ jobs:
4041
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
4142
restore-keys: "php-${{ matrix.php-version }}-composer-"
4243

43-
- name: "Install development tools in highest version in a separate directory"
44-
run: "mkdir /tmp/devtools && cp composer.json /tmp/devtools/ && cd /tmp/devtools/ && composer config name brainbits/devtools && composer update --prefer-dist --no-interaction --no-progress"
45-
46-
- name: "Install lowest version of thecodingmachine/safe in development tools for phpstan compatibility"
47-
if: ${{ matrix.dependencies == 'lowest' }}
48-
run: "cd /tmp/devtools/ && composer require 'thecodingmachine/safe' '^1.3'"
49-
5044
- name: "Install lowest dependencies"
5145
if: ${{ matrix.dependencies == 'lowest' }}
52-
run: "composer update --prefer-lowest --no-dev --prefer-dist --no-interaction --no-progress"
46+
run: "composer update --prefer-lowest --prefer-dist --no-interaction --no-progress"
5347

5448
- name: "Install highest dependencies"
5549
if: ${{ matrix.dependencies == 'highest' }}
56-
run: "composer update --no-dev --prefer-dist --no-interaction --no-progress"
50+
run: "composer update --prefer-dist --no-interaction --no-progress"
5751

5852
- name: "Code Style"
59-
run: "/tmp/devtools/vendor/bin/phpcs"
53+
run: "vendor/bin/phpcs"
6054

6155
- name: "Static Analysis"
62-
run: "/tmp/devtools/vendor/bin/phpstan analyze"
56+
run: "vendor/bin/phpstan analyze"
6357

6458
- name: "Tests"
65-
run: "/tmp/devtools/vendor/bin/phpunit"
59+
run: "vendor/bin/phpunit"

composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@
1414
"ext-simplexml": "*",
1515
"ext-tidy": "*",
1616
"brainbits/phpcs-standard": "^7.0",
17-
"brainbits/phpstan-rules": "^3.0",
17+
"brainbits/phpstan-rules": "^3.1.2",
1818
"dama/doctrine-test-bundle": "^6.0|^7.0",
1919
"doctrine/dbal": "^3.4",
2020
"ergebnis/phpstan-rules": "^2.2.0",
2121
"jangregor/phpstan-prophecy": "^1.0",
2222
"mikey179/vfsstream": "^1.6.11",
2323
"monolog/monolog": "^2.3|^3.0",
24-
"php-coveralls/php-coveralls": "^2.4",
2524
"phpstan/phpstan": "^1.2",
2625
"phpstan/phpstan-phpunit": "^1.0",
2726
"phpstan/phpstan-symfony": "^1.0",
28-
"phpunit/phpunit": "^10.3",
27+
"phpunit/phpunit": "^10.5",
2928
"riverline/multipart-parser": "^2.0",
3029
"slam/phpstan-extensions": "^6.0",
31-
"squizlabs/php_codesniffer": "^3.7.1",
3230
"symfony/browser-kit": "^6.4|^7.0",
3331
"symfony/console": "^6.4|^7.0",
3432
"symfony/dependency-injection": "^6.4|^7.0",

0 commit comments

Comments
 (0)