From f18165c505fa6d2960f8f4f9901a301e46c15b39 Mon Sep 17 00:00:00 2001
From: RostislavKreisinger
 <58297931+RostislavKreisinger@users.noreply.github.com>
Date: Tue, 23 Jun 2020 13:17:00 +0200
Subject: [PATCH] fixed not working upload of files in wysiwyg editor (#1899)

---
 composer.json                  | 2 +-
 config/bootstrap.php           | 2 ++
 config/bundles.php             | 2 +-
 config/routes/fm_elfinder.yaml | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 8cad7d1a8e..d6de9d797c 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
     "fp/jsformvalidator-bundle": "^1.6.1",
     "friendsofsymfony/ckeditor-bundle": "^2.1",
     "fzaninotto/faker": "^1.7.1",
-    "helios-ag/fm-elfinder-bundle": "^9.2",
+    "helios-ag/fm-elfinder-bundle": "^10.0.4",
     "heureka/overeno-zakazniky": "^2.0.6",
     "incenteev/composer-parameter-handler": "^2.1.3",
     "intervention/image": "^2.3.14",
diff --git a/config/bootstrap.php b/config/bootstrap.php
index ccda38cd03..104016afa8 100644
--- a/config/bootstrap.php
+++ b/config/bootstrap.php
@@ -56,3 +56,5 @@
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
 $_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
 $_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';
+
+define('ELFINDER_IMAGEMAGICK_PS', false);
diff --git a/config/bundles.php b/config/bundles.php
index 9a801bfa4e..6d32db5e35 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -35,7 +35,7 @@
     VasekPurchart\ConsoleErrorsBundle\ConsoleErrorsBundle::class => ['all' => true],
     FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true],
     Joschi127\DoctrineEntityOverrideBundle\Joschi127DoctrineEntityOverrideBundle::class => ['all' => true],
-    Fp\JsFormValidatorBundle\FpJsFormValidatorBundle::class => ['all' => true], // JsFormValidatorBundle have to loaded before FrameworkBundle because otherwise the parameters will be overwritten
+    Fp\JsFormValidatorBundle\FpJsFormValidatorBundle::class => ['all' => true],
     Shopsys\FrameworkBundle\ShopsysFrameworkBundle::class => ['all' => true],
     Shopsys\ReadModelBundle\ShopsysReadModelBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true],
diff --git a/config/routes/fm_elfinder.yaml b/config/routes/fm_elfinder.yaml
index 694b1666a5..6f423836a1 100644
--- a/config/routes/fm_elfinder.yaml
+++ b/config/routes/fm_elfinder.yaml
@@ -1,2 +1,2 @@
 fm_elfinder:
-    resource: "@FMElfinderBundle/Resources/config/routing.yml"
+    resource: "@FMElfinderBundle/Resources/config/routing.yaml"