Part of meta-issue #2571965: [meta] Fix PHP coding standards in core, stage 1
Step 1: Preparation
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 & configure PHPCS
Install PHP CodeSniffer and the ruleset from the Coder module:
$ composer install
$ ./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.
| Comment | File | Size | Author |
|---|---|---|---|
| #29 | 2901730-29.patch | 153.13 KB | idebr |
| #29 | interdiff-26-29.txt | 1.24 KB | idebr |
Comments
Comment #2
mfernea commentedHere is the patch.
Comment #4
mfernea commentedRe-roll.
Comment #6
mfernea commentedRe-roll.
Comment #7
mfernea commentedUpdate patch for new issues.
Comment #9
mfernea commentedRe-roll.
Comment #10
borisson_This looks great, I'm assuming all the newlines are ok. I haven't looked at all of those, so I reviewed this by applying the patch and running
git diff --ignore-blank-lines core/. Those changes are very minimal and they all look great.Comment #12
mfernea commentedComment #13
mfernea commentedRe-roll
Comment #15
borisson_I don't understand why the testbot doesn't like this patch. But we should figure out why it's failing (I retested and it came back with the same failure). I applied the same patch (now on a fresh version of drupal core) and did the same checking I did in #10 and the patch still looks good to me.
Comment #16
mfernea commentedLooking at https://dispatcher.drupalci.org/job/drupal_patches/ it seems that all the jobs are failing due to drupal/coder issue. I can't find any issue related to this. I'll keep looking. Anyway, let's retest this after a while.
Comment #17
mfernea commented#2919786: drupal/coder in composer.lock broken resulting in broken composer install this is the issue.
Comment #18
borisson_In that case, this one is good to go, will re-rtbc tomorrow.
Comment #19
borisson_Back to rtbc.
Comment #20
xjmThese three rules would probably be better in separate patches; two of them are very small and one is massive, but also could be easily reviewed programmatically with a porcelain diff.
Comment #21
mfernea commentedI added #2923884: Fix 'Squiz.WhiteSpace.SemicolonSpacing' coding standard and #2923886: Fix 'Squiz.WhiteSpace.LanguageConstructSpacing' coding standard.
I changed the scope of this issue.
Comment #22
mfernea commentedHere is the patch that only fixes Squiz.WhiteSpace.FunctionSpacing.
Comment #24
ankitjain28may commentedI have fixed the phpcs error for Squiz.WhiteSpace.FunctionSpacing, Please review.
Comment #26
ankitjain28may commentedThat patch was the wrong one, I fixed it again, please review
Comment #27
borisson_Patch no longer applies
Comment #28
ankitjain28may commentedOk, i will re-roll the patch.
Comment #29
idebr commentedComment #30
borisson_The testbot agrees with this patch, and I ran
composer phpcslocally and got no remaining errors.Looks great!
Comment #31
alexpottCommitted b8f93d5 and pushed to 8.6.x. Thanks!