Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/982/head
catch 2022-11-30 13:47:28 +00:00
parent c74514d72b
commit f8fad5fee1
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/includes/install.inc
View File

@ -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);
}
}

4
core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php
View File

@ -161,9 +161,7 @@ class CKEditor5UpdateImageToolbarItemTest extends UpdatePathTestBase {
'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>'],
];
}
}

2
core/modules/locale/locale.module
View File

@ -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);
}
}

6
core/scripts/dev/commit-code-check.sh
View File

@ -239,8 +239,8 @@ printf "\n"
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 @@ for FILE in $FILES; do
############################################################################
### 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=$?