Use Winter's Url facade instead of Laravel's

wintercms · Dec 16, 2024 · 02c8469 · 02c8469
1 parent 09b945e
commit 02c8469
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/modules/backend/helpers/Backend.php b/modules/backend/helpers/Backend.php
@@ -7,12 +7,12 @@
 use Exception;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\URL;
 use System\Helpers\DateTime as DateTimeHelper;
 use Winter\Storm\Router\Helper as RouterHelper;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Html;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Backend Helper

diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php
@@ -7,11 +7,11 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\URL;
 use Less_Parser;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Brand settings that affect all users

diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
@@ -22,13 +22,13 @@
 use Exception;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\URL;
 use System\Helpers\DateTime;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Router\Router as StormRouter;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * CMS index

diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
@@ -16,12 +16,12 @@
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Redirect;
-use Illuminate\Support\Facades\URL;
 use System\Classes\SettingsManager;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Exception\ValidationException;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Str;
 
 /**

diff --git a/modules/cms/helpers/Cms.php b/modules/cms/helpers/Cms.php
@@ -3,8 +3,8 @@
 namespace Cms\Helpers;
 
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\URL;
 use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * CMS Helper

diff --git a/modules/cms/twig/FrameworkNode.php b/modules/cms/twig/FrameworkNode.php
@@ -2,11 +2,11 @@
 
 namespace Cms\Twig;
 
-use Illuminate\Support\Facades\URL;
 use System\Classes\CombineAssets;
 use System\Models\Parameter;
 use Twig\Compiler as TwigCompiler;
 use Twig\Node\Node as TwigNode;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Represents a "framework" node

diff --git a/modules/cms/twig/SnowboardNode.php b/modules/cms/twig/SnowboardNode.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Twig;
 
-use Illuminate\Support\Facades\URL;
 use System\Classes\CombineAssets;
 use System\Models\Parameter;
 use Twig\Compiler as TwigCompiler;
 use Twig\Node\Node as TwigNode;
 use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Represents a "snowboard" node

diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
@@ -10,14 +10,14 @@
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\URL;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Input;
+use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Str;
 
 /**

diff --git a/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed
@@ -2,7 +2,7 @@
 
 use Winter\Storm\Support\Facades\Config as MyConfig;
 use Illuminate\Support\Facades\Lang as MyLang;
-use Winter\Storm\Support\Facades\URL;
+use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Arr;
 use Winter\Storm\Support\Facades\Yaml;
 

diff --git a/modules/system/aliases.php b/modules/system/aliases.php
@@ -41,7 +41,7 @@
     'Session'      => Illuminate\Support\Facades\Session::class,
     'Storage'      => Illuminate\Support\Facades\Storage::class,
     // 'Str'       => Illuminate\Support\Str::class,                  // Replaced by Winter
-    // 'URL'       => Illuminate\Support\Facades\URL::class,       // Replaced by Winter
+    // 'URL'       => Illuminate\Support\Facades\URL::class,          // Replaced by Winter
     // 'Validator' => Illuminate\Support\Facades\Validator::class,    // Replaced by Winter
     'View'         => Illuminate\Support\Facades\View::class,
 
@@ -85,7 +85,7 @@
      * Backwards compatibility aliases
      */
     'Db'             => Winter\Storm\Support\Facades\DB::class,
-    'Url'            => Winter\Storm\Support\Facades\URL::class,
+    'Url'            => Winter\Storm\Support\Facades\Url::class,
     'TestCase'       => System\Tests\Bootstrap\TestCase::class,
     'PluginTestCase' => System\Tests\Bootstrap\PluginTestCase::class,
 

diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
@@ -17,7 +17,6 @@
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\URL;
 use System\Helpers\Cache as CacheHelper;
 use Winter\Storm\Parse\Assetic\Cache\FilesystemCache;
 use Winter\Storm\Parse\Assetic\Filter\JavascriptImporter;
@@ -26,6 +25,7 @@
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Combiner class used for combining JavaScript and StyleSheet files.

diff --git a/modules/system/classes/ImageResizer.php b/modules/system/classes/ImageResizer.php
@@ -6,14 +6,14 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\URL;
 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;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Image Resizing class used for resizing any image resources accessible

diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
@@ -6,11 +6,11 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\URL;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
 use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Str;
 use Winter\Storm\Support\Svg;
 

diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
@@ -10,7 +10,6 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\URL;
 use System\Helpers\Cache as CacheHelper;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
@@ -20,6 +19,7 @@
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Http;
 use Winter\Storm\Support\Facades\Schema;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Update manager

diff --git a/modules/system/models/File.php b/modules/system/models/File.php
@@ -4,9 +4,9 @@
 
 use Backend\Controllers\Files;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\URL;
 use Winter\Storm\Database\Attach\File as FileBase;
 use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * File attachment model

diff --git a/modules/system/tests/classes/ImageResizerTest.php b/modules/system/tests/classes/ImageResizerTest.php
@@ -6,14 +6,14 @@
 use Cms\Classes\Controller as CmsController;
 use Cms\Classes\Theme;
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
-use Illuminate\Support\Facades\URL;
 use System\Classes\ImageResizer;
 use System\Classes\MediaLibrary;
 use System\Models\File as FileModel;
 use System\Tests\Bootstrap\PluginTestCase;
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Url;
 
 class ImageResizerTest extends PluginTestCase
 {

diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
@@ -2,13 +2,13 @@
 
 namespace System\Twig;
 
-use Illuminate\Support\Facades\URL;
 use System\Classes\ImageResizer;
 use System\Classes\MarkupManager;
 use System\Classes\MediaLibrary;
 use Twig\Extension\AbstractExtension as TwigExtension;
 use Twig\TwigFilter as TwigSimpleFilter;
 use Twig\TwigFunction as TwigSimpleFunction;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * The System Twig extension class implements common Twig functions and filters.