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

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.

CommentFileSizeAuthor
#10 2707371_10.patch12.27 KBmile23
#4 2707371_4.patch25.24 KBmile23
#2 2707371_2.patch25.24 KBmile23

Comments

Mile23 created an issue. See original summary.

mile23’s picture

Status: Active » Needs review
StatusFileSize
new25.24 KB

A few false positives remain, relating to @code and @endcode throwing "Tags must be grouped together in a doc comment".

As always, other issues could work on other parts of core, or we could commit here and then rescope.

dawehner’s picture

Status: Needs review » Needs work
Issue tags: +Needs reroll

a) this patch needs a reroll

Beside from that this fixes all the issues in \Drupal\Component

mile23’s picture

Issue tags: -Needs reroll
StatusFileSize
new25.24 KB

Thanks, @dawehner.

Rerolled. Still has the false positives with @code and @encode.

mile23’s picture

Status: Needs work » Needs review

ewps.

dawehner’s picture

Still has the false positives with @code and @encode.

Is there anything we can do about that? I think we would have to fix the rules itself. Is there some issue about it already?

mile23’s picture

pfrenssen’s picture

Issue summary: View changes
alexpott’s picture

Title: Fix 'Drupal.Commenting.DocComment' coding standard for Drupal\Component » Fix 'Drupal.Commenting.DocComment' coding standard
Status: Needs review » Needs work

Let's not only fix component. Let's do each error in Drupal.Commenting.DocComment one by one for the entire codebase.

mile23’s picture

Status: Needs work » Needs review
StatusFileSize
new12.27 KB

OK. Using the technique in: #2571965-63: [meta] Fix PHP coding standards in core, stage 1

I generated this report of all the errors in DocComment:

   1 Drupal.Commenting.DocComment.SpacingAfterTagGroup
   1 Drupal.Commenting.DocComment.WrongEnd
   2 Drupal.Commenting.DocComment.SpacingBetween
   3 Drupal.Commenting.DocComment.ContentAfterOpen
   6 Drupal.Commenting.DocComment.SpacingBeforeShort
   9 Drupal.Commenting.DocComment.TagValueIndent
  17 Drupal.Commenting.DocComment.ShortStartSpace
  29 Drupal.Commenting.DocComment.LongNotCapital
  38 Drupal.Commenting.DocComment.ParamGroup
  43 Drupal.Commenting.DocComment.SpacingAfter
  70 Drupal.Commenting.DocComment.ParamNotFirst
  71 Drupal.Commenting.DocComment.SpacingBeforeTags
  85 Drupal.Commenting.DocComment.LongFullStop
  88 Drupal.Commenting.DocComment.ShortNotCapital
 240 Drupal.Commenting.DocComment.ShortFullStop
 244 Drupal.Commenting.DocComment.TagsNotGrouped
 500 Drupal.Commenting.DocComment.ShortSingleLine
 592 Drupal.Commenting.DocComment.TagGroupSpacing
1283 Drupal.Commenting.DocComment.MissingShort

This patch deals with SpacingAfterTagGroup, WrongEnd, SpacingBetween, ContentAfterOpen, SpacingBeforeShort, and TagValueIndent. Chosen to make the patch easy to review.

pfrenssen’s picture

Status: Needs review » Reviewed & tested by the community

This looks good. Short and easy to review. Patch still applies. PHPCS comes back clean. This part is RTBC.

If this gets committed, how do we move on from here? Do we leave the issue open and tackle the next set of sniffs? Or do we deal with the remainder in follow-ups?

+++ b/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
@@ -15,9 +15,9 @@ class ZfExtensionManagerSfContainer implements ReaderManagerInterface, WriterMan
    * A map of characters to be replaced through strtr.

+++ b/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
@@ -126,9 +126,11 @@ public function providerTestSerialization() {
+/**
+ * Stub class where we can prophesize methods.
+ */
 class StubRequestHandlerResourcePlugin extends ResourceBase {
 
-  /** stub methods so they can be prophesied. */

Here is a hand made change. Alex prefers to have fully automatically generated patches, but I think that in this case it is warranted.

alexpott’s picture

Title: Fix 'Drupal.Commenting.DocComment' coding standard » Fix several errors in the 'Drupal.Commenting.DocComment' coding standard
Status: Reviewed & tested by the community » Fixed

Committed d77d88c and pushed to 8.1.x and 8.2.x. Thanks!

We should open new issues.

@pfrenssen i just like focussed issues - not sprawling 100s of KB patches.

  • alexpott committed 3eeaeb6 on 8.2.x
    Issue #2707371 by Mile23: Fix several errors in the 'Drupal.Commenting....
mile23’s picture

Re #11: The automated change was erroneous anyway, with the wrong indentation. That's why I fixed it to be the class description instead of the method description.

mile23’s picture

Status: Fixed » Closed (fixed)

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