diff --git a/core/includes/install.inc b/core/includes/install.inc index c43a7e159dc4dcdf22d10e057f84244f36d11672..c8dd224cab5e7cbd31715b070c7db893a5b7dfdc 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -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); } } diff --git a/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php b/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php index 659d0e8b0c8875c3f7ef06cac04a7db9f50b74dc..32975e105d2cd7f2a7d5c48f43d64d2c7709ac98 100644 --- a/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php +++ b/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php @@ -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>'], ]; } } diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index 46ca8fbcfdbc7ee13587cef10f66cd14fff102c2..5c8cad917080b708904b9357ba369bf17713c305 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -1060,7 +1060,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); } } diff --git a/core/scripts/dev/commit-code-check.sh b/core/scripts/dev/commit-code-check.sh index bf0e26834893dcbfc10dfa223692d3f8e05fe1b2..5df56e12edbaff17bb92a47732d25dc9922fa2da 100755 --- a/core/scripts/dev/commit-code-check.sh +++ b/core/scripts/dev/commit-code-check.sh @@ -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=$?