From 125dedb5c22c89765b65581647b2926069f50cb9 Mon Sep 17 00:00:00 2001 From: Mike Madison <22753451+mikemadison13@users.noreply.github.com> Date: Mon, 7 Nov 2022 10:36:03 -0800 Subject: [PATCH] Fixes #4625 to remove composer/xdebug-handler. (#4629) --- composer.json | 1 - composer.lock | 139 +------------------------------ src/Robo/Inspector/Inspector.php | 11 --- 3 files changed, 1 insertion(+), 150 deletions(-) diff --git a/composer.json b/composer.json index 3c6a8449c..26d315b01 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "composer-plugin-api": "^2.0", "composer-runtime-api": "^2.0", "acquia/drupal-environment-detector": "^1.5.0", - "composer/xdebug-handler": "^3.0", "consolidation/comments": "^1.0", "consolidation/config": "^1.0.0 || ^2.0.0", "consolidation/robo": "^3", diff --git a/composer.lock b/composer.lock index ff345aa46..7d44c6d13 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c64ef8cf46688f32f31f975a76f51085", + "content-hash": "43a6b632663e590c5d76977ba6f5ee2f", "packages": [ { "name": "acquia/drupal-environment-detector", @@ -173,77 +173,6 @@ }, "time": "2022-09-15T09:13:57+00:00" }, - { - "name": "composer/pcre", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/composer/pcre.git", - "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", - "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^1.3", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Pcre\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "PCRE wrapping library that offers type-safe preg_* replacements.", - "keywords": [ - "PCRE", - "preg", - "regex", - "regular expression" - ], - "support": { - "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.0.0" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2022-02-25T20:21:48+00:00" - }, { "name": "composer/semver", "version": "3.3.2", @@ -325,72 +254,6 @@ ], "time": "2022-04-01T19:23:25+00:00" }, - { - "name": "composer/xdebug-handler", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", - "shasum": "" - }, - "require": { - "composer/pcre": "^1 || ^2 || ^3", - "php": "^7.2.5 || ^8.0", - "psr/log": "^1 || ^2 || ^3" - }, - "require-dev": { - "phpstan/phpstan": "^1.0", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Composer\\XdebugHandler\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" - } - ], - "description": "Restarts a process without Xdebug.", - "keywords": [ - "Xdebug", - "performance" - ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2022-02-25T21:32:43+00:00" - }, { "name": "consolidation/annotated-command", "version": "4.5.7", diff --git a/src/Robo/Inspector/Inspector.php b/src/Robo/Inspector/Inspector.php index 164a06c95..22568bf40 100644 --- a/src/Robo/Inspector/Inspector.php +++ b/src/Robo/Inspector/Inspector.php @@ -10,7 +10,6 @@ use Acquia\Blt\Robo\Config\ConfigAwareTrait; use Acquia\Blt\Robo\Config\YamlConfigProcessor; use Acquia\Blt\Robo\Exceptions\BltException; -use Composer\XdebugHandler\XdebugHandler; use Consolidation\Config\Loader\YamlConfigLoader; use League\Container\ContainerAwareInterface; use League\Container\ContainerAwareTrait; @@ -577,7 +576,6 @@ public function isSchemaVersionUpToDate() { public function issueEnvironmentWarnings($command_name) { if (!$this->warningsIssued) { $this->warnIfPhpOutdated(); - $this->warnIfXdebugActive(); $this->warningsIssued = TRUE; } @@ -596,15 +594,6 @@ public function warnIfPhpOutdated() { } } - /** - * Warns the user if the xDebug extension is loaded. - */ - protected function warnIfXdebugActive(): void { - if (XdebugHandler::isXdebugActive()) { - $this->logger->warning("The xDebug extension is active. This will significantly decrease performance."); - } - } - /** * Determines if the active config is identical to sync directory. *