diff --git a/composer.json b/composer.json
index 9847ad0d2363f73ca9bf251e6f0b8871aa99dc70..02690c6307ac36f2bacd745d77c4381803d06002 100644
--- a/composer.json
+++ b/composer.json
@@ -50,8 +50,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"
],
"post-package-install": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup",
"post-package-update": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup"
diff --git a/core/composer.json b/core/composer.json
index 0904a6fafda8930dd73956cb80c8e53dba58eefa..2a564b616064c41cd204d54e0fc3c7923b08a0ef 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 1ca6262c9b284dcf626c42e0b4594bdf60b2433f..bdb0127c467c39029d6fe8b94bb30c518b19cb3e 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.
@@ -137,28 +136,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.
*
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index be8c46eab43325390f9f222025d67c06fb4d8aad..a593e62c7d4ca5a02007af38483b109ce8e67cdf 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -12,16 +12,16 @@
<!-- Only include specific sniffs that pass. This ensures that, if new sniffs are added, HEAD does not fail.-->
<!-- Drupal sniffs -->
- <rule ref="Drupal.Classes.ClassCreateInstance"/>
- <rule ref="Drupal.Classes.ClassDeclaration"/>
- <rule ref="Drupal.Classes.FullyQualifiedNamespace"/>
- <rule ref="Drupal.Classes.UnusedUseStatement"/>
- <rule ref="Drupal.CSS.ClassDefinitionNameSpacing"/>
- <rule ref="Drupal.CSS.ColourDefinition"/>
- <rule ref="Drupal.Commenting.ClassComment">
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Classes/ClassCreateInstanceSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Classes/ClassDeclarationSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Classes/FullyQualifiedNamespaceSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Classes/UnusedUseStatementSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/CSS/ColourDefinitionSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Commenting/ClassCommentSniff.php">
<exclude name="Drupal.Commenting.ClassComment.Missing"/>
</rule>
- <rule ref="Drupal.Commenting.DocComment">
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentSniff.php">
<!-- Sniff for these errors: SpacingAfterTagGroup, WrongEnd, SpacingBetween,
ContentAfterOpen, SpacingBeforeShort, TagValueIndent, ShortStartSpace,
SpacingAfter -->
@@ -41,9 +41,9 @@
<exclude name="Drupal.Commenting.DocComment.TagGroupSpacing"/>
<exclude name="Drupal.Commenting.DocComment.MissingShort"/>
</rule>
- <rule ref="Drupal.Commenting.DocCommentStar"/>
- <rule ref="Drupal.Commenting.FileComment"/>
- <rule ref="Drupal.Commenting.FunctionComment">
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentStarSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Commenting/FileCommentSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php">
<exclude name="Drupal.Commenting.FunctionComment.IncorrectTypeHint"/>
<exclude name="Drupal.Commenting.FunctionComment.InvalidNoReturn"/>
<exclude name="Drupal.Commenting.FunctionComment.InvalidReturnNotVoid"/>
@@ -65,41 +65,40 @@
<exclude name="Drupal.Commenting.FunctionComment.ReturnTypeSpaces"/>
<exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
</rule>
- <rule ref="Drupal.ControlStructures.ElseIf"/>
- <rule ref="Drupal.ControlStructures.ControlSignature"/>
- <rule ref="Drupal.Files.EndFileNewline"/>
- <rule ref="Drupal.Files.TxtFileLineLength"/>
- <rule ref="Drupal.Formatting.SpaceInlineIf"/>
- <rule ref="Drupal.Formatting.SpaceUnaryOperator"/>
- <rule ref="Drupal.Functions.DiscouragedFunctions"/>
- <rule ref="Drupal.Functions.FunctionDeclaration.SpaceAfter"/>
- <rule ref="Drupal.Functions.FunctionDeclaration.SpaceBeforeParenthesis"/>
- <rule ref="Drupal.InfoFiles.AutoAddedKeys"/>
- <rule ref="Drupal.InfoFiles.ClassFiles"/>
- <rule ref="Drupal.InfoFiles.DuplicateEntry"/>
- <rule ref="Drupal.InfoFiles.Required"/>
- <rule ref="Drupal.Scope.MethodScope"/>
- <rule ref="Drupal.Semantics.EmptyInstall"/>
- <rule ref="Drupal.Semantics.FunctionT">
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/ControlStructures/ElseIfSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/ControlStructures/ControlSignatureSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Files/EndFileNewlineSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Files/TxtFileLineLengthSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Formatting/SpaceInlineIfSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Formatting/SpaceUnaryOperatorSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Functions/DiscouragedFunctionsSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Functions/FunctionDeclarationSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/InfoFiles/AutoAddedKeysSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/InfoFiles/ClassFilesSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/InfoFiles/DuplicateEntrySniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/InfoFiles/RequiredSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Scope/MethodScopeSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/EmptyInstallSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTSniff.php">
<exclude name="Drupal.Semantics.FunctionT.BackslashSingleQuote"/>
<exclude name="Drupal.Semantics.FunctionT.NotLiteralString"/>
<exclude name="Drupal.Semantics.FunctionT.ConcatString"/>
</rule>
- <rule ref="Drupal.Semantics.FunctionWatchdog"/>
- <rule ref="Drupal.Semantics.InstallHooks"/>
- <rule ref="Drupal.Semantics.LStringTranslatable"/>
- <rule ref="Drupal.Semantics.PregSecurity"/>
- <rule ref="Drupal.Semantics.TInHookMenu"/>
- <rule ref="Drupal.Semantics.TInHookSchema"/>
- <rule ref="Drupal.WhiteSpace.Comma"/>
- <rule ref="Drupal.WhiteSpace.ObjectOperatorIndent"/>
- <rule ref="Drupal.WhiteSpace.ObjectOperatorSpacing"/>
- <rule ref="Drupal.WhiteSpace.OpenTagNewline"/>
- <rule ref="Drupal.WhiteSpace.OperatorSpacing"/>
- <rule ref="Drupal.WhiteSpace.ScopeIndent"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/FunctionWatchdogSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/InstallHooksSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/LStringTranslatableSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/PregSecuritySniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/TInHookMenuSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/TInHookSchemaSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/CommaSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenTagNewlineSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/OperatorSpacingSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeIndentSniff.php"/>
<!-- Drupal Practice sniffs -->
- <rule ref="DrupalPractice.Commenting.ExpectedException"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/DrupalPractice/Sniffs/Commenting/ExpectedExceptionSniff.php"/>
<!-- Generic sniffs -->
<rule ref="Generic.Files.LineEndings"/>