Merge pull request #5298 from nanasess/fix-filemanager

ファイル管理のファイル削除時、 select_file に空のパラメータを渡せないよう修正

src/Eccube/Controller/Admin/Content/FileController.php

@@ -200,7 +200,7 @@ public function delete(Request $request)
         $this->isTokenValid();
 
         $selectFile = $request->get('select_file');
-        if (is_null($selectFile) || $selectFile == '/') {
+        if ($selectFile === '' || $selectFile === null || $selectFile == '/') {
             return $this->redirectToRoute('admin_content_file');
         }
 

tests/Eccube/Tests/Web/Admin/Content/FileControllerTest.php

@@ -73,6 +73,20 @@ public function testDelete()
         $this->assertFalse(file_exists($filepath));
     }
 
+    /**
+     * `select_file` が空の場合は `admin_content_file` へリダイレクトする.
+     *
+     * see https://github.com/EC-CUBE/ec-cube/pull/5298
+     */
+    public function testDeleteWithEmpty()
+    {
+        $this->client->request(
+            'DELETE',
+            $this->generateUrl('admin_content_file_delete').'?select_file='
+        );
+        $this->assertTrue($this->client->getResponse()->isRedirect($this->generateUrl('admin_content_file')));
+    }
+
     public function testIndexWithCreate()
     {
         $folder = 'create_folder';