From bb2dd9efb71f952399ba702f24e786019fff2dfd Mon Sep 17 00:00:00 2001 From: Jeppe Knockaert Date: Sat, 16 May 2020 08:15:31 +0200 Subject: [PATCH 1/3] Fix the namespace usage in test/Unit/Task --- test/Unit/Task/AntTest.php | 2 +- test/Unit/Task/AtoumTest.php | 2 +- test/Unit/Task/BehatTest.php | 2 +- test/Unit/Task/BrunchTest.php | 2 +- test/Unit/Task/CodeceptionTest.php | 2 +- test/Unit/Task/ComposerNormalizeTest.php | 2 +- test/Unit/Task/ComposerRequireCheckerTest.php | 2 +- test/Unit/Task/ComposerScriptTest.php | 2 +- test/Unit/Task/ComposerTest.php | 2 +- test/Unit/Task/DeptracTest.php | 2 +- test/Unit/Task/DoctrineOrmTest.php | 2 +- test/Unit/Task/EcsTest.php | 2 +- test/Unit/Task/GherkinTest.php | 2 +- test/Unit/Task/Git/BlacklistTest.php | 2 +- test/Unit/Task/Git/CommitMessageTest.php | 2 +- test/Unit/Task/GruntTest.php | 2 +- test/Unit/Task/GulpTest.php | 2 +- test/Unit/Task/InfectionTest.php | 2 +- test/Unit/Task/KahlanTest.php | 2 +- test/Unit/Task/MakeTest.php | 2 +- test/Unit/Task/NpmScriptTest.php | 2 +- test/Unit/Task/ParatestTest.php | 2 +- test/Unit/Task/PhanTest.php | 2 +- test/Unit/Task/PhingTest.php | 2 +- test/Unit/Task/Php7ccTest.php | 2 +- test/Unit/Task/PhpCsFixerV2Test.php | 2 +- test/Unit/Task/PhpLintTest.php | 2 +- test/Unit/Task/PhpMdTest.php | 2 +- test/Unit/Task/PhpMndTest.php | 2 +- test/Unit/Task/PhpStanTest.php | 2 +- test/Unit/Task/PhpcsTest.php | 2 +- test/Unit/Task/PhpspecTest.php | 2 +- test/Unit/Task/PhpunitBridgeTest.php | 2 +- test/Unit/Task/PhpunitTest.php | 2 +- test/Unit/Task/ProgpilotTest.php | 2 +- test/Unit/Task/PsalmTest.php | 2 +- test/Unit/Task/RoboTest.php | 2 +- test/Unit/Task/SecurityCheckerTest.php | 2 +- test/Unit/Task/ShellTest.php | 2 +- test/Unit/Task/TwigCsTest.php | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/test/Unit/Task/AntTest.php b/test/Unit/Task/AntTest.php index b26984c53..6d76f2e4e 100644 --- a/test/Unit/Task/AntTest.php +++ b/test/Unit/Task/AntTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Ant; use GrumPHP\Task\Context\GitPreCommitContext; diff --git a/test/Unit/Task/AtoumTest.php b/test/Unit/Task/AtoumTest.php index 4548d8194..cb648a1ef 100644 --- a/test/Unit/Task/AtoumTest.php +++ b/test/Unit/Task/AtoumTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/BehatTest.php b/test/Unit/Task/BehatTest.php index 0fa7d53bd..03bb722c5 100644 --- a/test/Unit/Task/BehatTest.php +++ b/test/Unit/Task/BehatTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/BrunchTest.php b/test/Unit/Task/BrunchTest.php index d5602f12e..111927ae8 100644 --- a/test/Unit/Task/BrunchTest.php +++ b/test/Unit/Task/BrunchTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/CodeceptionTest.php b/test/Unit/Task/CodeceptionTest.php index 1e289f3d9..56f9245f0 100644 --- a/test/Unit/Task/CodeceptionTest.php +++ b/test/Unit/Task/CodeceptionTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/ComposerNormalizeTest.php b/test/Unit/Task/ComposerNormalizeTest.php index 08c0e93fb..71ebda715 100644 --- a/test/Unit/Task/ComposerNormalizeTest.php +++ b/test/Unit/Task/ComposerNormalizeTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/ComposerRequireCheckerTest.php b/test/Unit/Task/ComposerRequireCheckerTest.php index 0ab8bfe84..592b9f66d 100644 --- a/test/Unit/Task/ComposerRequireCheckerTest.php +++ b/test/Unit/Task/ComposerRequireCheckerTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/ComposerScriptTest.php b/test/Unit/Task/ComposerScriptTest.php index fc01f7353..1d81cf714 100644 --- a/test/Unit/Task/ComposerScriptTest.php +++ b/test/Unit/Task/ComposerScriptTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/ComposerTest.php b/test/Unit/Task/ComposerTest.php index b305a8b87..aab35f231 100644 --- a/test/Unit/Task/ComposerTest.php +++ b/test/Unit/Task/ComposerTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/DeptracTest.php b/test/Unit/Task/DeptracTest.php index 5e3059591..63b0f07a5 100644 --- a/test/Unit/Task/DeptracTest.php +++ b/test/Unit/Task/DeptracTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/DoctrineOrmTest.php b/test/Unit/Task/DoctrineOrmTest.php index a67c5ec42..335f7417d 100644 --- a/test/Unit/Task/DoctrineOrmTest.php +++ b/test/Unit/Task/DoctrineOrmTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/EcsTest.php b/test/Unit/Task/EcsTest.php index 648b4973c..583982e14 100644 --- a/test/Unit/Task/EcsTest.php +++ b/test/Unit/Task/EcsTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/GherkinTest.php b/test/Unit/Task/GherkinTest.php index e5c51ae76..21997c7f8 100644 --- a/test/Unit/Task/GherkinTest.php +++ b/test/Unit/Task/GherkinTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/Git/BlacklistTest.php b/test/Unit/Task/Git/BlacklistTest.php index eb0c424b8..0764789e2 100644 --- a/test/Unit/Task/Git/BlacklistTest.php +++ b/test/Unit/Task/Git/BlacklistTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task\Git; +namespace GrumPHPTest\Unit\Task\Git; use GrumPHP\IO\IOInterface; use GrumPHP\Task\Context\GitPreCommitContext; diff --git a/test/Unit/Task/Git/CommitMessageTest.php b/test/Unit/Task/Git/CommitMessageTest.php index 1f3c4f210..907501747 100644 --- a/test/Unit/Task/Git/CommitMessageTest.php +++ b/test/Unit/Task/Git/CommitMessageTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task\Git; +namespace GrumPHPTest\Unit\Task\Git; use GrumPHP\Collection\FilesCollection; use GrumPHP\Task\Context\ContextInterface; diff --git a/test/Unit/Task/GruntTest.php b/test/Unit/Task/GruntTest.php index e88b9376f..25fc34bd5 100644 --- a/test/Unit/Task/GruntTest.php +++ b/test/Unit/Task/GruntTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/GulpTest.php b/test/Unit/Task/GulpTest.php index 45e2659cb..1abcd2336 100644 --- a/test/Unit/Task/GulpTest.php +++ b/test/Unit/Task/GulpTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/InfectionTest.php b/test/Unit/Task/InfectionTest.php index d61ee9da0..b5b219edc 100644 --- a/test/Unit/Task/InfectionTest.php +++ b/test/Unit/Task/InfectionTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/KahlanTest.php b/test/Unit/Task/KahlanTest.php index 99463817b..57e9de28d 100644 --- a/test/Unit/Task/KahlanTest.php +++ b/test/Unit/Task/KahlanTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/MakeTest.php b/test/Unit/Task/MakeTest.php index 7ed5a7d82..01348def6 100644 --- a/test/Unit/Task/MakeTest.php +++ b/test/Unit/Task/MakeTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/NpmScriptTest.php b/test/Unit/Task/NpmScriptTest.php index 5e8dab6ad..15ca9b32a 100644 --- a/test/Unit/Task/NpmScriptTest.php +++ b/test/Unit/Task/NpmScriptTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/ParatestTest.php b/test/Unit/Task/ParatestTest.php index 0e5009458..c879153a6 100644 --- a/test/Unit/Task/ParatestTest.php +++ b/test/Unit/Task/ParatestTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PhanTest.php b/test/Unit/Task/PhanTest.php index 4bee4df20..152080c6f 100644 --- a/test/Unit/Task/PhanTest.php +++ b/test/Unit/Task/PhanTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PhingTest.php b/test/Unit/Task/PhingTest.php index 4ef2ffe79..026d092a8 100644 --- a/test/Unit/Task/PhingTest.php +++ b/test/Unit/Task/PhingTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/Php7ccTest.php b/test/Unit/Task/Php7ccTest.php index 5cddaa412..dc7d93b0b 100644 --- a/test/Unit/Task/Php7ccTest.php +++ b/test/Unit/Task/Php7ccTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Runner\TaskResult; use GrumPHP\Task\Context\GitPreCommitContext; diff --git a/test/Unit/Task/PhpCsFixerV2Test.php b/test/Unit/Task/PhpCsFixerV2Test.php index 9c7c648c0..2abec731f 100644 --- a/test/Unit/Task/PhpCsFixerV2Test.php +++ b/test/Unit/Task/PhpCsFixerV2Test.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Formatter\PhpCsFixerFormatter; use GrumPHP\Task\Context\GitPreCommitContext; diff --git a/test/Unit/Task/PhpLintTest.php b/test/Unit/Task/PhpLintTest.php index 2337d1e2e..4c060c107 100644 --- a/test/Unit/Task/PhpLintTest.php +++ b/test/Unit/Task/PhpLintTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PhpMdTest.php b/test/Unit/Task/PhpMdTest.php index 984572d49..1802219c6 100644 --- a/test/Unit/Task/PhpMdTest.php +++ b/test/Unit/Task/PhpMdTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PhpMndTest.php b/test/Unit/Task/PhpMndTest.php index dd14fb31d..e96f092c2 100644 --- a/test/Unit/Task/PhpMndTest.php +++ b/test/Unit/Task/PhpMndTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PhpStanTest.php b/test/Unit/Task/PhpStanTest.php index 21463896c..1efa57ad6 100644 --- a/test/Unit/Task/PhpStanTest.php +++ b/test/Unit/Task/PhpStanTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PhpcsTest.php b/test/Unit/Task/PhpcsTest.php index d63b63cf3..5590e05d5 100644 --- a/test/Unit/Task/PhpcsTest.php +++ b/test/Unit/Task/PhpcsTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Collection\ProcessArgumentsCollection; use GrumPHP\Exception\RuntimeException; diff --git a/test/Unit/Task/PhpspecTest.php b/test/Unit/Task/PhpspecTest.php index 434355990..6f92598e1 100644 --- a/test/Unit/Task/PhpspecTest.php +++ b/test/Unit/Task/PhpspecTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PhpunitBridgeTest.php b/test/Unit/Task/PhpunitBridgeTest.php index b7a201ea5..effa0cea0 100644 --- a/test/Unit/Task/PhpunitBridgeTest.php +++ b/test/Unit/Task/PhpunitBridgeTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PhpunitTest.php b/test/Unit/Task/PhpunitTest.php index ae139d3f4..f15085416 100644 --- a/test/Unit/Task/PhpunitTest.php +++ b/test/Unit/Task/PhpunitTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/ProgpilotTest.php b/test/Unit/Task/ProgpilotTest.php index b33c7977c..a3532517e 100644 --- a/test/Unit/Task/ProgpilotTest.php +++ b/test/Unit/Task/ProgpilotTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/PsalmTest.php b/test/Unit/Task/PsalmTest.php index 7aa70b0bc..19f02fe7c 100644 --- a/test/Unit/Task/PsalmTest.php +++ b/test/Unit/Task/PsalmTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/RoboTest.php b/test/Unit/Task/RoboTest.php index 0d75d8a6b..83d47cbb9 100644 --- a/test/Unit/Task/RoboTest.php +++ b/test/Unit/Task/RoboTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/SecurityCheckerTest.php b/test/Unit/Task/SecurityCheckerTest.php index e74d5ac91..69c0560c6 100644 --- a/test/Unit/Task/SecurityCheckerTest.php +++ b/test/Unit/Task/SecurityCheckerTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/ShellTest.php b/test/Unit/Task/ShellTest.php index 8a6607861..458ed48ea 100644 --- a/test/Unit/Task/ShellTest.php +++ b/test/Unit/Task/ShellTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; diff --git a/test/Unit/Task/TwigCsTest.php b/test/Unit/Task/TwigCsTest.php index 5b14904e7..656144bb2 100644 --- a/test/Unit/Task/TwigCsTest.php +++ b/test/Unit/Task/TwigCsTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace GrumPHPTest\Uni\Task; +namespace GrumPHPTest\Unit\Task; use GrumPHP\Task\Context\GitPreCommitContext; use GrumPHP\Task\Context\RunContext; From 3b86b380c961cdef99497c8c1b270a92b000b0b2 Mon Sep 17 00:00:00 2001 From: Jeppe Knockaert Date: Sat, 16 May 2020 08:54:13 +0200 Subject: [PATCH 2/3] Support composer v2 --- .travis.yml | 12 ++++++++---- composer.json | 7 +++---- src/Composer/GrumPHPPlugin.php | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6ee35012..513f5b1e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,9 @@ php: env: matrix: - - - - DEPENDENCIES=--prefer-lowest + - COMPOSER_VERSION=1 + - COMPOSER_VERSION=2 + - COMPOSER_VERSION=1 DEPENDENCIES=--prefer-lowest cache: directories: @@ -22,8 +23,11 @@ matrix: before_install: - phpenv config-rm xdebug.ini - - alias composer=composer\ --no-interaction && composer selfupdate - - composer global require hirak/prestissimo + - alias composer=composer\ --no-interaction && composer selfupdate --$COMPOSER_VERSION + - | + if [ $COMPOSER_VERSION -eq 1 ]; then + composer global require hirak/prestissimo + fi; install: - travis_retry composer update --no-progress --profile --no-scripts --no-suggest $DEPENDENCIES diff --git a/composer.json b/composer.json index ff5cda7ce..c8363255f 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require": { "php": "^7.2", "ext-json": "*", - "composer-plugin-api": "~1.0", + "composer-plugin-api": "~1.0 || ~2.0", "doctrine/collections": "~1.2", "gitonomy/gitlib": "^1.0.3", "monolog/monolog": "~1.16 || ^2.0", @@ -32,10 +32,9 @@ "symfony/yaml": "~3.4 || ~4.0 || ~5.0" }, "require-dev": { - "brianium/paratest": "~3.1", - "composer/composer": "~1.9", + "brianium/paratest": "~3.1 || dev-master", + "composer/composer": "~1.9 || ^2.0@dev", "ergebnis/composer-normalize": "~2.1", - "friendsofphp/php-cs-fixer": "~2.16", "jakub-onderka/php-parallel-lint": "~1.0", "nikic/php-parser": "~3.1", "phpspec/phpspec": "~6.1", diff --git a/src/Composer/GrumPHPPlugin.php b/src/Composer/GrumPHPPlugin.php index 4212b6575..2bb612a45 100644 --- a/src/Composer/GrumPHPPlugin.php +++ b/src/Composer/GrumPHPPlugin.php @@ -65,6 +65,20 @@ public function activate(Composer $composer, IOInterface $io): void $this->io = $io; } + /** + * {@inheritdoc} + */ + public function deactivate(Composer $composer, IOInterface $io) + { + } + + /** + * {@inheritdoc} + */ + public function uninstall(Composer $composer, IOInterface $io) + { + } + /** * Attach package installation events:. * From 9604e7636ef233053c6a5245aafcff5eefc89739 Mon Sep 17 00:00:00 2001 From: Toon Verwerft Date: Tue, 26 May 2020 16:16:26 +0200 Subject: [PATCH 3/3] Hardcode PHP 7.4.3 because of openssl issue (https://bugs.php.net/bug.php?id=79589) --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 153fb6f5b..ae073544c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: - dependencies: highest php_version: 7.3 - dependencies: highest - php_version: 7.4 + php_version: 7.4.3 # OpenSSL issue will be resolved in 7.4.6 project_directory: c:\projects\grumphp composer_directory: c:\tools\composer