diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index b306ede..22368bd 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -12,11 +12,16 @@ jobs: - name: "Switch default PHP Version to 8.1" run: sudo update-alternatives --set php /usr/bin/php8.1 + - name: "Print versions" + run: | + php --version + tools/phpstan --version + - name: "Install Composer dependencies" - run: composer install + run: composer install --no-dev - name: "PHPStan" - run: vendor/bin/phpstan + run: tools/phpunit composer_normalize: runs-on: ubuntu-20.04 @@ -47,11 +52,13 @@ jobs: - name: "Switch default PHP to: ${{ matrix.version }}" run: sudo update-alternatives --set php ${{ matrix.version }} - - name: "Print PHP version" - run: php --version + - name: "Print versions" + run: | + php --version + tools/phpunit --version - - name: "Print PHPUnit --version" - run: tools/phpunit --version + - name: "Install Composer dependencies" + run: composer install - name: "PHPUnit" run: tools/phpunit \ No newline at end of file diff --git a/.phive/phars.xml b/.phive/phars.xml index ccc38d9..434c078 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -1,4 +1,5 @@ + diff --git a/Makefile b/Makefile index e3c07c0..8199aa0 100644 --- a/Makefile +++ b/Makefile @@ -23,4 +23,4 @@ test: .PHONY: lint lint: - docker exec psr3-log-context-container vendor/bin/phpstan \ No newline at end of file + docker exec psr3-log-context-container tools/phpstan \ No newline at end of file diff --git a/composer.json b/composer.json index c61c3b8..7667dde 100644 --- a/composer.json +++ b/composer.json @@ -16,9 +16,6 @@ "require": { "php": ">=8.1" }, - "require-dev": { - "phpstan/phpstan": "^1.10" - }, "scripts": { "normalize": "./bin/json-normalize composer.json 2" }, diff --git a/phpstan.neon b/phpstan.neon index d461cdd..484be13 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,5 +1,4 @@ parameters: level: 9 paths: - - src - - tests \ No newline at end of file + - src \ No newline at end of file diff --git a/tools/phpstan b/tools/phpstan new file mode 100755 index 0000000..c5cab46 Binary files /dev/null and b/tools/phpstan differ