Merge pull request #10 from syntro-opensource/add/SS5-support

add: changed constraints for SS5 support
syntro-opensource · Jun 28, 2023 · 32826ca · 32826ca
2 parents 6ad1b65 + 011c1e3
commit 32826ca
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -9,13 +9,12 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "silverstripe/framework": "^4",
-        "silverstripe/admin": "^1.0",
-        "dnadesign/silverstripe-elemental": "^4",
-        "symbiote/silverstripe-gridfieldextensions": "^3"
+        "silverstripe/framework": "^4 || ^5",
+        "silverstripe/admin": "^1.0 || ^2.0",
+        "dnadesign/silverstripe-elemental": "^4 || ^5",
+        "symbiote/silverstripe-gridfieldextensions": "^3 || ^4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
         "squizlabs/php_codesniffer": "^3.0",
         "syntro/silverstripe-phpstan": "^1",
         "phpunit/phpunit": "^9.5"

diff --git a/src/Forms/GridFieldConfig_ElementalChildren.php b/src/Forms/GridFieldConfig_ElementalChildren.php
@@ -2,24 +2,23 @@
 
 namespace Syntro\SilverStripeElementalBaseitem\Forms;
 
-use SilverStripe\Forms\GridField\GridFieldConfig;
-use SilverStripe\Forms\GridField\GridFieldButtonRow;
 use SilverStripe\Forms\GridField\GridFieldAddNewButton;
-use SilverStripe\Forms\GridField\GridFieldToolbarHeader;
-use SilverStripe\Forms\GridField\GridFieldFilterHeader;
+use SilverStripe\Forms\GridField\GridFieldButtonRow;
+use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
-use SilverStripe\Forms\GridField\GridFieldEditButton;
 use SilverStripe\Forms\GridField\GridFieldDeleteAction;
-use SilverStripe\Forms\GridField\GridField_ActionMenu;
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
+use SilverStripe\Forms\GridField\GridFieldEditButton;
+use SilverStripe\Forms\GridField\GridFieldFilterHeader;
 use SilverStripe\Forms\GridField\GridFieldPageCount;
 use SilverStripe\Forms\GridField\GridFieldPaginator;
-use SilverStripe\Forms\GridField\GridFieldDetailForm;
+use SilverStripe\Forms\GridField\GridFieldSortableHeader;
+use SilverStripe\Forms\GridField\GridFieldToolbarHeader;
+use SilverStripe\Forms\GridField\GridField_ActionMenu;
 use SilverStripe\Versioned\GridFieldArchiveAction;
 use SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState;
 use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
-use Symbiote\GridFieldExtensions\GridfieldTitleHeader;
-
-use SilverStripe\Forms\GridField\GridFieldSortableHeader;
+use Symbiote\GridFieldExtensions\GridFieldTitleHeader;
 
 /**
  * Gridfield config specifically crafted for elemental blocks
@@ -56,7 +55,7 @@ public function __construct($itemsPerPage = null, $showPagination = null, $showA
         $this->addComponent($pagination = new GridFieldPaginator($itemsPerPage));
         $this->addComponent(new GridFieldDetailForm(null, $showPagination, $showAdd));
         $this->addComponent(new GridFieldOrderableRows('Sort'));
-        $this->addComponent(new GridfieldTitleHeader());
+        $this->addComponent(new GridFieldTitleHeader());
 
         $filter->setThrowExceptionOnBadDataType(false);
         $pagination->setThrowExceptionOnBadDataType(false);

diff --git a/src/Model/BaseItem.php b/src/Model/BaseItem.php
@@ -2,22 +2,22 @@
 
 namespace Syntro\SilverStripeElementalBaseitem\Model;
 
+use BucklesHusky\FontAwesomeIconPicker\Forms\FAPickerField;
+use DNADesign\Elemental\Forms\TextCheckboxGroupField;
 use SilverStripe\Assets\Image;
-use SilverStripe\ORM\DataObject;
+use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Control\Director;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
 use SilverStripe\Forms\GridField\GridFieldDeleteAction;
-use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\ORM\DataObject;
 use SilverStripe\Security\Permission;
-use SilverStripe\Control\Director;
-use SilverStripe\CMS\Model\SiteTree;
-use gorriecoe\Link\Models\Link;
-use gorriecoe\LinkField\LinkField;
-use BucklesHusky\FontAwesomeIconPicker\Forms\FAPickerField;
-use DNADesign\Elemental\Forms\TextCheckboxGroupField;
+use SilverStripe\Versioned\Versioned;
+use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 use Syntro\SilverStripeElementalBaseitems\Elements\BootstrapSectionBaseElement;
+use gorriecoe\LinkField\LinkField;
+use gorriecoe\Link\Models\Link;
 
 /**
  * Base Item handling permissions related to the elements and streamlining
@@ -59,7 +59,7 @@ class BaseItem extends DataObject
 
     /**
      * @config
-     * @var array
+     * @var string
      */
     private static $default_sort = 'Sort';