From 6671dce5b308cbbd3b8945ba687e6c6052f70a71 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Tue, 23 Jun 2020 19:36:54 +0200 Subject: [PATCH] [BUGFIX] Always use the Composer-installed tools (#49) Add the full relative path to Composer-installed binaries to make sure that are used instead of other versions that happen to be in the path. Also drop unneeded trailing slashes from directories used in Composer scripts. --- CHANGELOG.md | 1 + composer.json | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32e951e..c125a5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). - Drop the dependency of `roave/security-advisories` ### Fixed +- Always use the Composer-installed tools (#49) - Avoid unwanted higher PHP versions (#50) - Stop caching `vendor/` on Travis CI (#51) - Use the PHP version from the matrix in the CI (#48) diff --git a/composer.json b/composer.json index aeaa402..bf64d12 100644 --- a/composer.json +++ b/composer.json @@ -63,11 +63,11 @@ "vendor-dir": ".Build/vendor" }, "scripts": { - "ci:php:lint": "find *.php Classes/ Configuration/ Tests/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l", - "ci:php:sniff": "phpcs Classes Tests", - "ci:ts:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript/", - "ci:tests:unit": "phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit/", - "ci:tests:functional": "find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTests.xml {}';", + "ci:php:lint": "find *.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l", + "ci:php:sniff": ".Build/vendor/bin/phpcs Classes Tests", + "ci:ts:lint": ".Build/vendor/bin/typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript", + "ci:tests:unit": ".Build/vendor/bin/phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit", + "ci:tests:functional": "find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/vendor/bin/phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTests.xml {}';", "ci:tests": [ "@ci:tests:unit", "@ci:tests:functional"