upgrader: namespacing classes

code/admin/SubsiteAdmin.php

@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\Subsites\Admin;
+
+
 use SilverStripe\Admin\ModelAdmin;
+use SilverStripe\Subsites\Forms\GridFieldSubsiteDetailForm;
+
 /**
  * Admin interface to manage and create {@link Subsite} instances.
  *

code/controller/SubsiteXHRController.php

@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\Subsites\Controller;
+
+
 use SilverStripe\Admin\LeftAndMain;
+use SilverStripe\Subsites\Model\Subsite;
+
 
 /**
  * Section-agnostic PJAX controller.

code/extensions/CMSPageAddControllerExtension.php

@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\Core\Extension;
+use SilverStripe\Subsites\Model\Subsite;
+
 class CMSPageAddControllerExtension extends Extension {
 
 	function updatePageOptions(&$fields) {

code/extensions/ControllerSubsites.php

@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\View\SSViewer;
 use SilverStripe\Core\Extension;
+use SilverStripe\Subsites\Model\Subsite;
+
 /**
  * @package subsites
  */

code/extensions/ErrorPageSubsite.php

@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\Subsites\Model\Subsite;
+
 class ErrorPageSubsite extends DataExtension {
 
 	/**

code/extensions/FileSubsites.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Assets\Folder;
 use SilverStripe\Forms\DropdownField;
@@ -9,6 +12,8 @@ use SilverStripe\ORM\DataQuery;
 use SilverStripe\Control\Session;
 use SilverStripe\Security\Permission;
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\Subsites\Model\Subsite;
+
 /**
  * Extension for the File object to add subsites support
  *

code/extensions/GroupSubsites.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\ORM\DB;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Core\Convert;
@@ -11,6 +14,8 @@ use SilverStripe\ORM\DataQuery;
 use SilverStripe\Control\Cookie;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\Security\PermissionProvider;
+use SilverStripe\Subsites\Model\Subsite;
+
 /**
  * Extension for the Group object to add subsites support
  *

code/extensions/LeftAndMainSubsites.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\View\Requirements;
 use SilverStripe\Core\Convert;
 use SilverStripe\Forms\HiddenField;
@@ -14,6 +17,8 @@ use SilverStripe\Admin\CMSMenu;
 use SilverStripe\Security\Security;
 use SilverStripe\Control\Controller;
 use SilverStripe\Core\Extension;
+use SilverStripe\Subsites\Model\Subsite;
+
 /**
  * Decorator designed to add subsites support to LeftAndMain
  *

code/extensions/SiteConfigSubsites.php

@@ -1,10 +1,15 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\ORM\Queries\SQLSelect;
 use SilverStripe\ORM\DataQuery;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\Subsites\Model\Subsite;
+
 
 /**
  * Extension for the SiteConfig object to add subsites support

code/extensions/SiteTreeSubsites.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\ORM\Queries\SQLSelect;
 use SilverStripe\ORM\DataQuery;
 use SilverStripe\Forms\FieldList;
@@ -14,6 +17,9 @@ use SilverStripe\Security\Member;
 use SilverStripe\Control\HTTP;
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\Subsites\Model\Subsite;
+use Page;
+
 
 /**
  * Extension for the SiteTree object to add subsites support

code/extensions/SubsiteMenuExtension.php

@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\Subsites\Extensions;
+
+
 use SilverStripe\Core\Extension;
 
+
+
 /*
  * Simple extension to show admins in the menu of subsites.
  * If an admin area should be available to a subsite, you can attach 

code/forms/GridFieldSubsiteDetailForm.php

@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\Subsites\Forms;
+
+
 use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
+use Subsite;
+
 class GridFieldSubsiteDetailForm extends GridFieldDetailForm {
 	protected $itemRequestClass='GridFieldSubsiteDetailForm_ItemRequest';
 }

code/forms/SubsitesTreeDropdownField.php

@@ -1,9 +1,14 @@
 <?php
 
+namespace SilverStripe\Subsites\Forms;
+
+
 use SilverStripe\View\Requirements;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\Session;
 use SilverStripe\Forms\TreeDropdownField;
+
+
 /**
  * Wraps around a TreedropdownField to add ability for temporary
  * switching of subsite sessions.

code/model/Subsite.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\Subsites\Model;
+
+
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Control\Session;
 use SilverStripe\i18n\i18n;
@@ -25,7 +28,9 @@ use SilverStripe\Forms\TabSet;
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\ORM\ArrayLib;
-use SilverStripe\ORM\Versioning\Versioned;
+use SilverStripe\Versioned\Versioned;
+use UnexpectedValueException;
+
 /**
  * A dynamically created subsite. SiteTree objects can now belong to a subsite.
  * You can simulate subsite access without setting up virtual hosts by appending ?SubsiteID=<ID> to the request.

code/model/SubsiteDomain.php

@@ -1,11 +1,16 @@
 <?php
 
+namespace SilverStripe\Subsites\Model;
+
+
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\CheckboxField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\DataObject;
 
+
+
 /**
  * @property text Domain domain name of this subsite. Do not include the URL scheme here
  * @property bool IsPrimary Is this the primary subdomain?

code/pages/SubsitesVirtualPage.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\Subsites\Pages;
+
+
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\View\ArrayData;
@@ -12,6 +15,9 @@ use SilverStripe\Control\Session;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\CMS\Model\VirtualPage;
 use SilverStripe\CMS\Model\VirtualPage_Controller;
+use SubsitesTreeDropdownField;
+use Subsite;
+
 class SubsitesVirtualPage extends VirtualPage {
 
 	private static $description = 'Displays the content of a page on another subsite';

code/reports/SubsiteReportWrapper.php

@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\Subsites\Reports;
+
+
 use SilverStripe\Forms\TreeMultiselectField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Reports\ReportWrapper;
+use SilverStripe\Subsites\Model\Subsite;
+
 
 /**
  * Creates a subsite-aware version of another report.

code/tasks/SubsiteCopyPagesTask.php

@@ -1,8 +1,15 @@
 <?php
 
+namespace SilverStripe\Subsites\Tasks;
+
+
 use SilverStripe\ORM\DataObject;
-use SilverStripe\ORM\Versioning\Versioned;
 use SilverStripe\Dev\BuildTask;
+use InvalidArgumentException;
+use SilverStripe\Subsites\Model\Subsite;
+use SilverStripe\Versioned\Versioned;
+use SubsitesVirtualPage;
+
 /**
  * Handy alternative to copying pages when creating a subsite through the UI.
  * Can be used to batch-add new pages after subsite creation,