From af5e67b7d442278d72f6646554fb92dca5725914 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea <clau.cristea@gmail.com> Date: Wed, 15 Jan 2025 14:36:43 +0200 Subject: [PATCH 1/8] Update ddev/ddev-drupal-contrib --- .ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml | 4 ++-- .ddev/commands/web/eslint | 6 ++---- .ddev/commands/web/expand-composer-json | 7 +++++++ .ddev/commands/web/phpcbf | 2 +- .ddev/commands/web/phpcs | 2 +- .ddev/commands/web/phpstan | 1 - .ddev/commands/web/stylelint | 9 ++++----- .ddev/config.contrib.yaml | 3 ++- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml b/.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml index 8a527769..741667e9 100644 --- a/.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml +++ b/.ddev/addon-metadata/ddev-drupal-contrib/manifest.yaml @@ -1,7 +1,7 @@ name: ddev-drupal-contrib repository: ddev/ddev-drupal-contrib -version: 1.0.0-rc22 -install_date: "2024-10-28T09:48:30+02:00" +version: 1.0.0-rc23 +install_date: "2025-01-15T14:35:04+02:00" project_files: - commands/web/eslint - commands/web/expand-composer-json diff --git a/.ddev/commands/web/eslint b/.ddev/commands/web/eslint index 571bc345..fb663f66 100755 --- a/.ddev/commands/web/eslint +++ b/.ddev/commands/web/eslint @@ -12,11 +12,9 @@ if "$DDEV_DOCROOT/core/node_modules/.bin/eslint" --version >/dev/null ; then test -e .prettierrc.json || ln -s $DDEV_DOCROOT/core/.prettierrc.json . test -e .prettierignore || echo '*.yml' > .prettierignore # Change directory to the project root folder - # cd "$DDEV_DOCROOT/modules/custom/$DDEV_SITENAME" || exit - # Anticipating https://github.com/ddev/ddev-drupal-contrib/pull/81 cd "$DDEV_DOCROOT/modules/custom/${DDEV_SITENAME//-/_}" || exit - "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/eslint" --no-error-on-unmatched-pattern --ignore-pattern="*.es6.js" --resolve-plugins-relative-to=$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core --ext=.js,.yml . "$@" + "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/eslint" --config="../../../core/.eslintrc.passing.json" --no-error-on-unmatched-pattern --ignore-pattern="*.es6.js" --resolve-plugins-relative-to=$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core --ext=.js,.yml . "$@" else - echo "eslint is not available. You may need to 'ddev yarn --cwd $DDEV_DOCROOT/core install'" + echo "eslint is not available. You may need to 'ddev exec \"cd $DDEV_DOCROOT/core && yarn install\"'" exit 1 fi diff --git a/.ddev/commands/web/expand-composer-json b/.ddev/commands/web/expand-composer-json index d24d8a02..48a8840f 100755 --- a/.ddev/commands/web/expand-composer-json +++ b/.ddev/commands/web/expand-composer-json @@ -10,5 +10,12 @@ export _WEB_ROOT=$DDEV_DOCROOT cd "$DDEV_COMPOSER_ROOT" || exit curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/scripts/expand_composer_json.php +if [[ ! -f composer.json ]]; then + echo "{}" > composer.json + _ddev_drupal_contrib_empty_composer=true +fi php expand_composer_json.php "$DDEV_SITENAME" rm -f expand_composer_json.php +if [ "$_ddev_drupal_contrib_empty_composer" = true ]; then + rm -f composer.json +fi diff --git a/.ddev/commands/web/phpcbf b/.ddev/commands/web/phpcbf index 9c1013ca..756d2b4c 100755 --- a/.ddev/commands/web/phpcbf +++ b/.ddev/commands/web/phpcbf @@ -12,4 +12,4 @@ if ! command -v phpcbf >/dev/null; then exit 1 fi test -e phpcs.xml.dist || curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/assets/phpcs.xml.dist -phpcbf -s --report-full --report-summary --report-source web/modules/custom "$@" +phpcbf -s --report-full --report-summary --report-source $DDEV_DOCROOT/modules/custom "$@" diff --git a/.ddev/commands/web/phpcs b/.ddev/commands/web/phpcs index 67288868..5df1fa9b 100755 --- a/.ddev/commands/web/phpcs +++ b/.ddev/commands/web/phpcs @@ -12,4 +12,4 @@ if ! command -v phpcs >/dev/null; then exit 1 fi test -e phpcs.xml.dist || curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/assets/phpcs.xml.dist -phpcs -s --report-full --report-summary --report-source web/modules/custom --ignore=*/.ddev/* "$@" +phpcs -s --report-full --report-summary --report-source $DDEV_DOCROOT/modules/custom --ignore=*/.ddev/* "$@" diff --git a/.ddev/commands/web/phpstan b/.ddev/commands/web/phpstan index ae151f6c..01fa27de 100755 --- a/.ddev/commands/web/phpstan +++ b/.ddev/commands/web/phpstan @@ -5,7 +5,6 @@ ## Description: Run phpstan inside the web container ## Usage: phpstan [flags] [args] ## Example: "ddev phpstan" or "ddev phpstan -n" -## ProjectTypes: drupal,drupal8,drupal9,drupal10 ## ExecRaw: true if ! command -v phpstan >/dev/null; then diff --git a/.ddev/commands/web/stylelint b/.ddev/commands/web/stylelint index f8af5b5e..99d082c3 100755 --- a/.ddev/commands/web/stylelint +++ b/.ddev/commands/web/stylelint @@ -7,12 +7,11 @@ ## Example: "ddev stylelint" ## ExecRaw: true -# Changed to follow https://github.com/ddev/ddev-drupal-contrib/pull/83 if $DDEV_DOCROOT/core/node_modules/.bin/stylelint --version >/dev/null ; then - # Change directory to the project root folder - cd "$DDEV_DOCROOT/modules/custom/${DDEV_SITENAME//-/_}" || exit - "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/stylelint" --color --config "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/.stylelintrc.json" "./**/*.css" "$@" + # Change directory to the project root folder + cd "$DDEV_DOCROOT/modules/custom/${DDEV_SITENAME//-/_}" || exit + "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/stylelint" --color --config "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/.stylelintrc.json" "./**/*.css" "$@" else - echo "stylelint is not available. You may need to 'ddev yarn --cwd $DDEV_DOCROOT/core install'" + echo "stylelint is not available. You may need to 'ddev exec \"cd $DDEV_DOCROOT/core && yarn install\"'" exit 1 fi diff --git a/.ddev/config.contrib.yaml b/.ddev/config.contrib.yaml index d5674613..e9e7b24c 100644 --- a/.ddev/config.contrib.yaml +++ b/.ddev/config.contrib.yaml @@ -1,7 +1,8 @@ #ddev-generated ## Command provided by https://github.com/ddev/ddev-drupal-contrib web_environment: - # If desired, override to a different version of Drupal core in via the project's DDEV config + # To change the Drupal core version, see the README: + # https://github.com/ddev/ddev-drupal-contrib/blob/main/README.md#changing-the-drupal-core-version - DRUPAL_CORE=^11 - SIMPLETEST_DB=mysql://db:db@db/db - SIMPLETEST_BASE_URL=http://web -- GitLab From 040aa345cf803a2df2834a1587b6dadf1fd8b1ff Mon Sep 17 00:00:00 2001 From: Claudiu Cristea <clau.cristea@gmail.com> Date: Wed, 15 Jan 2025 14:41:50 +0200 Subject: [PATCH 2/8] Pin Coder. See https://www.drupal.org/i/3483583 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 3a5a8003..ebbef38d 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,7 @@ "drupal/message_notify": "^1.0" }, "require-dev": { + "drupal/coder": "8.3.26", "drupal/rules": "^4.0", "drupal/symfony_mailer_lite": "^2.0", "drush/drush": "^12.5 || ^13.3" -- GitLab From 218ee7c719ebb5c05c43753dbcb96ec6b114b057 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea <clau.cristea@gmail.com> Date: Wed, 15 Jan 2025 14:42:23 +0200 Subject: [PATCH 3/8] Ignore recipes/ dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2b9dc5aa..9ff6d335 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ /.prettierrc.json /phpstan-baseline.neon /phpstan.neon +/recipes/ /vendor/ /web/ -- GitLab From fa7d5430f060aa79951799cfaf8b45f3423678d4 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea <clau.cristea@gmail.com> Date: Wed, 15 Jan 2025 14:44:42 +0200 Subject: [PATCH 4/8] Anticipate https://github.com/ddev/ddev-drupal-contrib/pull/99 --- .ddev/commands/web/phpstan | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ddev/commands/web/phpstan b/.ddev/commands/web/phpstan index 01fa27de..7c73132e 100755 --- a/.ddev/commands/web/phpstan +++ b/.ddev/commands/web/phpstan @@ -12,6 +12,8 @@ if ! command -v phpstan >/dev/null; then exit 1 fi test -e phpstan.neon || curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/assets/phpstan.neon +# See https://git.drupalcode.org/project/gitlab_templates/-/commit/a107b7f1f79af12e0b09f70be47b68e3f69b4504 +sed -i 's/BASELINE_PLACEHOLDER/phpstan-baseline.neon/g' phpstan.neon # Add an empty baseline file to ensure it exists. test -e phpstan-baseline.neon || touch phpstan-baseline.neon phpstan analyse $DDEV_DOCROOT/modules/custom "$@" -- GitLab From 8f8b3544a0de9cc7f731db4db1fcaeb2bf4da1b4 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea <clau.cristea@gmail.com> Date: Wed, 15 Jan 2025 14:46:07 +0200 Subject: [PATCH 5/8] Run eslint --fix --- .../private_message_notify.services.yml | 1 - private_message.libraries.yml | 8 ++++---- private_message.services.yml | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/private_message_notify/private_message_notify.services.yml b/modules/private_message_notify/private_message_notify.services.yml index 45c72776..93e34d85 100644 --- a/modules/private_message_notify/private_message_notify.services.yml +++ b/modules/private_message_notify/private_message_notify.services.yml @@ -1,5 +1,4 @@ services: - _defaults: autoconfigure: true autowire: true diff --git a/private_message.libraries.yml b/private_message.libraries.yml index 59c26e6e..7cd72ee9 100644 --- a/private_message.libraries.yml +++ b/private_message.libraries.yml @@ -14,22 +14,22 @@ utils: slide: js: - js/private_message_slide.js: { } + js/private_message_slide.js: {} dependencies: - core/drupal fader: js: - js/private_message_fader.js: { } + js/private_message_fader.js: {} dependencies: - core/drupal dimmer: js: - js/private_message_dimmer.js: { } + js/private_message_dimmer.js: {} css: theme: - css/private_message_dimmer.css: { } + css/private_message_dimmer.css: {} dependencies: - core/drupal - private_message/fader diff --git a/private_message.services.yml b/private_message.services.yml index ba9c4c53..48fa027f 100644 --- a/private_message.services.yml +++ b/private_message.services.yml @@ -1,5 +1,4 @@ services: - _defaults: autoconfigure: true autowire: true -- GitLab From b9f26e4f89cef86094bd1ed18b70f9d48143443f Mon Sep 17 00:00:00 2001 From: Claudiu Cristea <clau.cristea@gmail.com> Date: Wed, 15 Jan 2025 14:46:49 +0200 Subject: [PATCH 6/8] Run stylelint --fix --- css/private_message_inbox_block.css | 4 +-- css/private_message_notification_block.css | 8 ++--- css/private_message_thread.css | 42 +++++----------------- 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/css/private_message_inbox_block.css b/css/private_message_inbox_block.css index b0d22e56..95ff24ed 100644 --- a/css/private_message_inbox_block.css +++ b/css/private_message_inbox_block.css @@ -7,9 +7,7 @@ .block-private-message-inbox-block .private-message-thread:hover { background-color: gray; } -.block-private-message-inbox-block - .private-message-thread - .private-message-inbox-thread-link { +.block-private-message-inbox-block .private-message-thread .private-message-inbox-thread-link { position: absolute; top: 0; left: 0; diff --git a/css/private_message_notification_block.css b/css/private_message_notification_block.css index 5c46a429..15e7b3f6 100644 --- a/css/private_message_notification_block.css +++ b/css/private_message_notification_block.css @@ -22,14 +22,10 @@ color: #000; line-height: 26px; } -.block-private-message-notification-block - .unread-threads - .private-message-notification-image { +.block-private-message-notification-block .unread-threads .private-message-notification-image { right: 0; left: auto; } -.block-private-message-notification-block - .unread-threads - .private-message-page-link { +.block-private-message-notification-block .unread-threads .private-message-page-link { color: #f00; } diff --git a/css/private_message_thread.css b/css/private_message_thread.css index 6bc49b34..26e1e3a9 100644 --- a/css/private_message_thread.css +++ b/css/private_message_thread.css @@ -18,54 +18,28 @@ justify-content: flex-start; margin: 0 -5px; } -#private-message-page - .private-message-thread-full - .private-message-recipients - span, -#private-message-page - .private-message-thread-full - .private-message-recipients - article { +#private-message-page .private-message-thread-full .private-message-recipients span, +#private-message-page .private-message-thread-full .private-message-recipients article { padding: 0 5px; } -#private-message-page - .private-message-thread-full - .field--name-private-messages - .private-message { +#private-message-page .private-message-thread-full .field--name-private-messages .private-message { margin-top: -1px; padding: 5px; border: solid #ccc 1px; } -#private-message-page - .private-message-thread-full - .field--name-private-messages - .private-message - .field--name-created { +#private-message-page .private-message-thread-full .field--name-private-messages .private-message .field--name-created { float: right; } -#private-message-page - .private-message-thread-full - .field--name-private-messages - #load-previous-messages-button-wrapper { +#private-message-page .private-message-thread-full .field--name-private-messages #load-previous-messages-button-wrapper { border: solid #ccc 1px; } -#private-message-page - .private-message-thread-full - .field--name-private-messages - #load-previous-messages-button-wrapper.load-previous-position-before { +#private-message-page .private-message-thread-full .field--name-private-messages #load-previous-messages-button-wrapper.load-previous-position-before { border-bottom: none; } -#private-message-page - .private-message-thread-full - .field--name-private-messages - #load-previous-messages-button-wrapper.load-previous-position-after { +#private-message-page .private-message-thread-full .field--name-private-messages #load-previous-messages-button-wrapper.load-previous-position-after { border-top: none; } -#private-message-page - .private-message-thread-full - .field--name-private-messages - #load-previous-messages-button-wrapper - a { +#private-message-page .private-message-thread-full .field--name-private-messages #load-previous-messages-button-wrapper a { display: block; text-align: center; border-bottom: none; -- GitLab From a7c1e245e58ecc62946dc6a7e6aed74a4bcbdad2 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea <clau.cristea@gmail.com> Date: Wed, 15 Jan 2025 16:58:20 +0200 Subject: [PATCH 7/8] Revert "Run stylelint --fix" This reverts commit b9f26e4f89cef86094bd1ed18b70f9d48143443f. --- css/private_message_inbox_block.css | 4 ++- css/private_message_notification_block.css | 8 +++-- css/private_message_thread.css | 42 +++++++++++++++++----- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/css/private_message_inbox_block.css b/css/private_message_inbox_block.css index 95ff24ed..b0d22e56 100644 --- a/css/private_message_inbox_block.css +++ b/css/private_message_inbox_block.css @@ -7,7 +7,9 @@ .block-private-message-inbox-block .private-message-thread:hover { background-color: gray; } -.block-private-message-inbox-block .private-message-thread .private-message-inbox-thread-link { +.block-private-message-inbox-block + .private-message-thread + .private-message-inbox-thread-link { position: absolute; top: 0; left: 0; diff --git a/css/private_message_notification_block.css b/css/private_message_notification_block.css index 15e7b3f6..5c46a429 100644 --- a/css/private_message_notification_block.css +++ b/css/private_message_notification_block.css @@ -22,10 +22,14 @@ color: #000; line-height: 26px; } -.block-private-message-notification-block .unread-threads .private-message-notification-image { +.block-private-message-notification-block + .unread-threads + .private-message-notification-image { right: 0; left: auto; } -.block-private-message-notification-block .unread-threads .private-message-page-link { +.block-private-message-notification-block + .unread-threads + .private-message-page-link { color: #f00; } diff --git a/css/private_message_thread.css b/css/private_message_thread.css index 26e1e3a9..6bc49b34 100644 --- a/css/private_message_thread.css +++ b/css/private_message_thread.css @@ -18,28 +18,54 @@ justify-content: flex-start; margin: 0 -5px; } -#private-message-page .private-message-thread-full .private-message-recipients span, -#private-message-page .private-message-thread-full .private-message-recipients article { +#private-message-page + .private-message-thread-full + .private-message-recipients + span, +#private-message-page + .private-message-thread-full + .private-message-recipients + article { padding: 0 5px; } -#private-message-page .private-message-thread-full .field--name-private-messages .private-message { +#private-message-page + .private-message-thread-full + .field--name-private-messages + .private-message { margin-top: -1px; padding: 5px; border: solid #ccc 1px; } -#private-message-page .private-message-thread-full .field--name-private-messages .private-message .field--name-created { +#private-message-page + .private-message-thread-full + .field--name-private-messages + .private-message + .field--name-created { float: right; } -#private-message-page .private-message-thread-full .field--name-private-messages #load-previous-messages-button-wrapper { +#private-message-page + .private-message-thread-full + .field--name-private-messages + #load-previous-messages-button-wrapper { border: solid #ccc 1px; } -#private-message-page .private-message-thread-full .field--name-private-messages #load-previous-messages-button-wrapper.load-previous-position-before { +#private-message-page + .private-message-thread-full + .field--name-private-messages + #load-previous-messages-button-wrapper.load-previous-position-before { border-bottom: none; } -#private-message-page .private-message-thread-full .field--name-private-messages #load-previous-messages-button-wrapper.load-previous-position-after { +#private-message-page + .private-message-thread-full + .field--name-private-messages + #load-previous-messages-button-wrapper.load-previous-position-after { border-top: none; } -#private-message-page .private-message-thread-full .field--name-private-messages #load-previous-messages-button-wrapper a { +#private-message-page + .private-message-thread-full + .field--name-private-messages + #load-previous-messages-button-wrapper + a { display: block; text-align: center; border-bottom: none; -- GitLab From eb1987d5405a99d55039268b4fd683466df4f008 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea <clau.cristea@gmail.com> Date: Wed, 15 Jan 2025 17:17:57 +0200 Subject: [PATCH 8/8] Fix PHPStan issues --- src/Mapper/PrivateMessageMapper.php | 2 +- src/Mapper/PrivateMessageMapperInterface.php | 2 +- tests/src/Kernel/EntityDeleteTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mapper/PrivateMessageMapper.php b/src/Mapper/PrivateMessageMapper.php index 24a086c2..d00e10ac 100644 --- a/src/Mapper/PrivateMessageMapper.php +++ b/src/Mapper/PrivateMessageMapper.php @@ -2,7 +2,7 @@ namespace Drupal\private_message\Mapper; -@trigger_error(__CLASS__ . ' is deprecated in private_message:4.0.0 and is removed from private_message:5.0.0. No replacement is provided. See https://www.drupal.org/node/3490530', E_USER_DEPRECATED); +@trigger_error(__NAMESPACE__ . '\PrivateMessageMapper is deprecated in private_message:4.0.0 and is removed from private_message:5.0.0. No replacement is provided. See https://www.drupal.org/node/3490530', E_USER_DEPRECATED); use Drupal\Core\Database\Connection; use Drupal\Core\Database\Query\SelectInterface; diff --git a/src/Mapper/PrivateMessageMapperInterface.php b/src/Mapper/PrivateMessageMapperInterface.php index 45294330..a7144ec0 100644 --- a/src/Mapper/PrivateMessageMapperInterface.php +++ b/src/Mapper/PrivateMessageMapperInterface.php @@ -2,7 +2,7 @@ namespace Drupal\private_message\Mapper; -@trigger_error(__CLASS__ . ' is deprecated in private_message:4.0.0 and is removed from private_message:5.0.0. No replacement is provided. See https://www.drupal.org/node/3490530', E_USER_DEPRECATED); +@trigger_error(__NAMESPACE__ . '\PrivateMessageMapperInterface is deprecated in private_message:4.0.0 and is removed from private_message:5.0.0. No replacement is provided. See https://www.drupal.org/node/3490530', E_USER_DEPRECATED); use Drupal\private_message\Entity\PrivateMessageInterface; use Drupal\user\UserInterface; diff --git a/tests/src/Kernel/EntityDeleteTest.php b/tests/src/Kernel/EntityDeleteTest.php index be7e603c..57152288 100644 --- a/tests/src/Kernel/EntityDeleteTest.php +++ b/tests/src/Kernel/EntityDeleteTest.php @@ -127,7 +127,7 @@ final class EntityDeleteTest extends KernelTestBase { * @return array[] * The test data. */ - public function testBannedMessagesProvider(): array { + public static function testBannedMessagesProvider(): array { return [ // User A is logged in, which is the user that created the messages. ['a'], -- GitLab