Merge pull request #1604 from open-sausages/pulls/4.0/namespace-fixes

BUG Fix some namespace class errors
This commit is contained in:
Daniel Hensby 2016-09-08 10:18:48 +01:00 committed by GitHub
commit 5b00d5af99
7 changed files with 10 additions and 4 deletions

View File

@ -12,6 +12,7 @@ use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\Control\Session; use SilverStripe\Control\Session;
use SilverStripe\Control\SS_HTTPRequest;
use SilverStripe\Control\SS_HTTPResponse; use SilverStripe\Control\SS_HTTPResponse;
use SilverStripe\Control\SS_HTTPResponse_Exception; use SilverStripe\Control\SS_HTTPResponse_Exception;
use SilverStripe\Core\Convert; use SilverStripe\Core\Convert;
@ -23,6 +24,7 @@ use SilverStripe\Forms\FieldGroup;
use SilverStripe\Forms\FieldList; use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\Form; use SilverStripe\Forms\Form;
use SilverStripe\Forms\FormAction; use SilverStripe\Forms\FormAction;
use SilverStripe\Forms\FormField;
use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\GridField\GridField;
use SilverStripe\Forms\GridField\GridFieldConfig; use SilverStripe\Forms\GridField\GridFieldConfig;
use SilverStripe\Forms\GridField\GridFieldDataColumns; use SilverStripe\Forms\GridField\GridFieldDataColumns;
@ -34,12 +36,12 @@ use SilverStripe\Forms\LabelField;
use SilverStripe\Forms\LiteralField; use SilverStripe\Forms\LiteralField;
use SilverStripe\Forms\RequiredFields; use SilverStripe\Forms\RequiredFields;
use SilverStripe\Forms\ResetFormAction; use SilverStripe\Forms\ResetFormAction;
use SilverStripe\Forms\TabSet;
use SilverStripe\Forms\TextField; use SilverStripe\Forms\TextField;
use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB; use SilverStripe\ORM\DB;
use SilverStripe\ORM\FieldType\DBHTMLText;
use SilverStripe\ORM\HiddenClass; use SilverStripe\ORM\HiddenClass;
use SilverStripe\ORM\SS_List; use SilverStripe\ORM\SS_List;
use SilverStripe\ORM\Versioning\Versioned; use SilverStripe\ORM\Versioning\Versioned;

View File

@ -9,7 +9,6 @@ use SilverStripe\Control\SS_HTTPRequest;
use SilverStripe\Control\SS_HTTPResponse; use SilverStripe\Control\SS_HTTPResponse;
use SilverStripe\Control\SS_HTTPResponse_Exception; use SilverStripe\Control\SS_HTTPResponse_Exception;
use SilverStripe\Core\Extension; use SilverStripe\Core\Extension;
use SilverStripe\ORM\Queries\SQLSelect;
class OldPageRedirector extends Extension { class OldPageRedirector extends Extension {

View File

@ -1,4 +1,5 @@
<?php <?php
namespace SilverStripe\CMS\Controllers; namespace SilverStripe\CMS\Controllers;
use SilverStripe\Admin\CMSPreviewable; use SilverStripe\Admin\CMSPreviewable;

View File

@ -1,8 +1,9 @@
<?php <?php
namespace SilverStripe\CMS\Controllers; namespace SilverStripe\CMS\Controllers;
use Controller;
use SilverStripe\CMS\Model\RedirectorPage; use SilverStripe\CMS\Model\RedirectorPage;
use SilverStripe\Control\Controller;
use SilverStripe\Core\Convert;
use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\Versioning\Versioned; use SilverStripe\ORM\Versioning\Versioned;
@ -34,7 +35,7 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem
if (empty($date)) { if (empty($date)) {
return null; return null;
} }
/** @var SS_Datetime $dateObj */ /** @var DBDatetime $dateObj */
$dateObj = DBField::create_field('Datetime', $date); $dateObj = DBField::create_field('Datetime', $date);
$title = _t('ContentControl.NOTEWONTBESHOWN', 'Note: this message will not be shown to your visitors'); $title = _t('ContentControl.NOTEWONTBESHOWN', 'Note: this message will not be shown to your visitors');
return "<div id=\"SilverStripeNavigatorMessage\" title=\"{$title}\">" return "<div id=\"SilverStripeNavigatorMessage\" title=\"{$title}\">"

View File

@ -1,4 +1,5 @@
<?php <?php
namespace SilverStripe\CMS\Controllers; namespace SilverStripe\CMS\Controllers;
use SilverStripe\Admin\LeftAndMain; use SilverStripe\Admin\LeftAndMain;

View File

@ -3,6 +3,7 @@ namespace SilverStripe\CMS\Controllers;
use SilverStripe\CMS\Model\RedirectorPage; use SilverStripe\CMS\Model\RedirectorPage;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Core\Convert;
use SilverStripe\ORM\Versioning\Versioned; use SilverStripe\ORM\Versioning\Versioned;
class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem

View File

@ -4,6 +4,7 @@ namespace SilverStripe\CMS\Controllers;
use SilverStripe\CMS\Model\RedirectorPage; use SilverStripe\CMS\Model\RedirectorPage;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Core\ClassInfo; use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Convert;
use SilverStripe\ORM\Versioning\Versioned; use SilverStripe\ORM\Versioning\Versioned;
use SiteTreeFutureState; use SiteTreeFutureState;