Merge pull request #17 from open-sausages/pulls/4.0/fix-namespace-security

Fix to support security namespace

_config.php

@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Security\Member;
+
 Member::add_extension('FrameworkTestRole');
 Member::add_extension('FileUploadRole');
 SiteTree::add_extension('FrameworkTestSiteTreeExtension');

code/Employee.php

@@ -32,6 +32,8 @@ class Employee extends DataObject
         'PastCompanies' => 'SilverStripe\\FrameworkTest\\Model\\Company'
     );
 
+    private static $table_name = 'Employee';
+
     public function getCMSFields()
     {
         $fields = parent::getCMSFields();

code/FrameworkTestRole.php

@@ -3,6 +3,8 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\Security\Member;
+
 
 class FrameworkTestRole extends DataExtension
 {
@@ -21,7 +23,7 @@ class FrameworkTestRole extends DataExtension
 
     public function requireDefaultRecords()
     {
-        $hasTestMembers = DataObject::get('Member')->find('Email', 'hayley@test.com');
+        $hasTestMembers = Member::get()->find('Email', 'hayley@test.com');
         if (!$hasTestMembers) {
             foreach ($this->data() as $name) {
                 $member = new Member(array(

code/FrameworktestRegressSessionAdmin.php

@@ -1,4 +1,8 @@
 <?php
+
+use SilverStripe\Security\Permission;
+use SilverStripe\Security\Security;
+
 /**
  * Starts a test session with various configurations set in session.
  * These configurations are assumed to be evaluated in mysite/_config.php,

code/TestFileUploadPage.php

@@ -2,6 +2,7 @@
 
 use SilverStripe\FrameworkTest\Model\TestPage;
 use SilverStripe\FrameworkTest\Model\TestPage_Controller;
+use SilverStripe\Security\Member;
 
 class TestFileUploadPage extends TestPage
 {

code/multiform/Page2MultiForm.php

@@ -1,6 +1,7 @@
 <?php
 
 use SilverStripe\ORM\DataObject;
+use SilverStripe\Security\Member;
 
 class Page2MultiForm extends MultiForm
 {

code/multiform/Page3MultiForm.php

@@ -1,6 +1,7 @@
 <?php
 
 use SilverStripe\ORM\DataObject;
+use SilverStripe\Security\Member;
 
 class Page3MultiForm extends MultiForm
 {