wip #3439

diff --git a/src/app/Http/Controllers/CubistFrontController.php b/src/app/Http/Controllers/CubistFrontController.php
index 0c503d1a130731da1e2d61b8df9cfe4733513a45..9ee5dc9cbbb39a2366440784e77f8ec0f9600ed2 100644 (file)
--- a/src/app/Http/Controllers/CubistFrontController.php
+++ b/src/app/Http/Controllers/CubistFrontController.php
@@ -6,7 +6,7 @@ namespace Cubist\Backpack\app\Http\Controllers;
 use Cubist\Backpack\app\Magic\Menu\Menu;
 use Cubist\Backpack\app\Magic\Models\Settings;
 use Cubist\Backpack\app\Magic\Models\Locale;
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 use Illuminate\Routing\Controller as BaseController;
 
 class CubistFrontController extends BaseController

diff --git a/src/app/Magic/Menu/Item.php b/src/app/Magic/Menu/Item.php
index 03cd56734ed9563689ebbb7f5ea033bb930a39df..1bbde857fb566e62943901606cf3709bc2c8893f 100644 (file)
--- a/src/app/Magic/Menu/Item.php
+++ b/src/app/Magic/Menu/Item.php
@@ -8,7 +8,7 @@ use Cubist\Backpack\app\Magic\Models\CubistMagicPageModel;
 use Cubist\Backpack\app\Magic\Models\Locale;
 use Cubist\Backpack\app\Magic\PageData;
 use Cubist\Backpack\app\Template\Navigation;
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Str;

diff --git a/src/app/Magic/Menu/Menu.php b/src/app/Magic/Menu/Menu.php
index 75325e353c3b7025e0d046b6567d9f8890ab98e6..7215fa6a502525c1ded083b0c8ad2771c2dfea8c 100644 (file)
--- a/src/app/Magic/Menu/Menu.php
+++ b/src/app/Magic/Menu/Menu.php
@@ -4,7 +4,7 @@ namespace Cubist\Backpack\app\Magic\Menu;
 
 use Cubist\Backpack\app\Template\Navigation;
 use Cubist\Backpack\app\Template\Redirection;
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 use Lavary\Menu\Menu as BaseMenu;
 use Illuminate\Support\Facades\Cache;
 

diff --git a/src/app/Magic/Models/CMSPage.php b/src/app/Magic/Models/CMSPage.php
index 532e20963e317d5a380da890a62fb2af3e8553ea..6363fd16ae71a640f469a05c56c6057f4765e6ca 100644 (file)
--- a/src/app/Magic/Models/CMSPage.php
+++ b/src/app/Magic/Models/CMSPage.php
@@ -5,7 +5,7 @@ namespace Cubist\Backpack\app\Magic\Models;
 
 use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
 use Cubist\Backpack\app\Template\TemplateAbstract;
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 use Cubist\Util\Json;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;

diff --git a/src/app/Magic/Models/Locale.php b/src/app/Magic/Models/Locale.php
index 027606370edc930e2fcfa464ef4a9c130c824d7f..401e9ce86426b5bd7c8ec835f93c6b0cc8756e64 100644 (file)
--- a/src/app/Magic/Models/Locale.php
+++ b/src/app/Magic/Models/Locale.php
@@ -4,7 +4,7 @@
 namespace Cubist\Backpack\app\Magic\Models;
 
 
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 
 class Locale extends CubistMagicAbstractModel
 {

diff --git a/src/app/Magic/Models/Settings.php b/src/app/Magic/Models/Settings.php
index e2e1fafee1c1b1d5bf447b837639494a70a64e6d..ff4213d2cabf754eb2b7bcfa36fb41858b555fe7 100644 (file)
--- a/src/app/Magic/Models/Settings.php
+++ b/src/app/Magic/Models/Settings.php
@@ -5,7 +5,7 @@ namespace Cubist\Backpack\app\Magic\Models;
 
 use Cubist\Backpack\app\Http\Controllers\CubistPWAController;
 use Cubist\Backpack\app\Magic\PageData;
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 use Spatie\MediaLibrary\Models\Media;
 
 class Settings extends CubistMagicTranslatableModel

diff --git a/src/app/Magic/QueryBuilder.php b/src/app/Magic/QueryBuilder.php
index ea6c0b50bd7a01e947bcd1590b923e48aacacd06..0397a06cde3ee7c1abbd04a83d0ef5b9234b1038 100644 (file)
--- a/src/app/Magic/QueryBuilder.php
+++ b/src/app/Magic/QueryBuilder.php
@@ -2,7 +2,7 @@
 
 namespace Cubist\Backpack\app\Magic;
 
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 use Illuminate\Database\Eloquent\Builder;
 
 class QueryBuilder extends Builder

diff --git a/src/app/Magic/Search.php b/src/app/Magic/Search.php
index 70e5bd2bdc6474619ebf10536237e2acc1b1e215..85436162b23859f35d7fdec872e6032bde98b5ac 100644 (file)
--- a/src/app/Magic/Search.php
+++ b/src/app/Magic/Search.php
@@ -4,7 +4,7 @@ namespace Cubist\Backpack\app\Magic;
 
 use Cubist\Backpack\app\Magic\Models\Locale;
 use Cubist\Backpack\app\Magic\Menu\Menu;
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 use Cubist\Util\XML\DOMSelector;
 use Cviebrock\LaravelElasticsearch\Facade as Elasticsearch;
 

diff --git a/src/app/Middleware/VariantSelector.php b/src/app/Middleware/VariantSelector.php
index 1bd216c032ac8b0997ddf4eaf03fc65c5adc6921..f00161a2a81a1e1b3ee6fcf9d43316bc404b2b6e 100644 (file)
--- a/src/app/Middleware/VariantSelector.php
+++ b/src/app/Middleware/VariantSelector.php
@@ -5,7 +5,7 @@ namespace Cubist\Backpack\app\Middleware;
 use Closure;
 use Cubist\Backpack\app\Magic\Models\Locale;
 use Illuminate\Http\Request;
-use Cubist\Backpack\Facades\App;
+use Cubist\Backpack\app\Facades\App;
 
 
 class VariantSelector extends CubistMiddleware

diff --git a/src/resources/install/bootstrap/app.php b/src/resources/install/bootstrap/app.php
index 8d4e15eee919d214ef73f7d382a1ddb2ace7980a..521fba491e849f56a49a6776f80d9aff3ce1da30 100644 (file)
--- a/src/resources/install/bootstrap/app.php
+++ b/src/resources/install/bootstrap/app.php
@@ -11,7 +11,7 @@
 |
 */
 
-$app = new Cubist\Backpack\Application(
+$app = new Cubist\Backpack\app\Application(
     $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );