Merge pull request AsgardCms#792 from imagina/upstream-master

Update to Laravel v7.29.3
arturmamedov · Nov 10, 2020 · 8c1e4b9 · 8c1e4b9
2 parents e01fbfc + fa7938f
commit 8c1e4b9
Show file tree

Hide file tree

Showing 143 changed files with 716 additions and 630 deletions.
diff --git a/.env.example b/.env.example
@@ -27,7 +27,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null

diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ package-lock.json
 yarn.lock
 .phpunit.result.cache
 .php_cs.cache
+.idea
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ cache:
     - $HOME/.composer/cache
 
 env:
-  - LARAVEL_VERSION="~5.7" TESTBENCH_VERSION="~3.7"
+  - LARAVEL_VERSION="~7.0" TESTBENCH_VERSION="~5.7"
 
 before_script:
   - phpenv config-rm xdebug.ini

diff --git a/Modules/Core/Blade/AsgardEditorDirective.php b/Modules/Core/Blade/AsgardEditorDirective.php
@@ -2,6 +2,8 @@
 
 namespace Modules\Core\Blade;
 
+use Illuminate\Support\Arr;
+
 class AsgardEditorDirective
 {
     private $content;
@@ -26,9 +28,9 @@ public function show($arguments)
      */
     private function extractArguments(array $arguments)
     {
-        $this->fieldName = array_get($arguments, 0);
-        $this->labelName = array_get($arguments, 1);
-        $this->content = array_get($arguments, 2);
-        $this->lang = array_get($arguments, 3);
+        $this->fieldName = Arr::get($arguments, 0);
+        $this->labelName = Arr::get($arguments, 1);
+        $this->content = Arr::get($arguments, 2);
+        $this->lang = Arr::get($arguments, 3);
     }
 }
diff --git a/Modules/Core/Console/DownloadModuleCommand.php b/Modules/Core/Console/DownloadModuleCommand.php
@@ -3,6 +3,7 @@
 namespace Modules\Core\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Str;
 use Modules\Core\Downloader\Downloader;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -98,11 +99,11 @@ protected function getOptions()
 
     private function extractPackageNameFrom($package)
     {
-        if (str_contains($package, '/') === false) {
+        if (Str::contains($package, '/') === false) {
             throw new \Exception('You need to use vendor/name structure');
         }
 
-        return studly_case(substr(strrchr($package, '/'), 1));
+        return Str::studly(substr(strrchr($package, '/'), 1));
     }
 
     /**

diff --git a/Modules/Core/Downloader/Downloader.php b/Modules/Core/Downloader/Downloader.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Str;
 use RuntimeException;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -157,11 +158,11 @@ private function getLatestVersionUrl()
 
     private function extractPackageNameFrom($package)
     {
-        if (str_contains($package, '/') === false) {
+        if (Str::contains($package, '/') === false) {
             throw new \Exception('You need to use vendor/name structure');
         }
 
-        return studly_case(substr(strrchr($package, '/'), 1));
+        return Str::studly(substr(strrchr($package, '/'), 1));
     }
 
     public function forBranch($branchName)

diff --git a/Modules/Core/Events/CollectingAssets.php b/Modules/Core/Events/CollectingAssets.php
@@ -2,6 +2,7 @@
 
 namespace Modules\Core\Events;
 
+use Illuminate\Support\Str;
 use Modules\Core\Foundation\Asset\Pipeline\AssetPipeline;
 
 class CollectingAssets
@@ -43,7 +44,7 @@ public function onRoute($route)
     {
         $request = request();
 
-        return str_is($route, $request->route()->getName());
+        return Str::is($route, $request->route()->getName());
     }
 
     /**
@@ -56,7 +57,7 @@ public function onRoutes(array $routes)
         $request = request();
 
         foreach ($routes as $route) {
-            if (str_is($route, $request->route()->getName()) === true) {
+            if (Str::is($route, $request->route()->getName()) === true) {
                 return true;
             }
         }

diff --git a/Modules/Core/Foundation/Asset/Types/CdnAsset.php b/Modules/Core/Foundation/Asset/Types/CdnAsset.php
@@ -2,6 +2,8 @@
 
 namespace Modules\Core\Foundation\Asset\Types;
 
+use Illuminate\Support\Arr;
+
 class CdnAsset implements AssetType
 {
     /**
@@ -20,6 +22,6 @@ public function __construct($path)
      */
     public function url()
     {
-        return array_get($this->path, 'cdn');
+        return Arr::get($this->path, 'cdn');
     }
 }
diff --git a/Modules/Core/Foundation/Asset/Types/ModuleAsset.php b/Modules/Core/Foundation/Asset/Types/ModuleAsset.php
@@ -2,6 +2,7 @@
 
 namespace Modules\Core\Foundation\Asset\Types;
 
+use Illuminate\Support\Arr;
 use Nwidart\Modules\Facades\Module;
 
 class ModuleAsset implements AssetType
@@ -27,6 +28,6 @@ public function url()
 
     private function getPath()
     {
-        return array_get($this->path, 'module');
+        return Arr::get($this->path, 'module');
     }
 }
diff --git a/Modules/Core/Foundation/Asset/Types/ThemeAsset.php b/Modules/Core/Foundation/Asset/Types/ThemeAsset.php
@@ -3,6 +3,7 @@
 namespace Modules\Core\Foundation\Asset\Types;
 
 use FloatingPoint\Stylist\Facades\ThemeFacade as Theme;
+use Illuminate\Support\Arr;
 
 class ThemeAsset implements AssetType
 {
@@ -27,6 +28,6 @@ public function url()
 
     private function getPath()
     {
-        return array_get($this->path, 'theme');
+        return Arr::get($this->path, 'theme');
     }
 }
diff --git a/Modules/Core/Internationalisation/BaseFormRequest.php b/Modules/Core/Internationalisation/BaseFormRequest.php
@@ -3,6 +3,7 @@
 namespace Modules\Core\Internationalisation;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Arr;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 abstract class BaseFormRequest extends FormRequest
@@ -86,7 +87,7 @@ public function withTranslations()
             $translations[$key] = $this->get($key);
         }
         $results['translations'] = $translations;
-        array_forget($results, $locales);
+        Arr::forget($results, $locales);
 
         return $results;
     }

diff --git a/Modules/Core/Internationalisation/Translatable.php b/Modules/Core/Internationalisation/Translatable.php
@@ -6,7 +6,7 @@ trait Translatable
 {
     use \Astrotomic\Translatable\Translatable;
 
-    public function save(array $options = array())
+    public function save(array $options = [])
     {
         $tempTranslations = $this->translations;
         if ($this->exists) {

diff --git a/Modules/Core/Providers/CoreServiceProvider.php b/Modules/Core/Providers/CoreServiceProvider.php
@@ -4,9 +4,11 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
 use Modules\Core\Blade\AsgardEditorDirective;
 use Modules\Core\Console\DeleteModuleCommand;
 use Modules\Core\Console\DownloadModuleCommand;
@@ -90,8 +92,8 @@ public function register()
             $this->getSidebarClassForModule('core', RegisterCoreSidebar::class)
         );
         $this->app['events']->listen(LoadingBackendTranslations::class, function (LoadingBackendTranslations $event) {
-            $event->load('core', array_dot(trans('core::core')));
-            $event->load('sidebar', array_dot(trans('core::sidebar')));
+            $event->load('core', Arr::dot(trans('core::core')));
+            $event->load('sidebar', Arr::dot(trans('core::sidebar')));
         });
     }
 
@@ -102,7 +104,7 @@ public function register()
      */
     public function provides()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -201,14 +203,14 @@ protected function registerViewNamespace(Module $module, array $themes)
             $moduleConfig = $this->app['config']->get($configKey . '.useViewNamespaces');
 
             if (count($themes) > 0) {
-                if ($themes['backend'] !== null && array_get($moduleConfig, 'backend-theme') === true) {
+                if ($themes['backend'] !== null && Arr::get($moduleConfig, 'backend-theme') === true) {
                     $hints[] = $themes['backend'] . '/views/modules/' . $moduleName;
                 }
-                if ($themes['frontend'] !== null && array_get($moduleConfig, 'frontend-theme') === true) {
+                if ($themes['frontend'] !== null && Arr::get($moduleConfig, 'frontend-theme') === true) {
                     $hints[] = $themes['frontend'] . '/views/modules/' . $moduleName;
                 }
             }
-            if (array_get($moduleConfig, 'resources') === true) {
+            if (Arr::get($moduleConfig, 'resources') === true) {
                 $hints[] = base_path('resources/views/asgard/' . $moduleName);
             }
         }
@@ -351,7 +353,7 @@ public function bladeDirectives()
     private function onBackend()
     {
         $url = app(Request::class)->path();
-        if (str_contains($url, config('asgard.core.core.admin-prefix'))) {
+        if (Str::contains($url, config('asgard.core.core.admin-prefix'))) {
             return true;
         }
 

diff --git a/Modules/Core/Providers/SidebarServiceProvider.php b/Modules/Core/Providers/SidebarServiceProvider.php
@@ -2,14 +2,13 @@
 
 namespace Modules\Core\Providers;
 
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Support\ServiceProvider;
 use Maatwebsite\Sidebar\SidebarManager;
 use Modules\Core\Sidebar\AdminSidebar;
 
-class SidebarServiceProvider extends ServiceProvider
+class SidebarServiceProvider extends ServiceProvider implements DeferrableProvider
 {
-    protected $defer = true;
-
     /**
      * Register the service provider.
      * @return void

diff --git a/Modules/Core/Resources/views/fields/select-locales.blade.php b/Modules/Core/Resources/views/fields/select-locales.blade.php
@@ -3,7 +3,7 @@
     <select multiple class="locales" name="{{ $settingName }}[]" id="{{ $settingName }}">
         @foreach ($locales as $id => $locale)
         <option value="{{ $id }}" {{ isset($dbSettings[$settingName]) && isset(array_flip(json_decode($dbSettings[$settingName]->plainValue))[$id]) ? 'selected' : '' }}>
-            {{ array_get($locale, 'name') }}
+            {{ Arr::get($locale, 'name') }}
         </option>
         @endforeach
     </select>

diff --git a/Modules/Core/Tests/BaseTestCase.php b/Modules/Core/Tests/BaseTestCase.php
@@ -30,11 +30,11 @@ protected function getEnvironmentSetUp($app)
     {
         $app['path.base'] = __DIR__ . '/..';
         $app['config']->set('database.default', 'sqlite');
-        $app['config']->set('database.connections.sqlite', array(
+        $app['config']->set('database.connections.sqlite', [
             'driver' => 'sqlite',
             'database' => ':memory:',
             'prefix' => '',
-        ));
+        ]);
         $app['config']->set('translatable.locales', ['en', 'fr']);
     }
 

diff --git a/Modules/Core/composer.json b/Modules/Core/composer.json
@@ -22,15 +22,15 @@
   "require": {
     "php": "^7.1.3",
     "composer/installers": "~1.0",
-    "nwidart/laravel-modules": "^4.0",
+    "nwidart/laravel-modules": "^6.0",
     "laravelcollective/html": "5.7.*",
     "laracasts/presenter": "^0.2.4",
     "astrotomic/laravel-translatable": "^11.1",
     "mcamara/laravel-localization": "^1.6",
-    "floatingpoint/stylist": "dev-master",
+    "imagina/stylist": "^2.0",
     "maatwebsite/laravel-sidebar": "^2.4",
     "yajra/laravel-datatables-oracle": "~8.0",
-    "tightenco/ziggy": "~0.4"
+    "tightenco/ziggy": "^0.9.4"
   },
   "require-dev": {
     "phpunit/phpunit": "~7.0",

diff --git a/Modules/Dashboard/Foundation/Widgets/BaseWidget.php b/Modules/Dashboard/Foundation/Widgets/BaseWidget.php
@@ -3,6 +3,7 @@
 namespace Modules\Dashboard\Foundation\Widgets;
 
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Support\Str;
 use Modules\Dashboard\Composers\WidgetViewComposer;
 
 abstract class BaseWidget
@@ -21,7 +22,7 @@ public function boot()
                          ->with($this->data())
                          ->render();
 
-            $sluggedName = str_slug($this->name());
+            $sluggedName = Str::slug($this->name());
 
             $widgetViewComposer
                 ->setWidgetName($sluggedName)

diff --git a/Modules/Dashboard/Http/Controllers/Admin/DashboardController.php b/Modules/Dashboard/Http/Controllers/Admin/DashboardController.php
@@ -97,7 +97,7 @@ public function reset()
     private function bootWidgets(RepositoryInterface $modules)
     {
         foreach ($modules->allEnabled() as $module) {
-            if (! $module->widgets) {
+            if (! isset($module->widgets)) {
                 continue;
             }
             foreach ($module->widgets as $widgetClass) {

diff --git a/Modules/Dashboard/Providers/DashboardServiceProvider.php b/Modules/Dashboard/Providers/DashboardServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Modules\Dashboard\Providers;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 use Modules\Core\Events\BuildingSidebar;
 use Modules\Core\Events\LoadingBackendTranslations;
@@ -47,7 +48,7 @@ public function register()
         );
 
         $this->app['events']->listen(LoadingBackendTranslations::class, function (LoadingBackendTranslations $event) {
-            $event->load('dashboard', array_dot(trans('dashboard::dashboard')));
+            $event->load('dashboard', Arr::dot(trans('dashboard::dashboard')));
         });
     }
 
@@ -75,6 +76,6 @@ public function boot(StylistThemeManager $theme)
      */
     public function provides()
     {
-        return array();
+        return [];
     }
 }
diff --git a/Modules/Media/Blade/MediaMultipleDirective.php b/Modules/Media/Blade/MediaMultipleDirective.php
@@ -2,6 +2,7 @@
 
 namespace Modules\Media\Blade;
 
+use Illuminate\Support\Arr;
 use Modules\Media\Composers\Backend\PartialAssetComposer;
 
 class MediaMultipleDirective
@@ -49,9 +50,9 @@ public function show($arguments)
      */
     private function extractArguments(array $arguments)
     {
-        $this->zone = array_get($arguments, 0);
-        $this->entity = array_get($arguments, 1);
-        $this->view = array_get($arguments, 2);
-        $this->name = array_get($arguments, 3);
+        $this->zone = Arr::get($arguments, 0);
+        $this->entity = Arr::get($arguments, 1);
+        $this->view = Arr::get($arguments, 2);
+        $this->name = Arr::get($arguments, 3);
     }
 }