Merge pull request #62 from wieni/feature/drupal-10-no-split

d10

Author: akasake

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "drupal/core": "^9.1"
+        "drupal/core": "^9.3 || ^10"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.0",

modules/wmpage_cache/wmpage_cache.info.yml

@@ -1,6 +1,5 @@
 name: Wieni Page Cache
 type: module
 description: 'Caches pages for anonymous users, with more customizablity than the default page cache module'
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9.3 || ^10
 package: Wieni

modules/wmpage_cache/wmpage_cache.install

@@ -75,5 +75,6 @@ function wmpage_cache_schema()
 
 function wmpage_cache_update_8001()
 {
-    drupal_install_schema('wmpage_cache');
+    // comment code because the table will already be installed during install of module
+    //drupal_install_schema('wmpage_cache');
 }

modules/wmpresenter/wmpresenter.info.yml

@@ -1,8 +1,7 @@
 name: Wieni Presenter
 type: module
 description: Adds support for creating & injecting view presenters on top of entity classes
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9.3 || ^10
 package: Wieni
 dependencies:
     - wmtwig

modules/wmtwig/wmtwig.info.yml

@@ -1,6 +1,5 @@
 name: Wieni Twig
 type: module
 description: Improves the integration of Twig with component and entity-oriented projects
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9.3 || ^10
 package: Wieni

src/Enhancer/InjectFrontControllerRouteEnhancer.php

@@ -3,8 +3,8 @@
 namespace Drupal\wmcontroller\Enhancer;
 
 use Drupal\Core\Routing\EnhancerInterface;
+use Drupal\Core\Routing\RouteObjectInterface;
 use Drupal\wmcontroller\Controller\FrontController;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 

src/EventSubscriber/CacheSubscriber.php

@@ -15,9 +15,9 @@
 use Drupal\wmcontroller\WmcontrollerEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\PostResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class CacheSubscriber implements EventSubscriberInterface
@@ -70,7 +70,7 @@ public static function getSubscribedEvents()
         return $events;
     }
 
-    public function onEnrichRequest(GetResponseEvent $event)
+    public function onEnrichRequest(RequestEvent $event)
     {
         // Do a faster-than-drupal user and session lookup
         // Fills the Request attribute with:
@@ -80,9 +80,9 @@ public function onEnrichRequest(GetResponseEvent $event)
         $this->enrichRequest->enrichRequest($event->getRequest());
     }
 
-    public function onGetCachedResponse(GetResponseEvent $event)
+    public function onGetCachedResponse(RequestEvent $event)
     {
-        if (!$event->isMasterRequest()) {
+        if (!$event->isMainRequest()) {
             return;
         }
 
@@ -111,13 +111,13 @@ public function onGetCachedResponse(GetResponseEvent $event)
         }
     }
 
-    public function onResponse(FilterResponseEvent $event)
+    public function onResponse(ResponseEvent $event)
     {
         $request = $event->getRequest();
         $response = $event->getResponse();
 
         if (
-            !$event->isMasterRequest()
+            !$event->isMainRequest()
             || $response instanceof CachedResponse
             || empty($response->getContent())
         ) {
@@ -173,13 +173,13 @@ public function onTags(CacheTagsEvent $event)
         }
     }
 
-    public function onTerminate(PostResponseEvent $event)
+    public function onTerminate(TerminateEvent $event)
     {
         $request = $event->getRequest();
         $response = $event->getResponse();
 
         if (
-            !$event->isMasterRequest()
+            !$event->isMainRequest()
             || !$response->isCacheable()
         ) {
             return;

src/EventSubscriber/TemplateParameterCacheableDependencySubscriber.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\wmcontroller\EventSubscriber;
+
+use Drupal\wmcontroller\Event\PresentedEvent;
+use Drupal\wmcontroller\WmcontrollerEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class TemplateParameterCacheableDependencySubscriber implements EventSubscriberInterface
+{
+    protected static $dispatched = [];
+
+    public static function getSubscribedEvents(): array
+    {
+        $events[WmcontrollerEvents::PRESENTED][] = ['onTemplateParameter'];
+
+        return $events;
+    }
+
+    public function onTemplateParameter(PresentedEvent $event): void
+    {
+        $value = $event->getItem();
+
+        if (!($value instanceof \Drupal\Core\Entity\EntityInterface)) {
+            return;
+        }
+
+        $key = sprintf('%s:%s', $value->getEntityTypeId(), $value->id());
+        if (isset(self::$dispatched[$key])) {
+            return;
+        }
+
+        self::$dispatched[$key] = true;
+        \Drupal::service('wmcontroller.cache.dispatcher')
+            ->dispatchPresented($value);
+    }
+
+}

src/EventSubscriber/ViewRendererSubscriber.php

@@ -4,7 +4,7 @@
 
 use Drupal\wmcontroller\ViewBuilder\ViewBuilder;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
+use Symfony\Component\HttpKernel\Event\ViewEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class ViewRendererSubscriber implements EventSubscriberInterface
@@ -17,7 +17,7 @@ public static function getSubscribedEvents()
         return $events;
     }
 
-    public function renderView(GetResponseForControllerResultEvent $event)
+    public function renderView(ViewEvent $event)
     {
         $result = $event->getControllerResult();
         if ($result instanceof ViewBuilder) {

src/Http/Middleware/Cache.php

@@ -26,10 +26,11 @@ public function __construct(
 
     public function handle(
         Request $request,
-        $type = self::MASTER_REQUEST,
+        $type = self::MAIN_REQUEST,
         $catch = true
-    ) {
-        if ($type !== static::MASTER_REQUEST) {
+    ): \Symfony\Component\HttpFoundation\Response
+    {
+        if ($type !== static::MAIN_REQUEST) {
             return $this->next->handle($request, $type, $catch);
         }