From d064b328222ef3a4e2d0643b048c3fae26e3bf2a Mon Sep 17 00:00:00 2001 From: Oleg Zhulnev Date: Mon, 26 Apr 2021 23:07:14 +0300 Subject: [PATCH 1/2] Upgrade xdebug-handler to v2 and handle that `coverage` option is set in case of Xdebug 3 --- composer.json | 2 +- composer.lock | 17 +++++++++-------- src/Console/XdebugHandler.php | 2 +- src/TestFramework/Coverage/CoverageChecker.php | 6 +++--- .../Coverage/CoverageCheckerTest.php | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 15e8e3cee..73a498e4f 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", - "composer/xdebug-handler": "^1.3.3", + "composer/xdebug-handler": "^2.0", "infection/abstract-testframework-adapter": "^0.3.1", "infection/extension-installer": "^0.1.0", "infection/include-interceptor": "^0.2.4", diff --git a/composer.lock b/composer.lock index a1557791c..ed315368f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2cf9f7ad9129eedccb617b0efc35bd51", + "content-hash": "e8ce59a79035c70a8366658b643e172a", "packages": [ { "name": "composer/xdebug-handler", - "version": "1.4.5", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "f28d44c286812c714741478d968104c5e604a1d4" + "reference": "31d57697eb1971712a08031cfaff5a846d10bdf5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f28d44c286812c714741478d968104c5e604a1d4", - "reference": "f28d44c286812c714741478d968104c5e604a1d4", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/31d57697eb1971712a08031cfaff5a846d10bdf5", + "reference": "31d57697eb1971712a08031cfaff5a846d10bdf5", "shasum": "" }, "require": { @@ -25,7 +25,8 @@ "psr/log": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", "autoload": { @@ -51,7 +52,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/1.4.5" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.0" }, "funding": [ { @@ -67,7 +68,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T08:04:11+00:00" + "time": "2021-04-09T19:40:06+00:00" }, { "name": "infection/abstract-testframework-adapter", diff --git a/src/Console/XdebugHandler.php b/src/Console/XdebugHandler.php index 661f303f9..6e7bb10e0 100644 --- a/src/Console/XdebugHandler.php +++ b/src/Console/XdebugHandler.php @@ -52,7 +52,7 @@ public static function check(LoggerInterface $logger): void { // We force the color option unconditionally since it is able to detect the --no-ansi option // to disable it if necessary - (new ComposerXdebugHandler(self::PREFIX, '--ansi')) + (new ComposerXdebugHandler(self::PREFIX)) ->setLogger($logger) ->setPersistent() ->check() diff --git a/src/TestFramework/Coverage/CoverageChecker.php b/src/TestFramework/Coverage/CoverageChecker.php index 919513385..fe5ee8711 100644 --- a/src/TestFramework/Coverage/CoverageChecker.php +++ b/src/TestFramework/Coverage/CoverageChecker.php @@ -101,9 +101,9 @@ public function checkCoverageRequirements(): void if (!$this->skipCoverage && !$this->hasCoverageGeneratorEnabled()) { throw new CoverageNotFound(<<isXdebugIncludedInInitialTestPhpOptions() diff --git a/tests/phpunit/TestFramework/Coverage/CoverageCheckerTest.php b/tests/phpunit/TestFramework/Coverage/CoverageCheckerTest.php index 878145c0e..75bf53d7c 100644 --- a/tests/phpunit/TestFramework/Coverage/CoverageCheckerTest.php +++ b/tests/phpunit/TestFramework/Coverage/CoverageCheckerTest.php @@ -140,9 +140,9 @@ public function test_it_needs_code_coverage_generator_enabled_if_coverage_is_not $this->expectException(CoverageNotFound::class); $this->expectExceptionMessage(<< Date: Mon, 26 Apr 2021 23:33:00 +0300 Subject: [PATCH 2/2] remove comment block as outdated --- src/Console/XdebugHandler.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Console/XdebugHandler.php b/src/Console/XdebugHandler.php index 6e7bb10e0..c9f1c0b56 100644 --- a/src/Console/XdebugHandler.php +++ b/src/Console/XdebugHandler.php @@ -50,8 +50,6 @@ final class XdebugHandler public static function check(LoggerInterface $logger): void { - // We force the color option unconditionally since it is able to detect the --no-ansi option - // to disable it if necessary (new ComposerXdebugHandler(self::PREFIX)) ->setLogger($logger) ->setPersistent()