From b4e3a08b8a0ced37fa91cab3bf04e18fc8164d6f Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@signify.co.nz>
Date: Sat, 12 Feb 2022 18:48:17 +1300
Subject: [PATCH] ENH Prefer dependency injection for GridFieldComponents

GridFieldComponents packaged with silverstripe/framework are injectable as of 4.11.0
Explicitly invoking the injector here instead of using `create()` allows backwards compatability with framework < 4.11.0 while ensuring dependency injection is still used from 4.11.0 onwards.
---
 code/Controllers/CMSMain.php | 8 ++++----
 code/Model/SiteTree.php      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
index f60505d3..8b75e3a9 100644
--- a/code/Controllers/CMSMain.php
+++ b/code/Controllers/CMSMain.php
@@ -1632,9 +1632,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
         }
         $list = $this->getList($params, $parentID);
         $gridFieldConfig = GridFieldConfig::create()->addComponents(
-            new GridFieldSortableHeader(),
-            new GridFieldDataColumns(),
-            new GridFieldPaginator($this->config()->get('page_length'))
+            Injector::inst()->create(GridFieldSortableHeader::class),
+            Injector::inst()->create(GridFieldDataColumns::class),
+            Injector::inst()->createWithArgs(GridFieldPaginator::class, [$this->config()->get('page_length')])
         );
         if ($parentID) {
             $linkSpec = $this->LinkListViewChildren('%d');
@@ -1645,7 +1645,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
             );
             $this->setCurrentPageID($parentID);
         }
-        $gridField = new GridField('Page', 'Pages', $list, $gridFieldConfig);
+        $gridField = GridField::create('Page', 'Pages', $list, $gridFieldConfig);
         $gridField->setAttribute('cms-loading-ignore-url-params', true);
         /** @var GridFieldDataColumns $columns */
         $columns = $gridField->getConfig()->getComponentByType(GridFieldDataColumns::class);
diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
index 6d7bdf93..3f525f4b 100755
--- a/code/Model/SiteTree.php
+++ b/code/Model/SiteTree.php
@@ -1996,7 +1996,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
                         );
                     }
                 ]);
-            $dependentTable->getConfig()->addComponent(new GridFieldLazyLoader());
+            $dependentTable->getConfig()->addComponent(Injector::inst()->create(GridFieldLazyLoader::class));
         }
 
         $baseLink = Controller::join_links(