Merge pull request #2955 from creative-commoners/pulls/5.2/remove-self

ENH Use class name instead of self
silverstripe · Jun 17, 2024 · d4ab7f7 · d4ab7f7
2 parents 88ae614 + ea38c43
commit d4ab7f7
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 73 deletions.
diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
@@ -105,7 +105,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 
     private static $tree_class = SiteTree::class;
 
-    private static $session_namespace = self::class;
+    private static $session_namespace = CMSMain::class;
 
     private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
 
@@ -587,7 +587,7 @@ public function getSiteTreeFor(
 
         // Render using full-subtree template
         return $markingSet->renderChildren(
-            [ self::class . '_SubTree', 'type' => 'Includes' ],
+            [ CMSMain::class . '_SubTree', 'type' => 'Includes' ],
             $this->getTreeNodeCustomisations()
         );
     }
@@ -607,7 +607,7 @@ protected function getTreeNodeCustomisations()
                 'rootTitle' => $rootTitle,
                 'extraClass' => $this->getTreeNodeClasses($node),
                 'Title' => _t(
-                    self::class . '.PAGETYPE_TITLE',
+                    CMSMain::class . '.PAGETYPE_TITLE',
                     '(Page type: {type}) {title}',
                     [
                         'type' => $node->i18n_singular_name(),
@@ -718,7 +718,7 @@ public function updatetreenodes(HTTPRequest $request): HTTPResponse
 
             // Render using single node template
             $html = $markingSet->renderChildren(
-                [ self::class . '_TreeNode', 'type' => 'Includes'],
+                [ CMSMain::class . '_TreeNode', 'type' => 'Includes'],
                 $this->getTreeNodeCustomisations()
             );
 

diff --git a/code/Controllers/ModelAsController.php b/code/Controllers/ModelAsController.php
@@ -133,6 +133,6 @@ public function getNestedController(): ContentController
             Debug::message("Using record #$sitetree->ID of type " . get_class($sitetree) . " with link {$sitetree->Link()}");
         }
 
-        return self::controller_for($sitetree, $this->getRequest()->param('Action'));
+        return ModelAsController::controller_for($sitetree, $this->getRequest()->param('Action'));
     }
 }
diff --git a/code/Controllers/OldPageRedirector.php b/code/Controllers/OldPageRedirector.php
@@ -30,9 +30,9 @@ public function onBeforeHTTPError404(HTTPRequest $request)
         $getvars = $request->getVars();
         unset($getvars['url']);
 
-        $page = self::find_old_page($params, 0);
+        $page = OldPageRedirector::find_old_page($params, 0);
         if (!$page) {
-            $page = self::find_old_page($params);
+            $page = OldPageRedirector::find_old_page($params);
         }
         $cleanPage = trim(Director::makeRelative($page) ?? '', '/');
         if (!$cleanPage) {
@@ -95,7 +95,7 @@ public static function find_old_page($params, $parent = null, $redirect = false)
         if ($page && $page->canView()) {
             if (count($params ?? [])) {
                 // We have to go deeper!
-                $ret = self::find_old_page($params, $page, $redirect);
+                $ret = OldPageRedirector::find_old_page($params, $page, $redirect);
                 if ($ret) {
                     // A valid child page was found! We can return it
                     return $ret;

diff --git a/code/Controllers/RootURLController.php b/code/Controllers/RootURLController.php
@@ -39,12 +39,12 @@ class RootURLController extends Controller implements Resettable
      */
     public static function get_homepage_link()
     {
-        if (!self::$cached_homepage_link) {
+        if (!RootURLController::$cached_homepage_link) {
             $link = Config::inst()->get(__CLASS__, 'default_homepage_link');
             singleton(__CLASS__)->extend('updateHomepageLink', $link);
-            self::$cached_homepage_link = $link;
+            RootURLController::$cached_homepage_link = $link;
         }
-        return self::$cached_homepage_link;
+        return RootURLController::$cached_homepage_link;
     }
 
     /**
@@ -56,22 +56,22 @@ public static function get_homepage_link()
      */
     public static function should_be_on_root(SiteTree $page)
     {
-        return (!self::$is_at_root && self::get_homepage_link() == trim($page->RelativeLink(true) ?? '', '/'));
+        return (!RootURLController::$is_at_root && RootURLController::get_homepage_link() == trim($page->RelativeLink(true) ?? '', '/'));
     }
 
     /**
      * Resets the cached homepage link value - useful for testing.
      */
     public static function reset()
     {
-        self::$cached_homepage_link = null;
+        RootURLController::$cached_homepage_link = null;
     }
 
     protected function beforeHandleRequest(HTTPRequest $request)
     {
         parent::beforeHandleRequest($request);
 
-        self::$is_at_root = true;
+        RootURLController::$is_at_root = true;
 
         if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
             $this->getResponse()->redirect(Controller::join_links(
@@ -86,7 +86,7 @@ protected function beforeHandleRequest(HTTPRequest $request)
 
     public function handleRequest(HTTPRequest $request): HTTPResponse
     {
-        self::$is_at_root = true;
+        RootURLController::$is_at_root = true;
         $this->beforeHandleRequest($request);
 
         if (!$this->getResponse()->isFinished()) {
@@ -95,7 +95,7 @@ public function handleRequest(HTTPRequest $request): HTTPResponse
                 return $this->getResponse();
             }
 
-            $request->setUrl(self::get_homepage_link() . '/');
+            $request->setUrl(RootURLController::get_homepage_link() . '/');
             $request->match('$URLSegment//$Action', true);
             $controller = new ModelAsController();
 

diff --git a/code/GraphQL/LinkablePlugin.php b/code/GraphQL/LinkablePlugin.php
@@ -48,7 +48,7 @@ class LinkablePlugin implements ModelQueryPlugin
      */
     public function getIdentifier(): string
     {
-        return self::IDENTIFIER;
+        return LinkablePlugin::IDENTIFIER;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ class LinkablePlugin implements ModelQueryPlugin @@
          */
         public function getIdentifier(): string
         {
-            return self::IDENTIFIER;
+            return LinkablePlugin::IDENTIFIER;
         }
         /**
@@ Expand Down @@