Commit 619c6254 authored by catch's avatar catch
Browse files

Issue #3324540 by alexpott, longwave: PHPCS fails on Drupal 10 & 9 

(cherry picked from commit f8fad5fe)
parent 389d0aa7

core/includes/install.inc

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ function drupal_install_system($install_state) { 
  // its dependencies, and here the dependencies will be installed as well.

  if ($provider !== 'core') {

    $autoload = $connection->getConnectionOptions()['autoload'] ?? '';

    if (strpos($autoload, 'src/Driver/Database/') !== FALSE) {

    if (str_contains($autoload, 'src/Driver/Database/')) {

      $kernel->getContainer()->get('module_installer')->install([$provider], TRUE);

    }

  }

core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php

+1 −3
Original line number Diff line number Diff line
@@ -161,9 +161,7 @@ public function provider(): array { 
            'filter_html' => $filter_html_is_enabled,

            'image uploads' => $image_uploads_enabled,

            'sourceEditing already enabled' => $source_editing_already_enabled,

            'expected sourceEditing additions' => $image_uploads_enabled

              ? []

              : ['<img data-entity-uuid data-entity-type>'],

            'expected sourceEditing additions' => $image_uploads_enabled ? [] : ['<img data-entity-uuid data-entity-type>'],

          ];

        }

      }

core/modules/locale/locale.module

+1 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ function _locale_refresh_translations($langcodes, $lids = []) { 
  if (!empty($langcodes)) {

    // Update javascript translations if any of the strings has a javascript

    // location, or if no string ids were provided, update all languages.

    if (empty($lids) || ($strings = \Drupal::service('locale.storage')->getStrings(['lid' => $lids, 'type' => 'javascript']))) {

    if (empty($lids) || !empty(\Drupal::service('locale.storage')->getStrings(['lid' => $lids, 'type' => 'javascript']))) {

      array_map('_locale_invalidate_js', $langcodes);

    }

  }

core/scripts/dev/commit-code-check.sh

+3 −3
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ 
printf -- '-%.0s' {1..100}

printf "\n"



# When the file core/phpcs.xml.dist has been changed, then PHPCS must check all files.

if [[ $PHPCS_XML_DIST_FILE_CHANGED == "1" ]]; then

# Run PHPCS on all files on DrupalCI or when phpcs files are changed.

if [[ $PHPCS_XML_DIST_FILE_CHANGED == "1" ]] || [[ "$DRUPALCI" == "1" ]]; then

  # Test all files with phpcs rules.

  vendor/bin/phpcs -ps --parallel=$(nproc) --standard="$TOP_LEVEL/core/phpcs.xml.dist"

  PHPCS=$?
@@ -351,7 +351,7 @@ 
  ############################################################################

  ### PHP AND YAML FILES

  ############################################################################

  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.(inc|install|module|php|profile|test|theme|yml)$ ]] && [[ $PHPCS_XML_DIST_FILE_CHANGED == "0" ]]; then

  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.(inc|install|module|php|profile|test|theme|yml)$ ]] && [[ $PHPCS_XML_DIST_FILE_CHANGED == "0" ]] && [[ "$DRUPALCI" == "0" ]]; then

    # Test files with phpcs rules.

    vendor/bin/phpcs "$TOP_LEVEL/$FILE" --standard="$TOP_LEVEL/core/phpcs.xml.dist"

    PHPCS=$?