Radical reorg of some classes

octobercms · Jan 28, 2015 · b1b7003 · b1b7003
1 parent 9e50098
commit b1b7003
Show file tree

Hide file tree

Showing 71 changed files with 112 additions and 615 deletions.
diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
@@ -11,7 +11,7 @@
 use Backend\Classes\ControllerBehavior;
 use October\Rain\Support\Util;
 use October\Rain\Router\Helper as RouterHelper;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use Exception;
 
 /**

diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
@@ -3,7 +3,7 @@
 use Str;
 use Lang;
 use Event;
-use System\Classes\SystemException;
+use SystemException;
 use Backend\Classes\ControllerBehavior;
 use League\Csv\Writer;
 use SplTempFileObject;

diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
@@ -5,7 +5,7 @@
 use Event;
 use Form as FormHelper;
 use Backend\Classes\ControllerBehavior;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use October\Rain\Database\Model;
 
 /**

diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
@@ -15,10 +15,10 @@
 use BackendAuth;
 use Backend\Models\UserPreferences;
 use Backend\Models\BackendPreferences;
-use System\Classes\SystemException;
-use System\Classes\ApplicationException;
+use SystemException;
+use ApplicationException;
 use October\Rain\Extension\Extendable;
-use October\Rain\Support\ValidationException;
+use ValidationException;
 use Illuminate\Database\Eloquent\MassAssignmentException;
 use Illuminate\Http\RedirectResponse;
 

diff --git a/modules/backend/classes/ControllerBehavior.php b/modules/backend/classes/ControllerBehavior.php
@@ -2,7 +2,7 @@
 
 use Str;
 use Lang;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use October\Rain\Extension\ExtensionBase;
 use System\Traits\ViewMaker;
 

diff --git a/modules/backend/classes/WidgetManager.php b/modules/backend/classes/WidgetManager.php
@@ -2,8 +2,8 @@
 
 use Str;
 use File;
+use Yaml;
 use Closure;
-use October\Rain\Support\Yaml;
 use Illuminate\Container\Container;
 use System\Classes\PluginManager;
 

diff --git a/modules/backend/controllers/AccessLogs.php b/modules/backend/controllers/AccessLogs.php
@@ -8,7 +8,7 @@
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use System\Classes\SettingsManager;
 use Exception;
 

diff --git a/modules/backend/controllers/Auth.php b/modules/backend/controllers/Auth.php
@@ -11,8 +11,8 @@
 use Backend\Models\AccessLog;
 use Backend\Classes\Controller;
 use System\Classes\UpdateManager;
-use System\Classes\ApplicationException;
-use October\Rain\Support\ValidationException;
+use ApplicationException;
+use ValidationException;
 use Exception;
 
 /**

diff --git a/modules/backend/formwidgets/DataGrid.php b/modules/backend/formwidgets/DataGrid.php
@@ -2,7 +2,7 @@
 
 use Backend\Widgets\Grid;
 use Backend\Classes\FormWidgetBase;
-use System\Classes\ApplicationException;
+use ApplicationException;
 
 /**
  * Grid

diff --git a/modules/backend/formwidgets/DataTable.php b/modules/backend/formwidgets/DataTable.php
@@ -3,7 +3,7 @@
 use Lang;
 use Backend\Widgets\Table;
 use Backend\Classes\FormWidgetBase;
-use System\Classes\ApplicationException;
+use ApplicationException;
 
 /**
  * Data Table

diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php
@@ -4,10 +4,10 @@
 use Input;
 use Validator;
 use System\Models\File;
-use System\Classes\SystemException;
+use SystemException;
 use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
-use October\Rain\Support\ValidationException;
+use ValidationException;
 use Exception;
 
 /**

diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php
@@ -2,7 +2,7 @@
 
 use Lang;
 use Backend\Classes\FormWidgetBase;
-use System\Classes\SystemException;
+use SystemException;
 
 /**
  * Record Finder

diff --git a/modules/backend/formwidgets/Relation.php b/modules/backend/formwidgets/Relation.php
@@ -2,7 +2,7 @@
 
 use Lang;
 use Backend\Classes\FormWidgetBase;
-use System\Classes\SystemException;
+use SystemException;
 use Illuminate\Database\Eloquent\Relations\Relation as RelationBase;
 
 /**

diff --git a/modules/backend/models/UserPreferences.php b/modules/backend/models/UserPreferences.php
@@ -3,7 +3,7 @@
 use Exception;
 use BackendAuth;
 use October\Rain\Database\Model;
-use System\Classes\SystemException;
+use SystemException;
 use October\Rain\Auth\Models\Preferences as PreferencesBase;
 
 /**

diff --git a/modules/backend/traits/CollapsableWidget.php b/modules/backend/traits/CollapsableWidget.php
@@ -5,7 +5,7 @@
 use Lang;
 use Input;
 use Block;
-use System\Classes\SystemException;
+use SystemException;
 
 /**
  * Collapsable Widget Trait

diff --git a/modules/backend/traits/InspectableContainer.php b/modules/backend/traits/InspectableContainer.php
@@ -1,8 +1,8 @@
 <?php namespace Backend\Traits;
 
 use Request;
-use System\Classes\SystemException;
-use System\Classes\ApplicationException;
+use SystemException;
+use ApplicationException;
 
 /**
  * Inspectable Container Trait

diff --git a/modules/backend/traits/SearchableWidget.php b/modules/backend/traits/SearchableWidget.php
@@ -4,7 +4,7 @@
 use File;
 use Lang;
 use Block;
-use System\Classes\SystemException;
+use SystemException;
 
 /**
  * Searchable Widget Trait

diff --git a/modules/backend/traits/SelectableWidget.php b/modules/backend/traits/SelectableWidget.php
@@ -5,7 +5,7 @@
 use Lang;
 use Input;
 use Block;
-use System\Classes\SystemException;
+use SystemException;
 
 /**
  * Selectable Widget Trait

diff --git a/modules/backend/traits/WidgetMaker.php b/modules/backend/traits/WidgetMaker.php
@@ -2,7 +2,7 @@
 
 use Lang;
 use Backend\Classes\WidgetManager;
-use System\Classes\SystemException;
+use SystemException;
 
 /**
  * Config Maker Trait

diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php
@@ -4,7 +4,7 @@
 use Event;
 use Backend\Classes\WidgetBase;
 use Backend\Classes\FilterScope;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use October\Rain\Support\Util;
 
 /**

diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
@@ -10,7 +10,7 @@
 use Backend\Classes\FormField;
 use Backend\Classes\WidgetBase;
 use Backend\Classes\WidgetManager;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use Backend\Classes\FormWidgetBase;
 use October\Rain\Database\Model;
 

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
@@ -12,7 +12,7 @@
 use October\Rain\Router\Helper as RouterHelper;
 use Backend\Classes\ListColumn;
 use Backend\Classes\WidgetBase;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use October\Rain\Database\Model;
 use DateTime;
 

diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php
@@ -6,7 +6,7 @@
 use Backend\Classes\WidgetBase;
 use Backend\Classes\WidgetManager;
 use Backend\Models\UserPreferences;
-use System\Classes\ApplicationException;
+use ApplicationException;
 
 /**
  * Report Container Widget

diff --git a/modules/backend/widgets/Table.php b/modules/backend/widgets/Table.php
@@ -3,7 +3,7 @@
 use Input;
 use Request;
 use Backend\Classes\WidgetBase;
-use System\Classes\SystemException;
+use SystemException;
 
 /**
  * Table Widget.

diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
@@ -2,9 +2,9 @@
 
 use Validator;
 use Cms\Classes\CodeBase;
-use System\Classes\SystemException;
+use SystemException;
 use Cms\Classes\FileHelper;
-use October\Rain\Support\ValidationException;
+use ValidationException;
 use Cms\Classes\ViewBag;
 use Cache;
 use Config;

diff --git a/modules/cms/classes/CmsException.php b/modules/cms/classes/CmsException.php
@@ -3,7 +3,7 @@
 use File;
 use Twig_Error;
 use Cms\Classes\SectionParser;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use Exception;
 
 /**

diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
@@ -5,8 +5,8 @@
 use Cache;
 use Config;
 use Validator;
-use System\Classes\ApplicationException;
-use October\Rain\Support\ValidationException;
+use ApplicationException;
+use ValidationException;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use ArrayAccess;

diff --git a/modules/cms/classes/CmsObjectCollection.php b/modules/cms/classes/CmsObjectCollection.php
@@ -1,7 +1,7 @@
 <?php namespace Cms\Classes;
 
 use Illuminate\Support\Collection as CollectionBase;
-use System\Classes\ApplicationException;
+use ApplicationException;
 
 /**
  * This class represents a collection of Cms Objects.

diff --git a/modules/cms/classes/CmsObjectQuery.php b/modules/cms/classes/CmsObjectQuery.php
@@ -1,6 +1,6 @@
 <?php namespace Cms\Classes;
 
-use System\Classes\ApplicationException;
+use ApplicationException;
 
 /**
  * This class provides helper methods to make the CmsObject behave like a Model

diff --git a/modules/cms/classes/CmsPropertyHelper.php b/modules/cms/classes/CmsPropertyHelper.php
@@ -11,7 +11,7 @@
 
 use Flash;
 use Cms\Classes\Page;
-use System\Classes\ApplicationException;
+use ApplicationException;
 
 /**
  * This class provides helper methods for inspectable properties.

diff --git a/modules/cms/classes/CodeParser.php b/modules/cms/classes/CodeParser.php
@@ -4,7 +4,7 @@
 use Lang;
 use Cache;
 use Config;
-use System\Classes\SystemException;
+use SystemException;
 
 /**
  * Parses the PHP code section of CMS objects.

diff --git a/modules/cms/classes/ComponentManager.php b/modules/cms/classes/ComponentManager.php
@@ -3,7 +3,7 @@
 use Str;
 use Illuminate\Container\Container;
 use System\Classes\PluginManager;
-use System\Classes\SystemException;
+use SystemException;
 
 /**
  * Component manager

diff --git a/modules/cms/classes/Content.php b/modules/cms/classes/Content.php
@@ -1,7 +1,7 @@
 <?php namespace Cms\Classes;
 
 use File;
-use October\Rain\Support\Markdown;
+use Markdown;
 
 /**
  * The CMS content file class.

diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
@@ -23,9 +23,9 @@
 use System\Models\RequestLog;
 use System\Classes\ErrorHandler;
 use System\Classes\CombineAssets;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use System\Twig\Extension as SystemTwigExtension;
-use October\Rain\Support\ValidationException;
+use ValidationException;
 use Illuminate\Http\RedirectResponse;
 
 /**

diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
@@ -1,7 +1,7 @@
 <?php namespace Cms\Classes;
 
 use Cms\Classes\Theme;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use Cms\Classes\Layout;
 use Lang;
 

diff --git a/modules/cms/classes/Router.php b/modules/cms/classes/Router.php
@@ -5,7 +5,7 @@
 use Cache;
 use Config;
 use Event;
-use System\Classes\SystemException;
+use SystemException;
 use October\Rain\Router\Router as RainRouter;
 use October\Rain\Router\Helper as RouterHelper;
 

diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
@@ -2,14 +2,14 @@
 
 use URL;
 use File;
+use Yaml;
 use Lang;
 use Cache;
 use Event;
 use Config;
 use DbDongle;
-use October\Rain\Support\Yaml;
 use System\Models\Parameters;
-use System\Classes\SystemException;
+use SystemException;
 use Cms\Models\ThemeData;
 use DirectoryIterator;
 

diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
@@ -23,7 +23,7 @@
 use Cms\Classes\CmsCompoundObject;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\ComponentPartial;
-use System\Classes\ApplicationException;
+use ApplicationException;
 use Backend\Traits\InspectableContainer;
 use October\Rain\Router\Router as RainRouter;
 

diff --git a/modules/cms/formwidgets/Components.php b/modules/cms/formwidgets/Components.php
@@ -1,10 +1,10 @@
 <?php namespace Cms\FormWidgets;
 
+use Lang;
 use Backend\Classes\FormWidgetBase;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\ComponentHelpers;
 use Cms\Classes\UnknownComponent;
-use Lang;
 use Exception;
 
 /**

diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
@@ -10,7 +10,7 @@
 use Twig_SimpleFunction;
 use Cms\Classes\Controller;
 use Cms\Classes\CmsException;
-use System\Classes\ApplicationException;
+use ApplicationException;
 
 /**
  * The CMS Twig extension class implements the basic CMS Twig functions and filters.