Running ../vendor/bin/phpcs produces a few coding standards regression that can be auto-fixed with phpcbf.

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

klausi created an issue. See original summary.

klausi’s picture

Status: Active » Needs review
FileSize
5.61 KB

patch.

dawehner’s picture

Status: Needs review » Reviewed & tested by the community

I'm a bit curious how this happened ...

  • xjm committed 6ca61af on 8.4.x
    Issue #2851510 by klausi: Fix phpcs regressions by running phpcbf
    

  • xjm committed a8b38b7 on 8.3.x
    Issue #2851510 by klausi: Fix phpcs regressions by running phpcbf
    
    (...
xjm’s picture

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

Is this with 8.2.8? Must be since I don't see the @return things etc.

I'll ask around about committers' pre-commit hooks. I botched a commit in the opposite way because I was already apparently on 8.2.10 and am not yet relying on the dev dependency.

Committed to both branches to avoid merge conflicts/backport issues. Thanks!

xjm’s picture

We could also check git blame to see which committer might need to tweak their toolchain.

xjm’s picture

  1. [ibnsina:maintainer | Fri 16:20:21] $ git log -L 170,171:core/modules/node/src/Plugin/migrate/source/d7/Node.php
    commit e9d7b6d1606633fecf2a70896060561765e2d442
    Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
    Date:   Mon Feb 6 18:33:33 2017 +0000
    
        Issue #2669964 by quietone, Gábor Hojtsy, Jo Fitzgerald, phenaproxima: Migrate Drupal 7 core node translations to Drupal 8
        
        (cherry picked from commit 69c0eadb845e53ded6926680cd83658713da42bd)
    
    diff --git a/core/modules/node/src/Plugin/migrate/source/d7/Node.php b/core/modules/node/src/Plugin/migrate/source/d7/Node.php
    --- a/core/modules/node/src/Plugin/migrate/source/d7/Node.php
    +++ b/core/modules/node/src/Plugin/migrate/source/d7/Node.php
    @@ -104,1 +169,2 @@
    +  }
     }
  2. [ibnsina:maintainer | Fri 16:20:42] $ git log -L 43,44:core/modules/book/src/Tests/BookInstallTest.php
    commit c021387ca50d3fd98ba3538fb2ab63d350891fb7
    Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
    Date:   Wed Jan 11 22:12:49 2017 +0000
    
        Issue #2714497 by Peacog, mangy.fox, riteshsarraf, Sophie.SK: Pre-existing 'book' content type prevents book module installation
    
    diff --git a/core/modules/book/src/Tests/BookInstallTest.php b/core/modules/book/src/Tests/BookInstallTest.php
    --- /dev/null
    +++ b/core/modules/book/src/Tests/BookInstallTest.php
    @@ -0,0 +42,2 @@
    +    } catch (PreExistingConfigException $e) {
    +      $this->fail("Expected exception thrown trying to install Book module: " . $e->getMessage());
    
  3. diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php
    --- /dev/null
    [ibnsina:maintainer | Fri 16:25:00] $ git log -L 86,87:core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
    
    commit 9d095b9455b883f86da0f687b5f286db2a520368
    Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
    Date:   Tue Dec 6 11:09:47 2016 +0000
    
        Issue #2717969 by Wim Leers, benelori, dawehner: REST views: Views field is not displayed as token, if exclude flag is set and the display is RestExport
    
    diff --git a/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php b/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
    --- /dev/null
    +++ b/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
    @@ -0,0 +86,3 @@
    +
    +
    +}
    
  4. git log -L 9,11:core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
    
    commit 98350348f3fd41bf900ff457c1c866e3bfb85ef5
    Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
    Date:   Wed Dec 14 14:06:14 2016 +0000
    
        Issue #2746671 by Jo Fitzgerald, stella, andrewmacpherson, hussainweb, tom friedhof, chriscalip, mikeryan: CCK field data not available for D7 taxonomy term migrations
    
    diff --git a/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php b/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
    --- /dev/null
    +++ b/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
    @@ -0,0 +9,4 @@
    +use Drupal\migrate\Exception\RequirementsException;
    +use Drupal\migrate\Plugin\Migration;
    +use Drupal\migrate\Plugin\MigrationDeriverTrait;
    +use Drupal\migrate_drupal\Plugin\MigrateCckFieldPluginManagerInterface;
  5. [ibnsina:maintainer | Fri 16:25:11] $ git log -L 5,7:core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
    commit 740ccca37f6f3255e8afcf3246ce8cd7de05a12e
    Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
    Date:   Fri Dec 2 13:38:53 2016 +0000
    
        Issue #2811841 by hchonov, tstoeckler, Berdir: Add test coverage ensuring user input is mapped on the correct form elements when elements are reordered
    
    diff --git a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
    --- /dev/null
    +++ b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
    @@ -0,0 +7,3 @@
    +use Drupal\Core\Field\FieldStorageDefinitionInterface;
    +use Drupal\field\Entity\FieldConfig;
    +use Drupal\field\Entity\FieldStorageConfig;
    
  6. [ibnsina:maintainer | Fri 16:48:24] $ git log -L 164,166:core/modules/views/src/Tests/Plugin/FilterTest.php
    commit 1f0a629875ae4f1b63ca218573145b3a5491081b
    Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
    Date:   Mon Dec 19 21:57:47 2016 +0000
    
        Issue #2651328 by aerozeppelin, GeduR: Views Handler Filter InOperator exposed fires illegal choice when all option has been selected
    
    diff --git a/core/modules/views/src/Tests/Plugin/FilterTest.php b/core/modules/views/src/Tests/Plugin/FilterTest.php
    --- a/core/modules/views/src/Tests/Plugin/FilterTest.php
    +++ b/core/modules/views/src/Tests/Plugin/FilterTest.php
    @@ -141,1 +164,2 @@
    +  }
     }
    
  7. [ibnsina:maintainer | Fri 16:27:42] $ git log -L 16,16:core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
    commit 740ccca37f6f3255e8afcf3246ce8cd7de05a12e
    Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
    Date:   Fri Dec 2 13:38:53 2016 +0000
    
        Issue #2811841 by hchonov, tstoeckler, Berdir: Add test coverage ensuring user input is mapped on the correct form elements when elements are reordered
    
    diff --git a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
    --- /dev/null
    +++ b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
    @@ -0,0 +18,1 @@
    +
    
  8. [ibnsina:maintainer | Fri 16:35:54] $ git log -L 123,125:core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
    commit 1c16b7688f5f03e9d110189ba647e836db15e700
    Author: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
    Date:   Wed Feb 8 14:14:09 2017 +0000
    
        Issue #2847687 by jp.stacey, dawehner: EntityAccessCheck mandates instanceof EntityInterface when it only needs AccessibleInterface
        
        (cherry picked from commit 5b2cb036e898c69905156b080c121aac49e7f91c)
    
    diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
    --- a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
    +++ b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
    @@ -82,1 +123,2 @@
    +  }
     }
    
xjm’s picture

Sorry, editing to trim that log to the relevant commits.

xjm’s picture

That was messier than it should have been. Anyway, looks like catch's pre-commit hook sniffs broke in December or so. I pinged him about it.

Thanks!

cilefen’s picture

xjm’s picture

For clarity, #11 is the potential fix for my issue, not @catch's AFAIK.

Status: Fixed » Closed (fixed)

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