From dfc01457d67c8a9f0e507b9623f443c725efa5fe Mon Sep 17 00:00:00 2001 From: Jackson Darlow Date: Thu, 11 Jun 2020 13:34:45 +1200 Subject: [PATCH 1/5] #3236 Added missing config definitions (private statics) --- src/Core/Manifest/VersionProvider.php | 8 ++++++++ src/ORM/FieldType/DBField.php | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/src/Core/Manifest/VersionProvider.php b/src/Core/Manifest/VersionProvider.php index fee190057..b63bdaf87 100644 --- a/src/Core/Manifest/VersionProvider.php +++ b/src/Core/Manifest/VersionProvider.php @@ -4,6 +4,7 @@ namespace SilverStripe\Core\Manifest; use SilverStripe\Core\Config\Config; use Psr\SimpleCache\CacheInterface; +use SilverStripe\Core\Config\Configurable; use SilverStripe\Core\Convert; use SilverStripe\Core\Injector\Injector; @@ -24,6 +25,13 @@ use SilverStripe\Core\Injector\Injector; */ class VersionProvider { + use Configurable; + + /** + * @var array + */ + private static $modules; + /** * Gets a comma delimited string of package titles and versions * diff --git a/src/ORM/FieldType/DBField.php b/src/ORM/FieldType/DBField.php index 04383753c..686ea9405 100644 --- a/src/ORM/FieldType/DBField.php +++ b/src/ORM/FieldType/DBField.php @@ -107,6 +107,15 @@ abstract class DBField extends ViewableData implements DBIndexable */ private static $index = false; + /** + * The filters to be used by graphql form field front-end + * + * e.g [ contains, gt, lt, gte, lte ] + * + * @var array + */ + private static $graphql_default_filters; + private static $casting = [ 'ATT' => 'HTMLFragment', 'CDATA' => 'HTMLFragment', From 84235c651837c3c4586328d6534a4db0af60dc3f Mon Sep 17 00:00:00 2001 From: Jackson Darlow Date: Thu, 11 Jun 2020 14:27:28 +1200 Subject: [PATCH 2/5] Adjusted missing definitions to only include definitions referenced by framework --- src/Dev/DevelopmentAdmin.php | 17 +++++++++++++++++ .../GridFieldDetailForm_ItemRequest.php | 12 ++++++++++++ src/ORM/FieldType/DBField.php | 9 --------- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/Dev/DevelopmentAdmin.php b/src/Dev/DevelopmentAdmin.php index a5c3df5a2..7d72a49bc 100644 --- a/src/Dev/DevelopmentAdmin.php +++ b/src/Dev/DevelopmentAdmin.php @@ -42,6 +42,23 @@ class DevelopmentAdmin extends Controller 'generatesecuretoken', ]; + /** + * Controllers for dev admin views + * + * e.g [ + * 'urlsegment' => [ + * 'controller' => 'SilverStripe\Dev\DevelopmentAdmin', + * 'links' => [ + * 'urlsegment' => 'description', + * ... + * ] + * ] + * ] + * + * @var array + */ + private static $registered_controllers; + /** * Assume that CLI equals admin permissions * If set to false, normal permission model will apply even in CLI mode diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php index 98f70d1bd..a013b6b82 100644 --- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php +++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php @@ -36,6 +36,18 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler 'ItemEditForm' ]; + /** + * The default form actions available to this item request + * + * e.g [ + * 'showPagination': true, + * 'showAdd': true + * ] + * + * @var array + */ + private static $formActions; + /** * * @var GridField diff --git a/src/ORM/FieldType/DBField.php b/src/ORM/FieldType/DBField.php index 686ea9405..04383753c 100644 --- a/src/ORM/FieldType/DBField.php +++ b/src/ORM/FieldType/DBField.php @@ -107,15 +107,6 @@ abstract class DBField extends ViewableData implements DBIndexable */ private static $index = false; - /** - * The filters to be used by graphql form field front-end - * - * e.g [ contains, gt, lt, gte, lte ] - * - * @var array - */ - private static $graphql_default_filters; - private static $casting = [ 'ATT' => 'HTMLFragment', 'CDATA' => 'HTMLFragment', From fcc7a9ce5b0436a5cf7996956332c8de4d2dc189 Mon Sep 17 00:00:00 2001 From: Jackson Darlow Date: Mon, 15 Jun 2020 11:44:43 +1200 Subject: [PATCH 3/5] Added array declaration to `VersionProvider::$modules` Co-authored-by: Robbie Averill --- src/Core/Manifest/VersionProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Manifest/VersionProvider.php b/src/Core/Manifest/VersionProvider.php index b63bdaf87..937128c90 100644 --- a/src/Core/Manifest/VersionProvider.php +++ b/src/Core/Manifest/VersionProvider.php @@ -30,7 +30,7 @@ class VersionProvider /** * @var array */ - private static $modules; + private static $modules = []; /** * Gets a comma delimited string of package titles and versions From 1edd8fd7548e1e5ff30f12683fd39ed6b956e1cb Mon Sep 17 00:00:00 2001 From: Jackson Darlow Date: Mon, 15 Jun 2020 11:45:10 +1200 Subject: [PATCH 4/5] Added array declaration to `DevelopmentAdmin::$registered_controllers` Co-authored-by: Robbie Averill --- src/Dev/DevelopmentAdmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dev/DevelopmentAdmin.php b/src/Dev/DevelopmentAdmin.php index 7d72a49bc..8ee9c371d 100644 --- a/src/Dev/DevelopmentAdmin.php +++ b/src/Dev/DevelopmentAdmin.php @@ -57,7 +57,7 @@ class DevelopmentAdmin extends Controller * * @var array */ - private static $registered_controllers; + private static $registered_controllers = []; /** * Assume that CLI equals admin permissions From dadac00c1984416c00c4d5a9ec6f8cd0e0bdb561 Mon Sep 17 00:00:00 2001 From: Jackson Darlow Date: Mon, 15 Jun 2020 11:45:33 +1200 Subject: [PATCH 5/5] Added array declaration to `GridFieldDetailForm_ItemRequest::$formActions` Co-authored-by: Robbie Averill --- src/Forms/GridField/GridFieldDetailForm_ItemRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php index a013b6b82..2486554b2 100644 --- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php +++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php @@ -46,7 +46,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler * * @var array */ - private static $formActions; + private static $formActions = []; /** *