Replaced use of deprecated DataExtension with Extension

webbuilders-group · Nov 7, 2024 · 8ddd4e2 · 8ddd4e2
1 parent 1871b19
commit 8ddd4e2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,6 +80,7 @@ jobs:
           composer config allow-plugins.composer/installers true
           composer config allow-plugins.silverstripe/recipe-plugin true
           composer config allow-plugins.silverstripe/vendor-plugin true
+          composer silverstripe/recipe-cms ~5.3
           composer install --verbose --no-interaction --no-progress --no-suggest --optimize-autoloader --ansi
 
       - name: Configure Environment
@@ -157,6 +158,7 @@ jobs:
           composer config allow-plugins.composer/installers true
           composer config allow-plugins.silverstripe/recipe-plugin true
           composer config allow-plugins.silverstripe/vendor-plugin true
+          composer silverstripe/recipe-cms ~4.13
           composer install --verbose --no-interaction --no-progress --no-suggest --optimize-autoloader --ansi
 
       - name: Configure Environment
@@ -231,6 +233,7 @@ jobs:
         run: |
           composer self-update --ansi || true
           if [[ $GITHUB_ACCESS_TOKEN ]]; then composer config --ansi -g github-oauth.github.com $GITHUB_ACCESS_TOKEN; fi
+          composer silverstripe/recipe-cms ~4.13
           composer install --verbose --no-interaction --no-progress --no-suggest --optimize-autoloader --ansi
 
       - name: Configure Environment

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [2.2.0](https://github.com/webbuilders-group/silverstripe-siteconfig-error-pages/tree/2.2.0) (2024-11-07)
+[Full Changelog](https://github.com/webbuilders-group/silverstripe-siteconfig-error-pages/compare/2.1.0...2.2.0)
+
 ## [2.1.0](https://github.com/webbuilders-group/silverstripe-siteconfig-error-pages/tree/2.1.0) (2023-10-19)
 [Full Changelog](https://github.com/webbuilders-group/silverstripe-siteconfig-error-pages/compare/2.0.0...2.1.0)
 

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2023, The Web Builders Group Inc.
+Copyright (c) 2024, The Web Builders Group Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/src/Extensions/ErrorPageExtension.php b/src/Extensions/ErrorPageExtension.php
@@ -2,11 +2,11 @@
 namespace WebbuildersGroup\SiteConfigErrorPages\Extensions;
 
 use SilverStripe\Control\Controller;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\SiteConfig\SiteConfigLeftAndMain;
 use SilverStripe\View\HTML;
 
-class ErrorPageExtension extends DataExtension
+class ErrorPageExtension extends Extension
 {
     public function MetaTags(&$tags)
     {

diff --git a/src/Extensions/SiteConfigExtension.php b/src/Extensions/SiteConfigExtension.php
@@ -1,6 +1,7 @@
 <?php
 namespace WebbuildersGroup\SiteConfigErrorPages\Extensions;
 
+use SilverStripe\Core\Extension;
 use SilverStripe\ErrorPage\ErrorPage;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridField;
@@ -11,7 +12,6 @@
 use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\Forms\GridField\GridFieldEditButton;
 use SilverStripe\Forms\GridField\GridFieldToolbarHeader;
-use SilverStripe\ORM\DataExtension;
 use SilverStripe\Versioned\GridFieldArchiveAction;
 use SilverStripe\Versioned\Versioned;
 use WebbuildersGroup\GridFieldDeletedItems\Forms\GridFieldDeletedColumns;
@@ -21,7 +21,7 @@
 use WebbuildersGroup\GridFieldDeletedItems\Forms\GridFieldDeletedToggle;
 use WebbuildersGroup\SiteConfigErrorPages\Forms\GridField\ErrorPageItemRequestHandler;
 
-class SiteConfigExtension extends DataExtension
+class SiteConfigExtension extends Extension
 {
     /**
      * Updates the CMS fields adding the fields defined in this extension
@@ -31,8 +31,8 @@ public function updateCMSFields(FieldList $fields)
     {
         // Reset Versioned
         Versioned::set_reading_mode('Stage.' . Versioned::DRAFT);
-        
-        
+
+
         $fields->findOrMakeTab('Root.ErrorPages', _t('WebbuildersGroup\\SiteConfigErrorPages\\Extensions\\SiteConfigErrorPagesExtension.ERROR_PAGES', 'Error Pages'));
         $fields->addFieldToTab('Root.ErrorPages', $gridField = new GridField('ErrorPages', _t('WebbuildersGroup\\SiteConfigErrorPages\\Extensions\\SiteConfigErrorPagesExtension.ERROR_PAGES', 'Error Pages'), ErrorPage::get(), GridFieldConfig_RecordEditor::create(10)));
         $gridField->getConfig()
@@ -55,7 +55,7 @@ public function updateCMSFields(FieldList $fields)
                                                         'isPublished' => 'Boolean->Nice',
                                                         'IsModifiedOnStage' => 'Boolean->Nice',
                                                     ]);
-        
+
         $gridField->getConfig()
                             ->getComponentByType(GridFieldDetailForm::class)
                                 ->setItemRequestClass(ErrorPageItemRequestHandler::class);