diff --git a/composer.json b/composer.json index 506ebc413d..71dcc9605c 100644 --- a/composer.json +++ b/composer.json @@ -54,14 +54,8 @@ ], "post-package-install": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup", "post-package-update": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup", - "phpcs": [ - "Drupal\\Core\\Composer\\Composer::exportVendor", - "phpcs --standard=core/phpcs.xml.dist --runtime-set installed_paths $COMPOSER_VENDOR_DIR/drupal/coder/coder_sniffer --" - ], - "phpcbf": [ - "Drupal\\Core\\Composer\\Composer::exportVendor", - "phpcbf --standard=core/phpcs.xml.dist --runtime-set installed_paths $COMPOSER_VENDOR_DIR/drupal/coder/coder_sniffer --" - ] + "phpcs": "phpcs --standard=core/phpcs.xml.dist --runtime-set installed_paths $($COMPOSER_BINARY config vendor-dir)/drupal/coder/coder_sniffer --", + "phpcbf": "phpcbf --standard=core/phpcs.xml.dist --runtime-set installed_paths $($COMPOSER_BINARY config vendor-dir)/drupal/coder/coder_sniffer --" }, "repositories": [ { diff --git a/core/lib/Drupal/Core/Composer/Composer.php b/core/lib/Drupal/Core/Composer/Composer.php index bd0d56771c..016f93a348 100644 --- a/core/lib/Drupal/Core/Composer/Composer.php +++ b/core/lib/Drupal/Core/Composer/Composer.php @@ -198,16 +198,6 @@ public static function vendorTestCodeCleanup(PackageEvent $event) { } } - /** - * Exports the vendor directory as an environment variable. - * - * @param \Composer\Script\Event $event - * The composer script event. - */ - public static function exportVendor(Event $event) { - putenv("COMPOSER_VENDOR_DIR=" . $event->getComposer()->getConfig()->get('vendor-dir')); - } - /** * Find the array key for a given package name with a case-insensitive search. *