From 0f01551f261d9c8509a15320c59464c65b3f5b4e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 6 Sep 2020 12:05:45 +0100 Subject: [PATCH] Update Hook Event Dispatcher module - Update the Hook Event Dispatcher module from `8.x-1.29` to `8.x-2.02`. - Update custom modules after breaking changes from upgrading. References #112 --- composer.json | 2 +- composer.lock | 53 ++++++++++++------- config/default/core.extension.yml | 1 + .../PushBlogPostToSocialMedia.php | 4 +- .../src/EventSubscriber/ReorderBlogTags.php | 4 +- .../tests/src/Kernel/ReorderBlogTagsTest.php | 1 + .../UpdateTalkNodeBeforeSave.php | 4 +- .../talks/tests/src/Kernel/TalksTestBase.php | 1 + 8 files changed, 45 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 915c2c5..9619bff 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "drupal/fathom_analytics": "^2.1", "drupal/gin": "^3.0", "drupal/honeypot": "^2.0", - "drupal/hook_event_dispatcher": "^1.28", + "drupal/hook_event_dispatcher": "^2", "drupal/markdown": "^1.3", "drupal/menu_trail_by_path": "^1.3", "drupal/metatag": "^1.11", diff --git a/composer.lock b/composer.lock index 5b794bc..1482879 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3aa40373d1c7d531970ee2137e660534", + "content-hash": "bd5d663c215838b5134f059af1a07aac", "packages": [ { "name": "asm89/stack-cors", @@ -2657,24 +2657,24 @@ }, { "name": "drupal/hook_event_dispatcher", - "version": "1.29.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/hook_event_dispatcher.git", - "reference": "8.x-1.29" + "reference": "8.x-2.02" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-8.x-1.29.zip", - "reference": "8.x-1.29", - "shasum": "81cbc5f27b1e62ee323b27fb826ec75d3762c68f" + "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-8.x-2.02.zip", + "reference": "8.x-2.02", + "shasum": "977d4ecf59042faf9814fa18e0c2c425255fae33" }, "require": { "drupal/core": "^8 || ^9" }, "require-dev": { - "drupal/coder": "8.3.1", - "drupal/core": "^8.8", + "drupal/coder": "^8.3", + "drupal/core-recommended": "^9.0", "drupal/eck": "^1.0@alpha", "drupal/paragraphs": "^1.10", "drupal/webform": "*", @@ -2691,8 +2691,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.29", - "datestamp": "1589110992", + "version": "8.x-2.02", + "datestamp": "1592812763", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2702,15 +2702,32 @@ "autoload": { "psr-4": { "Drupal\\hook_event_dispatcher\\": "src/", + "Drupal\\core_event_dispatcher\\": "modules/core_event_dispatcher/src/", + "Drupal\\field_event_dispatcher\\": "modules/field_event_dispatcher/src/", + "Drupal\\media_event_dispatcher\\": "modules/media_event_dispatcher/src/", + "Drupal\\path_event_dispatcher\\": "modules/path_event_dispatcher/src/", + "Drupal\\preprocess_event_dispatcher\\": "modules/preprocess_event_dispatcher/src/", + "Drupal\\toolbar_event_dispatcher\\": "modules/toolbar_event_dispatcher/src/", + "Drupal\\user_event_dispatcher\\": "modules/user_event_dispatcher/src/", + "Drupal\\views_event_dispatcher\\": "modules/views_event_dispatcher/src/", "Drupal\\webform_event_dispatcher\\": "modules/webform_event_dispatcher/src/" } }, "autoload-dev": { "psr-4": { "Drupal\\Tests\\hook_event_dispatcher\\": "tests/src/", + "Drupal\\Tests\\core_event_dispatcher\\": "modules/core_event_dispatcher/tests/src/", + "Drupal\\Tests\\field_event_dispatcher\\": "modules/field_event_dispatcher/tests/src/", + "Drupal\\Tests\\media_event_dispatcher\\": "modules/media_event_dispatcher/tests/src/", + "Drupal\\Tests\\path_event_dispatcher\\": "modules/path_event_dispatcher/tests/src/", + "Drupal\\Tests\\preprocess_event_dispatcher\\": "modules/preprocess_event_dispatcher/tests/src/", + "Drupal\\Tests\\toolbar_event_dispatcher\\": "modules/toolbar_event_dispatcher/tests/src/", + "Drupal\\Tests\\user_event_dispatcher\\": "modules/user_event_dispatcher/tests/src/", + "Drupal\\Tests\\views_event_dispatcher\\": "modules/views_event_dispatcher/tests/src/", "Drupal\\Tests\\webform_event_dispatcher\\": "modules/webform_event_dispatcher/tests/src/", "Drupal\\Tests\\": "vendor/drupal/core/tests/Drupal/Tests", "Drupal\\TestTools\\": "vendor/drupal/core/tests/Drupal/TestTools", + "Drupal\\media\\": "vendor/drupal/core/modules/media/src/", "Drupal\\views\\": "vendor/drupal/core/modules/views/src/" } }, @@ -4906,16 +4923,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.5.0", + "version": "v4.9.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463" + "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/53c2753d756f5adb586dca79c2ec0e2654dd9463", - "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/88e519766fc58bd46b8265561fb79b54e2e00b28", + "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28", "shasum": "" }, "require": { @@ -4923,8 +4940,8 @@ "php": ">=7.0" }, "require-dev": { - "ircmaxell/php-yacc": "0.0.5", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -4932,7 +4949,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.9-dev" } }, "autoload": { @@ -4954,7 +4971,7 @@ "parser", "php" ], - "time": "2020-06-03T07:24:19+00:00" + "time": "2020-08-30T16:15:20+00:00" }, { "name": "paragonie/random_compat", diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index c9d0c66..2485004 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -10,6 +10,7 @@ module: config_ignore: 0 config_split: 0 contextual: 0 + core_event_dispatcher: 0 ctools: 0 datetime: 0 dblog: 0 diff --git a/web/modules/custom/blog/src/EventSubscriber/PushBlogPostToSocialMedia.php b/web/modules/custom/blog/src/EventSubscriber/PushBlogPostToSocialMedia.php index 3643873..358f84d 100644 --- a/web/modules/custom/blog/src/EventSubscriber/PushBlogPostToSocialMedia.php +++ b/web/modules/custom/blog/src/EventSubscriber/PushBlogPostToSocialMedia.php @@ -6,7 +6,7 @@ namespace Drupal\opdavies_blog\EventSubscriber; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ImmutableConfig; -use Drupal\hook_event_dispatcher\Event\Entity\BaseEntityEvent; +use Drupal\core_event_dispatcher\Event\Entity\AbstractEntityEvent; use Drupal\hook_event_dispatcher\HookEventDispatcherInterface; use Drupal\opdavies_blog\Entity\Node\Post; use GuzzleHttp\Client; @@ -37,7 +37,7 @@ final class PushBlogPostToSocialMedia implements EventSubscriberInterface { ]; } - public function onEntityUpdate(BaseEntityEvent $event): void { + public function onEntityUpdate(AbstractEntityEvent $event): void { $entity = $event->getEntity(); if ($entity->getEntityTypeId() != 'node') { diff --git a/web/modules/custom/blog/src/EventSubscriber/ReorderBlogTags.php b/web/modules/custom/blog/src/EventSubscriber/ReorderBlogTags.php index 8290550..b7ce6ef 100644 --- a/web/modules/custom/blog/src/EventSubscriber/ReorderBlogTags.php +++ b/web/modules/custom/blog/src/EventSubscriber/ReorderBlogTags.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Drupal\opdavies_blog\EventSubscriber; -use Drupal\hook_event_dispatcher\Event\Entity\BaseEntityEvent; +use Drupal\core_event_dispatcher\Event\Entity\AbstractEntityEvent; use Drupal\hook_event_dispatcher\HookEventDispatcherInterface; use Drupal\opdavies_blog\Entity\Node\Post; use Drupal\taxonomy\TermInterface; @@ -21,7 +21,7 @@ final class ReorderBlogTags implements EventSubscriberInterface { ]; } - public function onEntityPresave(BaseEntityEvent $event): void { + public function onEntityPresave(AbstractEntityEvent $event): void { $entity = $event->getEntity(); if ($entity->getEntityTypeId() != 'node') { diff --git a/web/modules/custom/blog/tests/src/Kernel/ReorderBlogTagsTest.php b/web/modules/custom/blog/tests/src/Kernel/ReorderBlogTagsTest.php index f303428..f922dce 100644 --- a/web/modules/custom/blog/tests/src/Kernel/ReorderBlogTagsTest.php +++ b/web/modules/custom/blog/tests/src/Kernel/ReorderBlogTagsTest.php @@ -25,6 +25,7 @@ final class ReorderBlogTagsTest extends EntityKernelTestBase { // Contrib. 'discoverable_entity_bundle_classes', 'hook_event_dispatcher', + 'core_event_dispatcher', // Custom. 'opdavies_blog_test', diff --git a/web/modules/custom/talks/src/EventSubscriber/UpdateTalkNodeBeforeSave.php b/web/modules/custom/talks/src/EventSubscriber/UpdateTalkNodeBeforeSave.php index 3056d22..5319359 100644 --- a/web/modules/custom/talks/src/EventSubscriber/UpdateTalkNodeBeforeSave.php +++ b/web/modules/custom/talks/src/EventSubscriber/UpdateTalkNodeBeforeSave.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Drupal\opdavies_talks\EventSubscriber; use Carbon\Carbon; -use Drupal\hook_event_dispatcher\Event\Entity\BaseEntityEvent; +use Drupal\core_event_dispatcher\Event\Entity\AbstractEntityEvent; use Drupal\hook_event_dispatcher\HookEventDispatcherInterface; use Drupal\opdavies_talks\Entity\Node\Talk; use Drupal\paragraphs\ParagraphInterface; @@ -22,7 +22,7 @@ final class UpdateTalkNodeBeforeSave implements EventSubscriberInterface { ]; } - public function onEntityPreSave(BaseEntityEvent $event): void { + public function onEntityPreSave(AbstractEntityEvent $event): void { if ($event->getEntity()->getEntityTypeId() != 'node') { return; } diff --git a/web/modules/custom/talks/tests/src/Kernel/TalksTestBase.php b/web/modules/custom/talks/tests/src/Kernel/TalksTestBase.php index a47bb17..c875708 100644 --- a/web/modules/custom/talks/tests/src/Kernel/TalksTestBase.php +++ b/web/modules/custom/talks/tests/src/Kernel/TalksTestBase.php @@ -26,6 +26,7 @@ abstract class TalksTestBase extends EntityKernelTestBase { 'entity_reference_revisions', 'paragraphs', 'hook_event_dispatcher', + 'core_event_dispatcher', // Custom. 'opdavies_talks',