FEATURE #2472: update to laravel 5.4 - not stable at allg a -A

app/CMS/Pipeline/SavePipeline/Process/UploadRelatedFiles.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\CMS\Pipeline\SavePipeline\Process;
 
 use App\CMS\Contracts\Content\SavePipeline\Process;
@@ -19,6 +20,10 @@ class UploadRelatedFiles implements Process
      */
     function handle(Content & $page, array & $input)
     {
+        if (!isset($input['files'])) {
+            return;
+        }
+
         $files = $input['files'];
         $assignedFiles = isset($input['keepAssigned']) ? $input['keepAssigned'] : [];
 

app/Http/Controllers/Admin/Contents/EditContent.php

@@ -17,6 +17,7 @@ use App\Models\Content\ContentHistory;
 use App\Models\FileManager\File;
 use Illuminate\Support\Facades\Event;
 use Modules\Categories\Contracts\Repositories\Category as ICategory;
+use Modules\Categories\Repositories\Category;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditContent extends Controller
@@ -58,7 +59,7 @@ class EditContent extends Controller
      * @param ICategory         $category
      * @param ITemplate         $template
      */
-    public function __construct(ContentHistory $history, File $file, IContent $content, IModuleRepository $module, ICategory $category, ITemplate $template)
+    public function __construct(ContentHistory $history, File $file, IContent $content, IModuleRepository $module, Category $category, ITemplate $template)
     {
         $this->history = $history;
         $this->file = $file;

app/Providers/RouteServiceProvider.php

@@ -16,19 +16,6 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected $namespace = 'App\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @param  \Illuminate\Routing\Router  $router
-     * @return void
-     */
-    public function boot(Router $router)
-    {
-        //
-
-        parent::boot($router);
-    }
-
     /**
      * Define the routes for the application.
      *

composer.json

@@ -8,10 +8,10 @@
   "type": "project",
   "require": {
     "php": ">=5.5.9",
-    "laravel/framework": "5.2.*",
+    "laravel/framework": "5.4.*",
     "watson/sitemap": "^2.0",
     "mcamara/laravel-localization": "^1.1",
-    "franzose/closure-table": "^4.1",
+    "franzose/closure-table": "5.*",
     "intervention/image": "^2.3",
     "webwizo/laravel-shortcodes": "1.0.4",
     "greggilbert/recaptcha": "^2.2@dev",

modules/Categories/Repositories/Category.php

@@ -4,15 +4,14 @@ namespace Modules\Categories\Repositories;
 use App\Models\Module;
 use Modules\Categories\Entities\Category as CategoryModel;
 use Modules\Categories\Contracts\Repositories\Category as ICategory;
-use Pingpong\Modules\Facades\Module as ModuleInstance;
 
 class Category implements ICategory
 {
     public function getForModule(Module $module)
     {
-        $categoryModule = ModuleInstance::get('categories');
+        $categoryModule = Module::where('alias', 'categories')->first();
         $categories = [];
-        if ($module->support_categories && !is_null($categoryModule) && $categoryModule->enabled()) {
+        if ($module->support_categories && !is_null($categoryModule) && $categoryModule->enabled) {
             $categories = CategoryModel::where('module_id', $module->id)
                                   ->get();
         }