Improve System - Page Cache plugin code (joomla#44842)

Co-authored-by: Quy Ton <[email protected]>

Author: joomdonation

plugins/system/cache/src/Extension/Cache.php

@@ -13,7 +13,9 @@
 use Joomla\CMS\Cache\CacheController;
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Document\FactoryInterface as DocumentFactoryInterface;
+use Joomla\CMS\Event\Application\AfterRenderEvent;
 use Joomla\CMS\Event\Application\AfterRespondEvent;
+use Joomla\CMS\Event\Application\AfterRouteEvent;
 use Joomla\CMS\Event\PageCache\GetKeyEvent;
 use Joomla\CMS\Event\PageCache\IsExcludedEvent;
 use Joomla\CMS\Event\PageCache\SetCachingEvent;
@@ -139,18 +141,20 @@ public static function getSubscribedEvents(): array
     /**
      * Returns a cached page if the current URL exists in the cache.
      *
-     * @param   Event  $event  The Joomla event being handled
+     * @param   AfterRouteEvent  $event  The Joomla event being handled
      *
      * @return  void
      *
      * @since   4.0.0
      */
-    public function onAfterRoute(Event $event)
+    public function onAfterRoute(AfterRouteEvent $event): void
     {
         if (!$this->appStateSupportsCaching()) {
             return;
         }
 
+        $app = $this->getApplication();
+
         // Import "pagecache" plugins
         $dispatcher = $this->getDispatcher();
         PluginHelper::importPlugin('pagecache', null, true, $dispatcher);
@@ -169,16 +173,16 @@ public function onAfterRoute(Event $event)
         }
 
         // Set the page content from the cache and output it to the browser.
-        $this->getApplication()->setBody($data);
+        $app->setBody($data);
 
-        echo $this->getApplication()->toString((bool) $this->getApplication()->get('gzip'));
+        echo $app->toString((bool) $app->get('gzip'));
 
         // Mark afterCache in debug and run debug onAfterRespond events, e.g. show Joomla Debug Console if debug is active.
         if (JDEBUG) {
             // Create a document instance and load it into the application.
             $document = $this->documentFactory
-                ->createDocument($this->getApplication()->getInput()->get('format', 'html'));
-            $this->getApplication()->loadDocument($document);
+                ->createDocument($app->getInput()->get('format', 'html'));
+            $app->loadDocument($document);
 
             if ($this->profiler) {
                 $this->profiler->mark('afterCache');
@@ -187,13 +191,13 @@ public function onAfterRoute(Event $event)
             $this->getDispatcher()->dispatch('onAfterRespond', new AfterRespondEvent(
                 'onAfterRespond',
                 [
-                    'subject' => $this->getApplication(),
+                    'subject' => $app,
                 ]
             ));
         }
 
         // Closes the application.
-        $this->getApplication()->close();
+        $app->close();
     }
 
     /**
@@ -220,16 +224,18 @@ private function appStateSupportsCaching(): bool
         static $isSite = null;
         static $isGET  = null;
 
+        $app = $this->getApplication();
+
         if ($isSite === null) {
-            $isSite = $this->getApplication()->isClient('site');
-            $isGET  = $this->getApplication()->getInput()->getMethod() === 'GET';
+            $isSite = $app->isClient('site');
+            $isGET  = $app->getInput()->getMethod() === 'GET';
         }
 
         // Boolean short–circuit evaluation means this returns fast false when $isSite is false.
         return $isSite
             && $isGET
-            && $this->getApplication()->getIdentity()->guest
-            && empty($this->getApplication()->getMessageQueue());
+            && $app->getIdentity()->guest
+            && empty($app->getMessageQueue());
     }
 
     /**
@@ -283,13 +289,13 @@ private function getCacheKey(): string
     /**
      * After Render Event. Check whether the current page is excluded from cache.
      *
-     * @param   Event  $event  The CMS event we are handling.
+     * @param   AfterRenderEvent  $event  The CMS event we are handling.
      *
      * @return  void
      *
      * @since   3.9.12
      */
-    public function onAfterRender(Event $event)
+    public function onAfterRender(AfterRenderEvent $event): void
     {
         if (!$this->appStateSupportsCaching() || $this->getCacheController()->getCaching() === false) {
             return;
@@ -365,13 +371,13 @@ private function isExcluded(): bool
     /**
      * After Respond Event. Stores page in cache.
      *
-     * @param   Event  $event  The application event we are handling.
+     * @param   AfterRespondEvent  $event  The application event we are handling.
      *
      * @return  void
      *
      * @since   1.5
      */
-    public function onAfterRespond(Event $event)
+    public function onAfterRespond(AfterRespondEvent $event): void
     {
         if (!$this->appStateSupportsCaching() || $this->getCacheController()->getCaching() === false) {
             return;