Fix remaining global imports

wintercms · Dec 16, 2024 · 69f19e3 · 69f19e3
1 parent afedfb9
commit 69f19e3
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
@@ -3,12 +3,12 @@
 namespace Backend\Behaviors;
 
 use Backend\Classes\ControllerBehavior;
-use Form as FormHelper;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Request;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\Form as FormHelper;
 
 /**
  * Uses a combination of lists and forms for managing Model relations.

diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php
@@ -8,7 +8,7 @@
 use DirectoryIterator;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Lang;
-use Session;
+use Illuminate\Support\Facades\Session;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Support\Facades\Config;
 

diff --git a/modules/backend/traits/SessionMaker.php b/modules/backend/traits/SessionMaker.php
@@ -2,7 +2,7 @@
 
 namespace Backend\Traits;
 
-use Session;
+use Illuminate\Support\Facades\Session;
 use Winter\Storm\Support\Str;
 
 /**

diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
@@ -9,11 +9,11 @@
 use Backend\Classes\WidgetManager;
 use Backend\Facades\BackendAuth;
 use Exception;
-use Form as FormHelper;
 use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Html\Helper as HtmlHelper;
+use Winter\Storm\Support\Facades\Form as FormHelper;
 
 /**
  * Form Widget

diff --git a/modules/system/classes/ImageResizer.php b/modules/system/classes/ImageResizer.php
@@ -3,17 +3,17 @@
 namespace System\Classes;
 
 use Exception;
-use File as FileHelper;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
-use Storage;
 use System\Models\File as SystemFileModel;
 use Winter\Storm\Database\Attach\File as FileModel;
 use Winter\Storm\Database\Attach\Resizer as DefaultResizer;
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File as FileHelper;
 
 /**
  * Image Resizing class used for resizing any image resources accessible

diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
@@ -5,8 +5,8 @@
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
-use Storage;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;

diff --git a/modules/system/helpers/Cache.php b/modules/system/helpers/Cache.php
@@ -2,8 +2,8 @@
 
 namespace System\Helpers;
 
-use Cache as CacheFacade;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache as CacheFacade;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\File;
 

diff --git a/modules/system/helpers/View.php b/modules/system/helpers/View.php
@@ -2,7 +2,7 @@
 
 namespace System\Helpers;
 
-use View as ViewFacade;
+use Illuminate\Support\Facades\View as ViewFacade;
 
 /**
  * This helper class is used to extract basic variables

diff --git a/modules/system/models/File.php b/modules/system/models/File.php
@@ -3,8 +3,8 @@
 namespace System\Models;
 
 use Backend\Controllers\Files;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
-use Storage;
 use Winter\Storm\Database\Attach\File as FileBase;
 use Winter\Storm\Support\Facades\Config;
 

diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
@@ -3,11 +3,11 @@
 namespace System\Models;
 
 use Exception;
-use File as FileHelper;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Less_Parser;
 use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Facades\File as FileHelper;
 use Winter\Storm\Support\Str;
 
 /**

diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php
@@ -3,12 +3,12 @@
 namespace System\Models;
 
 use Exception;
-use File as FileHelper;
 use Illuminate\Support\Facades\View;
 use System\Classes\MailManager;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Mail\MailParser;
+use Winter\Storm\Support\Facades\File as FileHelper;
 
 /**
  * Mail partial

diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php
@@ -2,11 +2,11 @@
 
 namespace System\Models;
 
-use File as FileHelper;
 use Illuminate\Support\Facades\View;
 use System\Classes\MailManager;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Mail\MailParser;
+use Winter\Storm\Support\Facades\File as FileHelper;
 
 /**
  * Mail template

diff --git a/modules/system/traits/SecurityController.php b/modules/system/traits/SecurityController.php
@@ -5,7 +5,7 @@
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Request;
-use Session;
+use Illuminate\Support\Facades\Session;
 use Symfony\Component\HttpFoundation\Cookie;
 use Winter\Storm\Support\Facades\Config;