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.

Status: Needs review » Needs work

The last submitted patch, Drupal.Commenting.ClassComment.patch, failed testing.

mikebell_’s picture

What commit was this made against? I'm happy to help split it down into more manageable patches so it's not so huge.

attiks’s picture

It is a first test run using a script, to see how easy we can automate it, all ideas welcome but best to post them in the parent issue

The last submitted patch, Drupal.Commenting.ClassComment.patch, failed testing.

tatarbj’s picture

This patch just generate more coding standard bugs, it really needs a deep check and fix all of those empty doc what are generated with this patch.

attiks’s picture

Issue summary: View changes
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.

Status: Needs work » Needs review
pfrenssen’s picture

Issue summary: View changes
andriyun’s picture

Status: Needs review » Needs work

patch outdated

andriyun’s picture

Status: Needs work » Needs review
FileSize
72.27 KB

New patch with removed Drupal.Commenting.ClassComment sniff from phpcs.xml.dist file.

Status: Needs review » Needs work

The last submitted patch, 12: Drupal.Commenting.ClassComment-2572633-12.patch, failed testing.

andypost’s picture

Status: Needs work » Needs review
Related issues: +#2610984: Add Archive Tar via Composer, with BC shim

Suppose this issue should not be blocked because changing only a doc block

+++ b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
@@ -107,7 +107,9 @@ function gzseek($zp, $offset, $whence = SEEK_SET)
-// Drupal change class Archive_Tar extends PEAR.
+/**
+ *Drupal change class Archive_Tar extends PEAR.
+ */

This is only change in blocker #2610984: Add Archive Tar via Composer, with BC shim

Status: Needs review » Needs work

The last submitted patch, 12: Drupal.Commenting.ClassComment-2572633-12.patch, failed testing.

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.

akhilavnair’s picture

Is this issue still relevant?

andriyun’s picture

Issue tags: +Needs reroll

Patch is outdated

vprocessor’s picture

Assigned: Unassigned » vprocessor
vprocessor’s picture

Status: Needs work » Needs review
FileSize
74.69 KB

Hi guys,
reroll is ready, waiting for tests

Status: Needs review » Needs work

The last submitted patch, 20: Drupal.Commenting.ClassComment-2572633-20.patch, failed testing.

andypost’s picture

+++ b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
@@ -108,7 +108,9 @@ function gzseek($zp, $offset, $whence = SEEK_SET)
-// Drupal change class Archive_Tar extends PEAR.
+/**
+ *Drupal change class Archive_Tar extends PEAR.
+ */

do not change this file, please
this one is vendor locked

vprocessor’s picture

Status: Needs review » Needs work

The last submitted patch, 23: Drupal.Commenting.ClassComment-2572633-23.patch, failed testing.

andypost’s picture

  1. +++ b/core/modules/forum/src/Form/Overview.php
    @@ -10,8 +10,10 @@
    -/*
    - * Provides forum overview form for the forum vocabulary.
    +/**
    + *
    + *Provides forum overview form for the forum vocabulary.
    

    that's wrong

  2. +++ b/core/modules/forum/src/Form/Overview.php
    @@ -10,8 +10,10 @@
    + * ¶
    

    hm

  3. +++ b/core/modules/migrate/tests/src/Unit/MigrationTest.php
    @@ -174,8 +174,7 @@ public function setMigrationPluginManager(MigrationPluginManagerInterface $plugi
     interface RequirementsAwareSourceInterface extends MigrateSourceInterface, RequirementsInterface {}
    -
     /**
      * Defines the RequirementsAwareDestinationInterface.
      */
    -interface RequirementsAwareDestinationInterface extends MigrateDestinationInterface, RequirementsInterface {}
    +interface RequirementsAwareDestinationInterface extends MigrateDestinationInterface, RequirementsInterface {}
    \ No newline at end of file
    

    any reason?

  4. +++ b/core/modules/taxonomy/src/Form/OverviewTerms.php
    @@ -9,8 +9,10 @@
    -/*
    - * Provides terms overview form for a taxonomy vocabulary.
    +/**
    + *
    + *Provides terms overview form for a taxonomy vocabulary.
    

    the same

  5. +++ b/core/modules/taxonomy/src/Form/OverviewTerms.php
    @@ -9,8 +9,10 @@
    + * ¶
    

    hm

  6. +++ b/core/modules/views/src/Plugin/views/PluginInterface.php
    @@ -3,7 +3,9 @@
    -
    +/**
    
    +++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
    @@ -956,14 +956,18 @@ protected static function userEntityInfo() {
    -
    +/**
    ...
    -
    +/**
    + *
    + */
    

    there's a lot of changes like this
    but there should be empty line before phpdoc

  7. +++ b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
    @@ -249,7 +249,9 @@ public function testExecuteCountQueryWithOffset() {
    -// As StatementInterface extends \Traversable, which though always needs
    -// an additional interface. The Statement class itself can't be mocked because
    -// of its __wakeup function.
    +/**
    + *As StatementInterface extends \Traversable, which though always needs
    + *an additional interface. The Statement class itself can't be mocked because
    + *of its __wakeup function.
    

    here should be space after * for each line

  8. +++ b/core/phpcs.xml.dist
    @@ -46,4 +46,68 @@
    -</ruleset>
    +  <!--Blacklist of coding standard rules that are not yet fixed. Ref. https://www.drupal.org/node/2571965-->
    +  <rule ref="Drupal">
    

    I'm sure those was remove for reason, check history of the file

  9. +++ b/core/phpcs.xml.dist
    @@ -46,4 +46,68 @@
    +</ruleset>
    \ No newline at end of file
    

    hm

vprocessor’s picture

The last submitted patch, 23: Drupal.Commenting.ClassComment-2572633-23.patch, failed testing.

andypost’s picture

Assigned: vprocessor » Unassigned
Status: Needs review » Needs work
Issue tags: -Needs reroll

I see no reason in empty doc blocks, so they should be filled and

+++ b/composer.json
@@ -5,7 +5,9 @@
-        "wikimedia/composer-merge-plugin": "~1.3"
+        "wikimedia/composer-merge-plugin": "~1.3",

+++ b/composer.lock
@@ -4,8 +4,8 @@
-    "content-hash": "7d72dc63a3981fb6edb92f6786ba94b1",
+    "hash": "5ad0250761817c1eff9e751c886f2290",

this changes should be removed!

vprocessor’s picture

>>this changes should be removed!

ok

vprocessor’s picture

vprocessor’s picture

Status: Needs work » Needs review
alexpott’s picture

Status: Needs review » Needs work
  1. +++ b/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
    @@ -4,7 +4,9 @@
    +/**
    + *
    + */
     class MigrateEntityRevision implements ContainerDeriverInterface {
    

    We can't just add empty comments - that's silly. This issue is going to take a long time to solve. Each class needs its own documentation. I suggest we split this sniff up into separate issues to fix each sub sniff. See latest patch on #2707641: Ensure core compliance to Drupal.Commenting.FunctionComment.ParamCommentIndentation (part 2) for an example of how to dow this.

  2. +++ b/core/modules/migrate/tests/src/Unit/MigrationTest.php
    @@ -174,8 +174,7 @@ public function setMigrationPluginManager(MigrationPluginManagerInterface $plugi
    \ No newline at end of file
    

    This is weird there is a new line at the end of the file in HEAD

vprocessor’s picture

Assigned: Unassigned » vprocessor
pfrenssen’s picture

Issue summary: View changes
pfrenssen’s picture

Issue summary: View changes
pfrenssen’s picture

Issue summary: View changes
andypost’s picture

Here is a manually fixed patch after "phpcbf" and excluded "Missing" subsniffer

I think missing doc blocks needs separate issue

dawehner’s picture

Status: Needs review » Reviewed & tested by the community

Perfect

alexpott’s picture

Status: Reviewed & tested by the community » Fixed

Committed 246c162 and pushed to 8.1.x. Thanks!

  • alexpott committed 94c628a on 8.2.x
    Issue #2572633 by vprocessor, andypost, attiks, andriyun: Fix 'Drupal....

Status: Fixed » Closed (fixed)

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