TTWEBTAKEN-196: Add Drupal 10 support

district09 · Oct 16, 2023 · 245fdc6 · 245fdc6
1 parent cad8fb4
commit 245fdc6
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 17 deletions.
diff --git a/og_sm_admin_menu/src/EventSubscriber/GroupPermissionEventSubscriber.php b/og_sm_admin_menu/src/EventSubscriber/GroupPermissionEventSubscriber.php
@@ -29,7 +29,7 @@ public function __construct(TranslationInterface $translation) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     return [
       PermissionEventInterface::EVENT_NAME => [['provideDefaultOgPermissions']],
     ];

diff --git a/og_sm_admin_menu/src/Routing/RouteSubscriber.php b/og_sm_admin_menu/src/Routing/RouteSubscriber.php
@@ -65,7 +65,7 @@ protected function alterRoutes(RouteCollection $collection) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = [];
     $events[RoutingEvents::ALTER] = ['onAlterRoutes'];
 

diff --git a/og_sm_config/src/Config/SiteConfigCollectionNameTrait.php b/og_sm_config/src/Config/SiteConfigCollectionNameTrait.php
@@ -37,7 +37,7 @@ protected function createConfigCollectionName(NodeInterface $site) {
    *
    * @see self::createConfigCollectionName()
    */
-  protected function getSiteIdFromCollectionName($collection):int {
+  protected function getSiteIdFromCollectionName($collection): int {
     $matches = [];
     if (!preg_match('/^og_sm\.(.*)\.(\d*)$/', $collection, $matches)) {
       throw new \InvalidArgumentException("'$collection' is not a valid site override collection");

diff --git a/og_sm_config/src/Config/SiteConfigFactoryOverride.php b/og_sm_config/src/Config/SiteConfigFactoryOverride.php
@@ -14,7 +14,6 @@
 use Drupal\og_sm\Event\SiteEvents;
 use Drupal\og_sm\OgSm;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
@@ -126,7 +125,7 @@ public function getStorage(NodeInterface $site) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = parent::getSubscribedEvents();
     $events[KernelEvents::REQUEST][] = ['onKernelRequestSetSite'];
     // Set the priority of the delete event low, we only want to remove the
@@ -189,7 +188,11 @@ public function onConfigRename(ConfigRenameEvent $event) {
    *   The Event to process.
    */
   public function onKernelRequestSetSite(RequestEvent $event) {
-    if ($event->getRequestType() !== HttpKernelInterface::MAIN_REQUEST) {
+    // Using hardcoded value 1 to ensure compatibility with both Drupal 9
+    // HttpKernelInterface::MASTER_REQUEST and Drupal 10,
+    // HttpKernelInterface::MAIN_REQUEST as described in more detail at
+    // https://www.drupal.org/node/3236639
+    if ($event->getRequestType() !== 1) {
       return;
     }
     $currentSite = OgSm::siteManager()->currentSite();

diff --git a/og_sm_content/src/EventSubscriber/GroupPermissionEventSubscriber.php b/og_sm_content/src/EventSubscriber/GroupPermissionEventSubscriber.php
@@ -18,7 +18,7 @@ class GroupPermissionEventSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     return [
       PermissionEventInterface::EVENT_NAME => [['provideDefaultOgPermissions']],
     ];

diff --git a/og_sm_menu/src/EventSubscriber/GroupPermissionEventSubscriber.php b/og_sm_menu/src/EventSubscriber/GroupPermissionEventSubscriber.php
@@ -36,7 +36,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     return [
       PermissionEventInterface::EVENT_NAME => [['provideDefaultOgPermissions']],
     ];

diff --git a/og_sm_path/src/EventSubscriber/EventSubscriber.php b/og_sm_path/src/EventSubscriber/EventSubscriber.php
@@ -14,7 +14,7 @@ class EventSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = [];
     $events[AjaxPathEvents::COLLECT][] = 'onAjaxPathCollection';
 

diff --git a/og_sm_path/src/EventSubscriber/SiteSubscriber.php b/og_sm_path/src/EventSubscriber/SiteSubscriber.php
@@ -45,7 +45,7 @@ public function __construct(SitePathManagerInterface $site_path_manager, ModuleH
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = [];
     $events[SiteEvents::INSERT][] = 'onSiteInsert';
     $events[SiteEvents::UPDATE][] = 'onSiteUpdate';

diff --git a/og_sm_path/src/EventSubscriber/SiteTypeSubscriber.php b/og_sm_path/src/EventSubscriber/SiteTypeSubscriber.php
@@ -33,7 +33,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = [];
     $events[SiteTypeEvents::ADD][] = 'onSiteTypeAdd';
     $events[SiteTypeEvents::REMOVE][] = 'onSiteTypeRemove';

diff --git a/og_sm_routing/src/EventSubscriber/SiteRoutes.php b/og_sm_routing/src/EventSubscriber/SiteRoutes.php
@@ -50,7 +50,7 @@ public function __construct(
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = [];
     $events[RoutingEvents::DYNAMIC] = 'onDynamicRouteEvent';
     return $events;

diff --git a/og_sm_routing/src/SiteRoutesSubscriberBase.php b/og_sm_routing/src/SiteRoutesSubscriberBase.php
@@ -26,7 +26,7 @@ abstract protected function collectRoutes(RouteCollection $collection, NodeInter
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = [];
     $events[SiteRoutingEvents::COLLECT] = 'onCollectRoutes';
 

diff --git a/og_sm_routing/tests/modules/og_sm_routing_test/src/EventSubscriber/SiteRoutesSubscriber.php b/og_sm_routing/tests/modules/og_sm_routing_test/src/EventSubscriber/SiteRoutesSubscriber.php
@@ -17,7 +17,7 @@ class SiteRoutesSubscriber extends SiteRoutesSubscriberBase {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = parent::getSubscribedEvents();
     $events[SiteRoutingEvents::ALTER] = 'alterRoutes';
     return $events;

diff --git a/og_sm_routing/tests/modules/og_sm_routing_test/src/EventSubscriber/SiteSubscriber.php b/og_sm_routing/tests/modules/og_sm_routing_test/src/EventSubscriber/SiteSubscriber.php
@@ -32,7 +32,7 @@ public function __construct(RouteBuilderInterface $route_builder) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events[SiteEvents::INSERT][] = 'onSiteInsert';
     $events[SiteEvents::DELETE][] = 'onSiteDelete';
     $events[SiteEvents::UPDATE][] = 'onSiteUpdate';

diff --git a/og_sm_taxonomy/src/EventSubscriber/SiteEventSubscriber.php b/og_sm_taxonomy/src/EventSubscriber/SiteEventSubscriber.php
@@ -32,7 +32,7 @@ public function __construct(SiteManagerInterface $site_manager) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     $events = [];
     $events[SiteEvents::DELETE][] = 'onSiteDelete';
 

diff --git a/src/EventSubscriber/GroupPermissionEventSubscriber.php b/src/EventSubscriber/GroupPermissionEventSubscriber.php
@@ -29,7 +29,7 @@ public function __construct(TranslationInterface $translation) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents():array {
+  public static function getSubscribedEvents(): array {
     return [
       PermissionEventInterface::EVENT_NAME => [['provideDefaultOgPermissions']],
     ];