Merge pull request #12 from wieni/feature/drupal-10

d10
wieni · Sep 12, 2023 · 0f6f98b · 0f6f98b
2 parents fb9eb26 + 16cba37
commit 0f6f98b
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=7.1.0",
-        "drupal/core": "^8.0 || ^9.0"
+        "drupal/core": "^9.1 || ^10"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.0",

diff --git a/src/Event/EntityOverviewAlterEvent.php b/src/Event/EntityOverviewAlterEvent.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\wmentity_overview\Event;
 
+use Drupal\Component\EventDispatcher\Event;
 use Drupal\wmentity_overview\Annotation\OverviewBuilder;
 use Drupal\wmentity_overview\OverviewBuilder\OverviewBuilderInterface;
-use Symfony\Component\EventDispatcher\Event;
 
 class EntityOverviewAlterEvent extends Event
 {

diff --git a/src/Event/EntityOverviewAlternativesAlterEvent.php b/src/Event/EntityOverviewAlternativesAlterEvent.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\wmentity_overview\Event;
 
+use Drupal\Component\EventDispatcher\Event;
 use Drupal\wmentity_overview\Annotation\OverviewBuilder;
-use Symfony\Component\EventDispatcher\Event;
 
 class EntityOverviewAlternativesAlterEvent extends Event
 {

diff --git a/src/EventSubscriber/BulkActionOverviewSubscriber.php b/src/EventSubscriber/BulkActionOverviewSubscriber.php
@@ -20,7 +20,7 @@ public function __construct(
         $this->formBuilder = $formBuilder;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         $events[WmEntityOverviewEvents::ENTITY_OVERVIEW_ALTER] = ['onOverviewAlter'];
 

diff --git a/src/EventSubscriber/CollectionRouteSubscriber.php b/src/EventSubscriber/CollectionRouteSubscriber.php
@@ -21,7 +21,7 @@ public function __construct(
         $this->overviewBuilders = $overviewBuilders;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         // Run before Drupal\Core\EventSubscriber/ParamConverterSubscriber
         $events[RoutingEvents::ALTER] = ['onAlterRoutes', -180];

diff --git a/src/EventSubscriber/FilterableOverviewSubscriber.php b/src/EventSubscriber/FilterableOverviewSubscriber.php
@@ -21,7 +21,7 @@ public function __construct(
         $this->formBuilder = $formBuilder;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         $events[WmEntityOverviewEvents::ENTITY_OVERVIEW_ALTER] = ['onOverviewAlter'];
 

diff --git a/wmentity_overview.info.yml b/wmentity_overview.info.yml
@@ -1,6 +1,5 @@
 name: Entity Overview
 type: module
 description: Improved EntityListBuilders with support for paging, table sorting, table dragging, filtering, bulk actions, database queries and more.
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9.1 || ^10
 package: Wieni
diff --git a/wmentity_overview.libraries.yml b/wmentity_overview.libraries.yml
@@ -10,6 +10,16 @@ bulk-action-form:
         base:
             css/bulk-action-form.css: {}
 
+popperjs:
+    remote: https://github.com/floating-ui/floating-ui
+    version: '2.11.7'
+    license:
+        name: MIT
+        url: https://github.com/floating-ui/floating-ui/blob/v2.x/LICENSE.md
+        gpl-compatible: true
+    js:
+        https://unpkg.com/@popperjs/[email protected]/dist/umd/popper.min.js: { type: external , minified: true }
+
 tooltip:
     version: VERSION
     css:
@@ -18,4 +28,4 @@ tooltip:
     js:
         js/tooltip.js: {}
     dependencies:
-        - core/popperjs
+        - wmentity_overview/popperjs
diff --git a/wmentity_overview.module b/wmentity_overview.module
@@ -11,7 +11,7 @@ function wmentity_overview_entity_overview_alter(array &$overview, OverviewBuild
     $dispatcher = \Drupal::getContainer()->get('event_dispatcher');
     $event = new EntityOverviewAlterEvent($builder, $overview);
 
-    $dispatcher->dispatch(WmEntityOverviewEvents::ENTITY_OVERVIEW_ALTER, $event);
+    $dispatcher->dispatch($event, WmEntityOverviewEvents::ENTITY_OVERVIEW_ALTER);
 }
 
 
@@ -20,7 +20,7 @@ function wmentity_overview_entity_overview_alternatives_alter(array &$alternativ
     $dispatcher = \Drupal::getContainer()->get('event_dispatcher');
     $event = new EntityOverviewAlternativesAlterEvent($definition, $alternatives);
 
-    $dispatcher->dispatch(WmEntityOverviewEvents::ENTITY_OVERVIEW_ALTERNATIVES_ALTER, $event);
+    $dispatcher->dispatch($event, WmEntityOverviewEvents::ENTITY_OVERVIEW_ALTERNATIVES_ALTER);
 }