Merge pull request #99 from ticktackk/permissionCache

Improve compatibility with how XF\PermissionCache is extended

Author: ticktackk

Listener.php

@@ -2,14 +2,13 @@
 
 namespace TickTackk\DeveloperTools;
 
-use TickTackk\DeveloperTools\XF\PermissionCache as ExtendedPermissionCache;
 use TickTackk\DeveloperTools\XF\Template\Templater as ExtendedTemplater;
 use XF\App as BaseApp;
-use XF\Container;
 use XF\Http\Response;
 use XF\Mvc\Dispatcher;
 use XF\Mvc\Reply\AbstractReply;
 use XF\Mvc\Renderer\AbstractRenderer;
+use XF\PermissionCache;
 use XF\Util\File as FileUtil;
 
 /**
@@ -71,11 +70,10 @@ public static function dispatcherPostRender(Dispatcher $dispatcher, ?string &$co
      */
     public static function appSetup(BaseApp $app) : void
     {
-        $container = $app->container();
+        $app->offsetSet('permission.cache', function ($c) use ($app) {
+            $class = $app->extendClass(PermissionCache::class);
 
-        $container['permission.cache'] = function (Container $container)
-        {
-            return new ExtendedPermissionCache($container['db']);
-        };
+            return new $class($c['db']);
+        });
     }
 }

XF/PermissionCache.php

@@ -2,26 +2,23 @@
 
 namespace TickTackk\DeveloperTools\XF;
 
-use XF\PermissionCache as BasePermissionCache;
-use XF\PermissionSet as BasePermissionSet;
-use TickTackk\DeveloperTools\XF\PermissionSet as ExtendedPermissionSet;
-
 /**
  * Class PermissionCache
  *
  * @package TickTackk\DeveloperTools\XF
  */
-class PermissionCache extends BasePermissionCache
+class PermissionCache extends XFCP_PermissionCache
 {
     /**
      * Returns extended permission set class which logs permission that do not exist but are being called
      *
      * @param int $permissionCombinationId
-     *
-     * @return PermissionSet|BasePermissionSet
+     * @return PermissionSet
+     * @noinspection PhpMissingParamTypeInspection
+     * @noinspection PhpMissingReturnTypeInspection
      */
     public function getPermissionSet($permissionCombinationId)
     {
-        return new ExtendedPermissionSet($this, $permissionCombinationId);
+        return new PermissionSet($this, $permissionCombinationId);
     }
 }

_output/class_extensions/XF-PermissionCache_TickTackk-DeveloperTools-XF-PermissionCache.json

@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\PermissionCache",
+    "to_class": "TickTackk\\DeveloperTools\\XF\\PermissionCache",
+    "execute_order": 6119,
+    "active": true
+}

_output/extension_hint.php

@@ -13,6 +13,11 @@ class XFCP_Template extends \XF\Admin\Controller\Template {}
 	class XFCP_TemplateModification extends \XF\Admin\Controller\TemplateModification {}
 }
 
+namespace TickTackk\DeveloperTools\XF
+{
+    class XFCP_PermissionCache extends \XF\PermissionCache {}
+}
+
 namespace TickTackk\DeveloperTools\XF\Entity
 {
 	class XFCP_CodeEventListener extends \XF\Entity\CodeEventListener {}