Part of #2571965: [meta] Fix PHP coding standards in core.

Approach

We are testing coding standards with PHP CodeSniffer, using the Drupal coding standards from the Coder module. Both of these packages are not installed in Drupal core. We need to do a couple of steps in order to download and configure them so we can run a coding standards check.

Step 1: Add the coding standard to the whitelist

Every coding standard is identified by a "sniff". For example, an imaginary coding standard that would require all llamas to be placed inside a square bracket fence would be called the "Drupal.AnimalControlStructure.BracketedFence sniff". There are dozens of such coding standards, and to make the work easier we have started by only whitelisting the sniffs that pass. For the moment all coding standards that are not yet fixed are simply skipped during the test.

Open the file core/phpcs.xml.dist and add a line for the sniff of this ticket. The sniff name is in the issue title. Make sure your patch will include the addition of this line.

Step 2: Install PHP CodeSniffer and the ruleset from the Coder module

Both of these packages are not installed by default in Drupal core, so we need to download them. This can be done with Composer, from the root folder of your Drupal installation:

$ composer require drupal/coder squizlabs/php_codesniffer
$ ./vendor/bin/phpcs --config-set installed_paths ../../drupal/coder/coder_sniffer

Once you have installed the phpcs package, you can list all the sniffs available to you like this:

$ ./vendor/bin/phpcs --standard=Drupal -e

This will give you a big list of sniffs, and the Drupal-based ones should be present.

Step 3: Prepare the phpcs.xml file

To speed up the testing you should make a copy of the file phpcs.xml.dist (in the core/ folder) and save it as phpcs.xml. This is the configuration file for PHP CodeSniffer.

We only want this phpcs.xml file to specify the sniff we're interested in. So we need to remove all the rule items, and add only our own sniff's rule. Rule items look like this:

<rule ref="Drupal.Classes.UnusedUseStatement"/>

Remove all of them, and add only the sniff from this issue title. This will make sure that our tests run quickly, and are not going to contain any output from unrelated sniffs.

Step 4: Run the test

Now you are ready to run the test! From within the core/ folder, run the following command to launch the test:

$ cd core/
$ ../vendor/bin/phpcs -p

This takes a couple of minutes. The -p flag shows the progress, so you have a bunch of nice dots to look at while it is running.

Step 5: Fix the failures

When the test is complete it will present you a list of all the files that contain violations of your sniff, and the line numbers where the violations occur. You could fix all of these manually, but thankfully phpcbf can fix many of them. You can call phpcbf like this:

$ ../vendor/bin/phpcbf

This will fix the errors in place. You can then make a diff of the changes using git. You can also re-run the test with phpcs and determine if that fixed all of them.

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

attiks created an issue. See original summary.

DuaelFr’s picture

Issue tags: -Novice

As agreed between the mentors at Drupalcon, according to issues to avoid for novices, I am untagging this issue as "Beginner". This issue contains changes across a very wide range of files and might create too many other patches to need to be rerolled at this particular time. This patch has an automated way to be rerolled later so better to implement it after Drupalcon.

pfrenssen’s picture

Issue summary: View changes

Version: 8.0.x-dev » 8.1.x-dev

Drupal 8.0.6 was released on April 6 and is the final bugfix release for the Drupal 8.0.x series. Drupal 8.0.x will not receive any further development aside from security fixes. Drupal 8.1.0-rc1 is now available and sites should prepare to update to 8.1.0.

Bug reports should be targeted against the 8.1.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.2.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

alexpott’s picture

Status: Needs review » Needs work

Needs a reworking - phpcs.xml.dist is now inclusive so we have to add the rule to that and not exclude it.

pfrenssen’s picture

Issue summary: View changes
pfrenssen’s picture

Issue summary: View changes
andypost’s picture

Version: 8.1.x-dev » 8.2.x-dev
Status: Needs work » Needs review
FileSize
430.82 KB

autofixing mostly good
4527 Drupal.WhiteSpace.CloseBracketSpacing.ClosingWhitespace

Status: Needs review » Needs work

The last submitted patch, 8: 2572787-8.patch, failed testing.

pfrenssen’s picture

Issue summary: View changes
dawehner’s picture

Issue tags: +Needs reroll
hussainweb’s picture

Status: Needs work » Needs review
Issue tags: -Needs reroll
FileSize
434.65 KB

Fixing it with:

phpcbf --standard=Drupal --sniffs=Drupal.WhiteSpace.CloseBracketSpacing --extensions=inc,install,module,php,profile,test,theme .

Status: Needs review » Needs work

The last submitted patch, 12: fix-2572787-12.patch, failed testing.

Version: 8.2.x-dev » 8.3.x-dev

Drupal 8.2.0-beta1 was released on August 3, 2016, which means new developments and disruptive changes should now be targeted against the 8.3.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.3.x-dev » 8.4.x-dev

Drupal 8.3.0-alpha1 will be released the week of January 30, 2017, which means new developments and disruptive changes should now be targeted against the 8.4.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

RoSk0’s picture

Applied to latest 8.4.x.

klausi’s picture

Status: Needs review » Needs work
+++ b/core/lib/Drupal/Core/Config/ConfigManager.php
@@ -452,7 +452,7 @@ protected function callOnDependencyRemoval(ConfigEntityInterface $entity, array
-        array_map(function ($entity) { return $entity->getConfigDependencyName(); }, $affected_dependencies[$dependency_type]),
+        array_map(function ($entity) { return $entity->getConfigDependencyName();}, $affected_dependencies[$dependency_type]),

As me and alexpott said: this fix is wrong. Either we need to include other sniffs here that push this in a correct way to the next line or we need to exclude this file from being checked with PHPCS. Same for the other anonymous function changes in this patch.

And the change to phpcs.xml.dist is missing. Did you forget to enable this new rule in the config file?

Version: 8.4.x-dev » 8.5.x-dev

Drupal 8.4.0-alpha1 will be released the week of July 31, 2017, which means new developments and disruptive changes should now be targeted against the 8.5.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

andriyun’s picture

Status: Needs work » Needs review
FileSize
317.02 KB
mfernea’s picture

Status: Needs review » Reviewed & tested by the community

RTBC as:

  • No cs issues reported by tests.
  • Fixes only issues related to targeted sniff.
  • No non-whitespace changes (git diff --color-words)
alexpott’s picture

Status: Reviewed & tested by the community » Needs review
FileSize
289.37 KB
31.68 KB

The patch in #19 no longer applies because #2911280: RectangleTest.php takes a very long time to scan for coding standards got committed which moves a lot of data out of test. So the patch is way smaller - which made it simpler to see that the patch also contained core/phpcs.local.xml which is not right. New patch attached removes the changes to RectangleTest.php and the unnecessary file.

andriyun’s picture

Status: Needs review » Reviewed & tested by the community

Great!
Thank you
Now patch is more clear and small

  • No cs issues reported by tests.
  • Fixes only issues related to targeted sniff.
  • No non-whitespace changes (git diff --color-words)

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 21: 2572787-21.patch, failed testing. View results

mfernea’s picture

Status: Needs work » Needs review

Re-roll.

mfernea’s picture

martin107’s picture

Status: Needs review » Reviewed & tested by the community

I have had a slow visual scan of the patch ... all looks ok

patch applies.
no out of scope changes.
core/phpcs.xml.dist --- updated

this is ready to go...

  • xjm committed db5e828 on 8.5.x
    Issue #2572787 by alexpott, mfernea, attiks, andriyun, andypost, RoSk0,...
xjm’s picture

Version: 8.5.x-dev » 8.4.x-dev
Status: Reviewed & tested by the community » Fixed

I confirmed that all the changes in the patch are removing one trailing space before a ) or ] and that it fixes the rule completely. Committed to 8.5.x and cherry-picked to 8.4.x. I also re-ran phpcs on 8.4.x after the cherry-pick and confirmed there weren't any missed fixes in the backport. Thanks!

  • xjm committed dba4fcf on 8.4.x
    Issue #2572787 by alexpott, mfernea, attiks, andriyun, andypost, RoSk0,...

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.