Merge branch '1' into 2

silverstripe · Aug 31, 2022 · ec1111f · ec1111f
2 parents 809ca2d + 9308bfe
commit ec1111f
Show file tree

Hide file tree

Showing 27 changed files with 413 additions and 207 deletions.
diff --git a/code/AdminRootController.php b/code/AdminRootController.php
@@ -69,11 +69,11 @@ public static function admin_url()
     public static function rules()
     {
         if (self::$adminRules === null) {
-            self::$adminRules = array();
+            self::$adminRules = [];
 
             // Map over the array calling add_rule_for_controller on each
             $classes = CMSMenu::get_cms_classes(null, true, CMSMenu::URL_PRIORITY);
-            array_map(array(__CLASS__, 'add_rule_for_controller'), $classes ?? []);
+            array_map([__CLASS__, 'add_rule_for_controller'], $classes ?? []);
         }
         return self::$adminRules;
     }
@@ -135,8 +135,8 @@ public function handleRequest(HTTPRequest $request)
      */
     public static function get_template_global_variables()
     {
-        return array(
+        return [
             'adminURL' => 'admin_url'
-        );
+        ];
     }
 }
diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
@@ -99,14 +99,14 @@ public function response($successMessage, $status)
      *     }
      *  }
      */
-    public function batchaction(SS_List $objs, $helperMethod, $successMessage, $arguments = array())
+    public function batchaction(SS_List $objs, $helperMethod, $successMessage, $arguments = [])
     {
-        $status = array('modified' => array(), 'error' => array(), 'deleted' => array(), 'success' => array());
+        $status = ['modified' => [], 'error' => [], 'deleted' => [], 'success' => []];
 
         foreach ($objs as $obj) {
             // Perform the action
             $id = $obj->ID;
-            if (!call_user_func_array(array($obj, $helperMethod), $arguments ?? [])) {
+            if (!call_user_func_array([$obj, $helperMethod], $arguments ?? [])) {
                 $status['error'][$id] = $id;
             } else {
                 $status['success'][$id] = $id;
@@ -115,9 +115,9 @@ public function batchaction(SS_List $objs, $helperMethod, $successMessage, $argu
             // Now make sure the tree title is appropriately updated
             $publishedRecord = DataObject::get_by_id($this->managedClass, $id);
             if ($publishedRecord) {
-                $status['modified'][$id] = array(
+                $status['modified'][$id] = [
                     'TreeTitle' => $publishedRecord->TreeTitle,
-                );
+                ];
             } else {
                 $status['deleted'][$id] = $id;
             }
@@ -148,7 +148,7 @@ public function applicablePagesHelper($ids, $methodName, $checkStagePages = true
             user_error("Bad \$methodName passed to applicablePagesHelper()", E_USER_WARNING);
         }
 
-        $applicableIDs = array();
+        $applicableIDs = [];
 
         $managedClass = $this->managedClass;
         $draftPages = DataObject::get($managedClass)->byIDs($ids);

diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php
@@ -25,7 +25,7 @@ class CMSBatchActionHandler extends RequestHandler
 {
 
     /** @config */
-    private static $batch_actions = array();
+    private static $batch_actions = [];
 
     /**
      * List of registered actions
@@ -34,17 +34,17 @@ class CMSBatchActionHandler extends RequestHandler
      */
     private static $registered_actions = null;
 
-    private static $url_handlers = array(
+    private static $url_handlers = [
         '$BatchAction/applicablepages' => 'handleApplicablePages',
         '$BatchAction/confirmation' => 'handleConfirmation',
         '$BatchAction' => 'handleBatchAction',
-    );
+    ];
 
-    private static $allowed_actions = array(
+    private static $allowed_actions = [
         'handleBatchAction',
         'handleApplicablePages',
         'handleConfirmation',
-    );
+    ];
 
     /**
      * @var Controller
@@ -178,7 +178,7 @@ public function handleApplicablePages($request)
         if ($ids) {
             $applicableIDs = $actionHandler->applicablePages($ids);
         } else {
-            $applicableIDs = array();
+            $applicableIDs = [];
         }
 
         $response = new HTTPResponse(json_encode($applicableIDs));
@@ -206,7 +206,7 @@ public function handleConfirmation($request)
         if ($actionHandler->hasMethod('confirmationDialog')) {
             $response = new HTTPResponse(json_encode($actionHandler->confirmationDialog($ids)));
         } else {
-            $response = new HTTPResponse(json_encode(array('alert' => false)));
+            $response = new HTTPResponse(json_encode(['alert' => false]));
         }
 
         $response->addHeader("Content-type", "application/json");
@@ -246,10 +246,10 @@ public function batchActionList()
         foreach ($actions as $urlSegment => $action) {
             $actionObj = $this->buildAction($action['class']);
             if ($actionObj->canView()) {
-                $actionDef = new ArrayData(array(
+                $actionDef = new ArrayData([
                     "Link" => Controller::join_links($this->Link(), $urlSegment),
                     "Title" => $actionObj->getActionTitle(),
-                ));
+                ]);
                 $actionList->push($actionDef);
             }
         }

diff --git a/code/CMSMenu.php b/code/CMSMenu.php
@@ -48,7 +48,7 @@ class CMSMenu implements IteratorAggregate, i18nEntityProvider
      *  - array('type' => 'add', 'item' => CMSMenuItem::create(...) )
      *  - array('type' => 'remove', 'code' => 'codename' )
      */
-    protected static $menu_item_changes = array();
+    protected static $menu_item_changes = [];
 
     /**
      * Set to true if clear_menu() is called, to indicate that the default menu shouldn't be
@@ -200,7 +200,7 @@ public static function get_menu_code($cmsClass)
      */
     public static function get_menu_items()
     {
-        $menuItems = array();
+        $menuItems = [];
 
         // Set up default menu items
         if (!self::$menu_is_cleared) {
@@ -231,8 +231,8 @@ public static function get_menu_items()
         }
 
         // Sort menu items according to priority, then title asc
-        $menuPriority = array();
-        $menuTitle    = array();
+        $menuPriority = [];
+        $menuTitle    = [];
         foreach ($menuItems as $key => $menuItem) {
             $menuPriority[$key] = is_numeric($menuItem->priority) ? $menuItem->priority : 0;
             $menuTitle[$key]    = $menuItem->title;
@@ -255,7 +255,7 @@ public static function get_viewable_menu_items($member = null)
             $member = Security::getCurrentUser();
         }
 
-        $viewableMenuItems = array();
+        $viewableMenuItems = [];
         $allMenuItems = self::get_menu_items();
         if ($allMenuItems) {
             foreach ($allMenuItems as $code => $menuItem) {
@@ -287,7 +287,7 @@ public static function get_viewable_menu_items($member = null)
      */
     public static function remove_menu_item($code)
     {
-        self::$menu_item_changes[] = array('type' => 'remove', 'code' => $code);
+        self::$menu_item_changes[] = ['type' => 'remove', 'code' => $code];
     }
 
     /**
@@ -306,7 +306,7 @@ public static function remove_menu_class($className)
      */
     public static function clear_menu()
     {
-        self::$menu_item_changes = array();
+        self::$menu_item_changes = [];
         self::$menu_is_cleared = true;
     }
 
@@ -342,11 +342,11 @@ public static function replace_menu_item(
             $item->setAttributes($attributes);
         }
 
-        self::$menu_item_changes[] = array(
+        self::$menu_item_changes[] = [
             'type' => 'add',
             'code' => $code,
             'item' => $item,
-        );
+        ];
     }
 
     /**
@@ -357,11 +357,11 @@ public static function replace_menu_item(
      */
     protected static function add_menu_item_obj($code, $cmsMenuItem)
     {
-        self::$menu_item_changes[] = array(
+        self::$menu_item_changes[] = [
             'type' => 'add',
             'code' => $code,
             'item' => $cmsMenuItem,
-        );
+        ];
     }
 
     /**
@@ -428,7 +428,7 @@ public function getIterator()
     public function provideI18nEntities()
     {
         $cmsClasses = self::get_cms_classes();
-        $entities = array();
+        $entities = [];
         foreach ($cmsClasses as $cmsClass) {
             $defaultTitle = LeftAndMain::menu_title($cmsClass, false);
             $ownerModule = ClassLoader::inst()->getManifest()->getOwnerModule($cmsClass);

diff --git a/code/CMSMenuItem.php b/code/CMSMenuItem.php
@@ -49,7 +49,7 @@ class CMSMenuItem
      *
      * @var string
      */
-    protected $attributes = array();
+    protected $attributes = [];
 
     /**
      * @var string
@@ -105,7 +105,7 @@ public function getAttributesHTML($attrs = null)
         }
 
         // Create markkup
-        $parts = array();
+        $parts = [];
 
         foreach ($attrs as $name => $value) {
             if ($value === true) {

diff --git a/code/CMSProfileController.php b/code/CMSProfileController.php
@@ -111,6 +111,6 @@ public function save($data, $form)
     public function Breadcrumbs($unlinked = false)
     {
         $items = parent::Breadcrumbs($unlinked);
-        return new ArrayList(array($items[0]));
+        return new ArrayList([$items[0]]);
     }
 }
diff --git a/code/Forms/UsedOnTable.php b/code/Forms/UsedOnTable.php
@@ -186,12 +186,12 @@ public function setRecord($record)
      */
     public function getAttributes()
     {
-        $attributes = array(
+        $attributes = [
             'class' => $this->extraClass(),
             'id' => $this->ID(),
             'data-schema' => json_encode($this->getSchemaData()),
             'data-state' => json_encode($this->getSchemaState()),
-        );
+        ];
 
         $attributes = array_merge($attributes, $this->attributes);
 

diff --git a/code/GroupImportForm.php b/code/GroupImportForm.php
@@ -50,7 +50,7 @@ public function __construct($controller, $name, $fields = null, $actions = null,
                 . 'cleared.</li>'
                 . '</ul>'
                 . '</div>',
-                array('columns' => $columns)
+                ['columns' => $columns]
             );
 
             $fields = new FieldList(
@@ -63,7 +63,7 @@ public function __construct($controller, $name, $fields = null, $actions = null,
                     ))
                 )
             );
-            $fileField->getValidator()->setAllowedExtensions(array('csv'));
+            $fileField->getValidator()->setAllowedExtensions(['csv']);
         }
 
         if (!$actions) {
@@ -90,26 +90,26 @@ public function doImport($data, $form)
         $result = $loader->load($data['CsvFile']['tmp_name']);
 
         // result message
-        $msgArr = array();
+        $msgArr = [];
         if ($result->CreatedCount()) {
             $msgArr[] = _t(
                 __CLASS__ . '.ResultCreated',
                 'Created {count} groups',
-                array('count' => $result->CreatedCount())
+                ['count' => $result->CreatedCount()]
             );
         }
         if ($result->UpdatedCount()) {
             $msgArr[] = _t(
                 __CLASS__ . '.ResultUpdated',
                 'Updated {count} groups',
-                array('count' => $result->UpdatedCount())
+                ['count' => $result->UpdatedCount()]
             );
         }
         if ($result->DeletedCount()) {
             $msgArr[] = _t(
                 __CLASS__ . '.ResultDeleted',
                 'Deleted {count} groups',
-                array('count' => $result->DeletedCount())
+                ['count' => $result->DeletedCount()]
             );
         }
         $msg = ($msgArr) ? implode(',', $msgArr) : _t('SilverStripe\\Admin\\MemberImportForm.ResultNone', 'No changes');