commit changes of user "ctrl-f5" for symfony3 compatibility and optio…

…n to keep original file extension
YouweGit · Aug 1, 2016 · fa09e55 · fa09e55
1 parent 3743918
commit fa09e55
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 20 deletions.
diff --git a/Controller/FileManagerController.php b/Controller/FileManagerController.php
@@ -43,7 +43,7 @@ public function listFilesAction($dir_path = null)
         $parameters = $this->container->getParameter('youwe_file_manager');
         $fileManager = $service->createFileManager($parameters, $driver, $dir_path);
 
-        $form = $this->createForm(new FileManagerType);
+        $form = $this->createForm(FileManagerType::class);
         $renderParameters = $service->getRenderOptions($form);
 
         return $this->render($fileManager->getThemeTemplate(), $renderParameters);
@@ -73,7 +73,7 @@ public function uploadFileAction(Request $request, $dir_path)
         $parameters = $this->container->getParameter('youwe_file_manager');
         $fileManager = $service->createFileManager($parameters, $driver, $dir_path);
 
-        $form = $this->createForm(new FileManagerType);
+        $form = $this->createForm(FileManagerType::class);
 
         if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -65,6 +65,9 @@ public function getConfigTreeBuilder()
                 ->scalarNode('filter_images')
                     ->defaultFalse()
                 ->end()
+                ->scalarNode('keep_original_extension')
+                    ->defaultFalse()
+                ->end()
                 ->scalarNode('usage_class')
                     ->defaultFalse()
                 ->end()

diff --git a/Form/Type/FileManagerType.php b/Form/Type/FileManagerType.php
@@ -3,6 +3,7 @@
 namespace Youwe\FileManagerBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -20,7 +21,7 @@ class FileManagerType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('file', 'file', array(
+        $builder->add('file', FileType::class, array(
             'required' => false,
             'attr'     => array('class' => 'form-control file_manager_url', 'multiple' => 'multiple'),
             'label'    => 'Files'

diff --git a/Model/FileManager.php b/Model/FileManager.php
@@ -297,7 +297,7 @@ public function checkPath($path = null)
         }
         $upload_path = realpath($this->getUploadPath());
 
-        if (strcasecmp($real_path, $upload_path) > 0) {
+        if (strcasecmp($real_path, $upload_path) >= 0) {
             return true;
         } else {
             throw new \Exception("Directory is not in the upload path", 403);

diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
@@ -4,7 +4,7 @@ youwe_file_manager_list:
     prefix:   /filemanager
 
 youwe_uploads:
-    pattern: /uploads/{name}
+    path: /uploads/{name}
     requirements:
         name: .+
     defaults:

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -2,6 +2,8 @@ services:
   youwe.file_manager.service:
     class: Youwe\FileManagerBundle\Services\FileManagerService
     arguments: ["@service_container"]
+    call:
+      - [ 'setKeepOriginalFileExtensions', ['%youwe_file_manager.keep_original_extension%'] ]
 
   youwe.file_manager.driver:
     class: Youwe\FileManagerBundle\Driver\FileManagerDriver

diff --git a/Resources/doc/index.md b/Resources/doc/index.md
@@ -125,7 +125,7 @@ Set the route and the route parameters in the ckeditor config
 $form = $this->createFormBuilder()
             ->add('content', 'ckeditor', array(
                 'config' => array(
-                    'filebrowser_image_browse_url' => array(
+                    'filebrowserImageBrowseUrl' => array(
                         'route'            => 'youwe_file_manager_list',
                         'route_parameters' => array('popup'=>'1'),
                     ),

diff --git a/Resources/public/css/simple/dark.css b/Resources/public/css/simple/dark.css
@@ -50,7 +50,7 @@ div.block_row:hover {
 div.block_row:hover,
 #FileManagerContainer .FileManagerListItems .item_selected
 #FileManagerContainer .FileManagerListItems .item_selected:hover,
-div.block_row.item_selected:hover,
+div.block_row.item_selected:hover
 {
     background-color: #e0e0e0;
 }

diff --git a/Services/FileManagerService.php b/Services/FileManagerService.php
@@ -31,6 +31,11 @@ class FileManagerService
     /** @var FileManager */
     private $file_manager;
 
+    /**
+     * @var bool
+     */
+    private $keepOriginalFileExtensions = false;
+
     /**
      * Constructor
      *
@@ -59,6 +64,22 @@ public function getFileManager()
         return $this->file_manager;
     }
 
+    /**
+     * @return boolean
+     */
+    public function keepOriginalFileExtensions()
+    {
+        return $this->keepOriginalFileExtensions;
+    }
+
+    /**
+     * @param boolean $keepOriginalFileExtensions
+     */
+    public function setKeepOriginalFileExtensions($keepOriginalFileExtensions)
+    {
+        $this->keepOriginalFileExtensions = $keepOriginalFileExtensions;
+    }
+
     /**
      * Create the file manager object
      *
@@ -147,10 +168,14 @@ public function handleUploadFiles($files)
         $driver = $this->container->get('youwe.file_manager.driver');
 
         $this->getFileManager()->event(YouweFileManagerEvents::BEFORE_FILE_UPLOADED);
-        
+
         /** @var UploadedFile $file */
         foreach ($files as $file) {
-            $extension = $file->guessExtension();
+            if ($this->keepOriginalFileExtensions()) {
+                $extension = $file->getClientOriginalExtension();
+            } else {
+                $extension = $file->guessExtension();
+            }
             if (!$extension) {
                 $extension = 'bin';
             }
@@ -190,7 +215,7 @@ public function getRenderOptions(Form $form)
         $file_manager = $this->getFileManager();
         $dir_files = scandir($file_manager->getDir());
         $root_dirs = scandir($file_manager->getUploadPath());
-        $is_popup = $this->container->get('request')->get('popup') ? true : false;
+        $is_popup = $this->container->get('request_stack')->getCurrentRequest()->get('popup') ? true : false;
 
         $options['files'] = $this->getFiles($dir_files);
         $options['file_body_display'] = $file_manager->getDisplayType();
@@ -242,8 +267,9 @@ public function setDisplayType()
         $session = $this->container->get('session');
         $display_type = $session->get(self::DISPLAY_TYPE_SESSION);
 
-        if ($this->container->get('request')->get('display_type') != null) {
-            $display_type = $this->container->get('request')->get('display_type');
+        $request = $this->container->get('request_stack')->getCurrentRequest();
+        if ($request->get('display_type') != null) {
+            $display_type = $request->get('display_type');
             $session->set(self::DISPLAY_TYPE_SESSION, $display_type);
         } else {
             if (is_null($display_type)) {
@@ -380,4 +406,4 @@ public function isAllowedGetAction($action)
         );
         return in_array($action, $allowed_get);
     }
-}
+}
diff --git a/Twig/FileManagerExtension.php b/Twig/FileManagerExtension.php
@@ -32,7 +32,7 @@ public function __construct(ContainerInterface $container)
     public function getFilters()
     {
         return array(
-            'thumb' => new \Twig_Filter_Method($this, 'thumb'),
+            new \Twig_SimpleFilter('thumb', [$this, 'thumb']),
         );
     }
 

diff --git a/composer.json b/composer.json
@@ -15,10 +15,11 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "~2.0",
-        "symfony/finder": "*",
-        "symfony/filesystem": "*",
-        "friendsofsymfony/jsrouting-bundle": "@stable"
+        "symfony/framework-bundle": "^3.0",
+        "symfony/finder": "^3.0",
+        "symfony/filesystem": "^3.0",
+        "friendsofsymfony/jsrouting-bundle": "@stable",
+        "symfony/assetic-bundle": "^2.8"
     },
     "suggest": {
         "liip/imagine-bundle": "Liip Imagine Bundle provides easy image manipulation support for Symfony2."
@@ -29,7 +30,7 @@
     "target-dir": "Youwe/FileManagerBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
-}
+}