This mostly affects documentation but there are a couple of functions that are wrongly indented as well.

Comments

jhodgdon’s picture

Status: Needs review » Reviewed & tested by the community

Looks good to me. Thanks!

webchick’s picture

Priority: Normal » Minor
Issue tags: +Will cause commit conflicts

Reducing priority since this isn't a functional bug.

Also tagging, as it may make sense to batch this with other changes that cause other patches to be re-rolled.

jhodgdon’s picture

Assigned: Unassigned » webchick

Assigning to webchick for commit, since I'm not sure what the schedule is for disruptive patches.

longwave’s picture

Status: Reviewed & tested by the community » Needs review
StatusFileSize
new52.97 KB

Original patch no longer applies, here's an updated one with even more fixes I missed the first time round.

Status: Needs review » Needs work

The last submitted patch, 4: indentation.patch, failed testing.

The last submitted patch, 4: indentation.patch, failed testing.

longwave’s picture

Status: Needs work » Needs review
StatusFileSize
new52.65 KB
longwave’s picture

StatusFileSize
new51.05 KB

Rerolled.

jhodgdon’s picture

Status: Needs review » Needs work

I carefully checked the latest patch and agree with all of the indentation changes. However, there was one finger slip:

+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageControllerInterface.php
@@ -3,7 +3,7 @@
 /**
  * @file
  * Contains \Drupal\taxonomy\TermStorageControllerInterface.
-*/
+ w*/
 
 namespace Drupal\taxonomy;
longwave’s picture

Status: Needs work » Needs review
StatusFileSize
new51.04 KB
new501 bytes

Whoops, sorry about that.

jhodgdon’s picture

Status: Needs review » Reviewed & tested by the community

Thanks!

alexpott’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs reroll

indentation_3.patch no longer applies.

error: patch failed: core/modules/search/lib/Drupal/search/Plugin/SearchPluginBase.php:95
error: core/modules/search/lib/Drupal/search/Plugin/SearchPluginBase.php: patch does not apply

martin107’s picture

Status: Needs work » Needs review
StatusFileSize
new50.21 KB

ReRoll

martin107’s picture

Issue tags: -Needs reroll
lhangea’s picture

Status: Needs review » Reviewed & tested by the community

the patch applied cleanly

alexpott’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs reroll

indentation_13.patch no longer applies.

error: core/lib/Drupal/Core/Template/TwigReferenceFunctions.php: No such file or directory

martin107’s picture

Status: Needs work » Needs review
Issue tags: -Needs reroll
StatusFileSize
new49.62 KB

Reroll..

next disruptive patch period is 20th to 23rd

jhodgdon’s picture

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

Patch doesn't apply; needs reroll again. Disruptive patch window is today and tomorrow!

martin107’s picture

Status: Needs work » Needs review
StatusFileSize
new41.46 KB

Reroll... lots of places where head has already been corrected. Lots of code moving file... lots of places to go wrong... lets see what testbot has to say

martin107’s picture

Issue tags: -Needs reroll
jhodgdon’s picture

Status: Needs review » Reviewed & tested by the community

Thanks! This all looks correct to me. We should get it in before it doesn't apply again.

dries’s picture

Status: Reviewed & tested by the community » Fixed

Committed to 8.x. Thanks.

  • Commit 82f25bf on 8.x by Dries:
    Issue #2168321 by longwave, martin107: Several files have incorrect...

Status: Fixed » Closed (fixed)

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