From 5b377eeaa33b190b80c5a3167b43063c9b6233e4 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 16 Jun 2016 17:06:51 +1200
Subject: [PATCH] API Apply SilverStripe\Security namespace

---
 code/Report.php      |  3 +++
 code/ReportAdmin.php | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/code/Report.php b/code/Report.php
index a4399596..87468c5f 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -2,6 +2,8 @@
 
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\SS_List;
+use SilverStripe\Security\Member;
+use SilverStripe\Security\Permission;
 
 /**
  * Base "abstract" class creating reports on your data.
@@ -514,6 +516,7 @@ abstract class SS_ReportWrapper extends SS_Report
 
     public function group()
     {
+        /** @skipUpgrade */
 		return $this->baseReport->hasMethod('group') ? $this->baseReport->group() : 'Group';
 	}
 
diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 01fdfc2f..f75efde3 100644
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -1,6 +1,9 @@
 <?php
 
 use SilverStripe\ORM\ArrayList;
+use SilverStripe\ORM\SS_List;
+use SilverStripe\Security\Member;
+use SilverStripe\Security\PermissionProvider;
 
 /**
  * Reports section of the CMS.
@@ -52,8 +55,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
         $this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
 
         // Set custom options for TinyMCE specific to ReportAdmin
-        HtmlEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
-        HtmlEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
+        HTMLEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
+        HTMLEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
 
         // Always block the HtmlEditorField.js otherwise it will be sent with an ajax request
         Requirements::block(FRAMEWORK_DIR . '/javascript/HtmlEditorField.js');
@@ -147,7 +150,9 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
 
     /**
      * Returns the link to the report admin section, or the specific report that is currently displayed
-     * @return String
+     *
+     * @param string $action
+     * @return string
      */
     public function Link($action = null)
     {