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

This commit is contained in:
Michal Kváček
2017-07-31 16:10:23 +02:00
parent e9e9f0976c
commit 638f6ef134
6 changed files with 489 additions and 702 deletions
@@ -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'] : [];
@@ -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;
-13
View File
@@ -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.
*