diff --git a/core/composer.json b/core/composer.json
index 3970b28..b0472ee 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -172,8 +172,7 @@
"scripts": {
"pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
"post-autoload-dump": [
- "Drupal\\Core\\Composer\\Composer::ensureHtaccess",
- "Drupal\\Core\\Composer\\Composer::configurePhpcs"
+ "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
]
}
}
diff --git a/core/lib/Drupal/Core/Composer/Composer.php b/core/lib/Drupal/Core/Composer/Composer.php
index b2dc781..012b0d7 100644
--- a/core/lib/Drupal/Core/Composer/Composer.php
+++ b/core/lib/Drupal/Core/Composer/Composer.php
@@ -6,7 +6,6 @@
use Composer\Script\Event;
use Composer\Installer\PackageEvent;
use Composer\Semver\Constraint\Constraint;
-use PHP_CodeSniffer;
/**
* Provides static functions for composer script events.
@@ -138,28 +137,6 @@ public static function ensureHtaccess(Event $event) {
}
/**
- * Configures phpcs if present.
- *
- * @param \Composer\Script\Event $event
- */
- public static function configurePhpcs(Event $event) {
- // Grab the local repo which tells us what's been installed.
- $local_repository = $event->getComposer()
- ->getRepositoryManager()
- ->getLocalRepository();
- // Make sure both phpcs and coder are installed.
- $phpcs_package = $local_repository->findPackage('squizlabs/php_codesniffer', '*');
- $coder_package = $local_repository->findPackage('drupal/coder', '*');
- if (!empty($phpcs_package) && !empty($coder_package)) {
- $config = $event->getComposer()->getConfig();
- $vendor_dir = $config->get('vendor-dir');
- // Set phpcs' installed_paths config to point to our coder_sniffer
- // directory.
- PHP_CodeSniffer::setConfigData('installed_paths', $vendor_dir . '/drupal/coder/coder_sniffer');
- }
- }
-
- /**
* Remove possibly problematic test files from vendored projects.
*
* @param \Composer\Installer\PackageEvent $event
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index e82c85a..e668599 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -12,16 +12,16 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -41,9 +41,9 @@
-
-
-
+
+
+
@@ -59,37 +59,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+