From 00d759b24b739bf6be72c4e576361f4fc241a54c Mon Sep 17 00:00:00 2001 From: Sasaya Date: Tue, 20 Jun 2017 18:08:25 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/LaravelFilemanagerServiceProvider.php | 15 +++---- src/config/lfm.php | 6 +-- src/controllers/Controller.php | 4 +- src/controllers/CropController.php | 23 +++++------ src/controllers/DeleteController.php | 13 +++--- src/controllers/DemoController.php | 8 ++-- src/controllers/DownloadController.php | 9 ++-- src/controllers/FolderController.php | 17 ++++---- src/controllers/ItemsController.php | 18 ++++---- src/controllers/LfmController.php | 11 ++--- src/controllers/RedirectController.php | 17 ++++---- src/controllers/RenameController.php | 10 +++-- src/controllers/ResizeController.php | 31 +++++++------- src/controllers/UploadController.php | 16 ++++---- src/lang/de/lfm.php | 1 - src/lang/el/lfm.php | 2 +- src/lang/en/lfm.php | 2 +- src/lang/fa/lfm.php | 2 +- src/lang/ro/lfm.php | 2 +- src/lang/uk/lfm.php | 2 +- src/middlewares/CreateDefaultFolder.php | 6 +-- src/middlewares/MultiUser.php | 4 +- src/routes.php | 33 +++++++-------- src/traits/LfmHelpers.php | 50 +++++++++++------------ tests/ApiTest.php | 13 +++--- 25 files changed, 163 insertions(+), 152 deletions(-) diff --git a/src/LaravelFilemanagerServiceProvider.php b/src/LaravelFilemanagerServiceProvider.php index 0640ecee..b95a7362 100644 --- a/src/LaravelFilemanagerServiceProvider.php +++ b/src/LaravelFilemanagerServiceProvider.php @@ -1,14 +1,15 @@ -publishes([ - __DIR__.'/Handlers/LfmConfigHandler.php' => base_path('app/Handlers/LfmConfigHandler.php') + __DIR__.'/Handlers/LfmConfigHandler.php' => base_path('app/Handlers/LfmConfigHandler.php'), ], 'lfm_handler'); } diff --git a/src/config/lfm.php b/src/config/lfm.php index 54da5eda..ffd87da0 100644 --- a/src/config/lfm.php +++ b/src/config/lfm.php @@ -12,7 +12,7 @@ // Middlewares which should be applied to all package routes. // For laravel 5.1 and before, remove 'web' from the array. - 'middlewares' => ['web','auth'], + 'middlewares' => ['web', 'auth'], // The url to this package. Change it if necessary. 'prefix' => 'laravel-filemanager', @@ -164,7 +164,7 @@ | directives are not supported. */ 'php_ini_overrides' => [ - 'memory_limit' => '256M' - ] + 'memory_limit' => '256M', + ], ]; diff --git a/src/controllers/Controller.php b/src/controllers/Controller.php index fba3edee..d0619013 100644 --- a/src/controllers/Controller.php +++ b/src/controllers/Controller.php @@ -1,4 +1,6 @@ -with(compact('working_dir', 'img')); } - /** - * Crop the image (called via ajax) + * Crop the image (called via ajax). */ public function getCropimage($overWrite = true) { - $dataX = request('dataX'); - $dataY = request('dataY'); + $dataX = request('dataX'); + $dataY = request('dataY'); $dataHeight = request('dataHeight'); - $dataWidth = request('dataWidth'); + $dataWidth = request('dataWidth'); $image_path = parent::getCurrentPath(request('img')); - $crop_path = $image_path; + $crop_path = $image_path; - if(!$overWrite) { + if (! $overWrite) { $fileParts = explode('.', request('img')); $fileParts[count($fileParts) - 2] = $fileParts[count($fileParts) - 2] . '_cropped_' . time(); $crop_path = parent::getCurrentPath(implode('.', $fileParts)); diff --git a/src/controllers/DeleteController.php b/src/controllers/DeleteController.php index 7b8a93ed..5fdc8f1d 100644 --- a/src/controllers/DeleteController.php +++ b/src/controllers/DeleteController.php @@ -1,17 +1,18 @@ - $file_to_delete]); } if (File::isDirectory($file_to_delete)) { - if (!parent::directoryIsEmpty($file_to_delete)) { + if (! parent::directoryIsEmpty($file_to_delete)) { return parent::error('delete-folder'); } diff --git a/src/controllers/DemoController.php b/src/controllers/DemoController.php index 668bc28b..98204dfa 100644 --- a/src/controllers/DemoController.php +++ b/src/controllers/DemoController.php @@ -1,12 +1,12 @@ -name, $b->name); }); - array_push($root_folders, (object)[ + array_push($root_folders, (object) [ 'name' => trans('laravel-filemanager::lfm.title-' . $lang_key), 'path' => parent::getInternalPath($root_folder_path), 'children' => $children, - 'has_next' => !($lang_key == end($folder_types)) + 'has_next' => ! ($lang_key == end($folder_types)), ]); } @@ -46,9 +47,8 @@ public function getFolders() ->with(compact('root_folders')); } - /** - * Add a new folder + * Add a new folder. * * @return mixed */ @@ -66,6 +66,7 @@ public function getAddfolder() return parent::error('folder-alnum'); } else { parent::createFolderByPath($path); + return parent::$success_response; } } diff --git a/src/controllers/ItemsController.php b/src/controllers/ItemsController.php index 9f466d1f..b0532998 100644 --- a/src/controllers/ItemsController.php +++ b/src/controllers/ItemsController.php @@ -1,15 +1,14 @@ - (string)view($this->getView())->with([ + 'html' => (string) view($this->getView())->with([ 'files' => $files, 'directories' => $directories, - 'items' => array_merge($directories, $files) + 'items' => array_merge($directories, $files), ]), - 'working_dir' => parent::getInternalPath($path) + 'working_dir' => parent::getInternalPath($path), ]; } - private function getView() { $view_type = 'grid'; $show_list = request('show_list'); - if ($show_list === "1") { + if ($show_list === '1') { $view_type = 'list'; } elseif (is_null($show_list)) { $type_key = parent::currentLfmType(); diff --git a/src/controllers/LfmController.php b/src/controllers/LfmController.php index d7f883da..674c4bb4 100644 --- a/src/controllers/LfmController.php +++ b/src/controllers/LfmController.php @@ -1,10 +1,11 @@ -file_path; - if (!File::exists($file_path)) { + if (! File::exists($file_path)) { abort(404); } @@ -58,7 +59,7 @@ private function responseImageOrFile() $type = parent::getFileType($file_path); $response = Response::make($file); - $response->header("Content-Type", $type); + $response->header('Content-Type', $type); return $response; } diff --git a/src/controllers/RenameController.php b/src/controllers/RenameController.php index 13ecb6d5..fefc5811 100644 --- a/src/controllers/RenameController.php +++ b/src/controllers/RenameController.php @@ -1,4 +1,6 @@ -width(); + $original_image = Image::make(parent::getCurrentPath($image)); + $original_width = $original_image->width(); $original_height = $original_image->height(); $scaled = false; if ($original_width > 600) { - $ratio = 600 / $original_width; - $width = $original_width * $ratio; + $ratio = 600 / $original_width; + $width = $original_width * $ratio; $height = $original_height * $ratio; $scaled = true; } else { - $width = $original_width; + $width = $original_width; $height = $original_height; } if ($height > 400) { - $ratio = 400 / $original_height; - $width = $original_width * $ratio; + $ratio = 400 / $original_height; + $width = $original_width * $ratio; $height = $original_height * $ratio; $scaled = true; } @@ -55,16 +56,16 @@ public function getResize() public function performResize() { - $dataX = request('dataX'); - $dataY = request('dataY'); + $dataX = request('dataX'); + $dataY = request('dataY'); $height = request('dataHeight'); - $width = request('dataWidth'); + $width = request('dataWidth'); $image_path = parent::getCurrentPath(request('img')); event(new ImageIsResizing($image_path)); Image::make($image_path)->resize($width, $height)->save(); event(new ImageWasResized($image_path)); - + return parent::$success_response; } } diff --git a/src/controllers/UploadController.php b/src/controllers/UploadController.php index 90a033c3..b0178afe 100644 --- a/src/controllers/UploadController.php +++ b/src/controllers/UploadController.php @@ -1,4 +1,6 @@ -getNewName($file); + $new_filename = $this->getNewName($file); $new_file_path = parent::getCurrentPath($new_filename); event(new ImageIsUploading($new_file_path)); try { - if (parent::fileIsImage($file) && !parent::imageShouldNotHaveThumb($file)) { + if (parent::fileIsImage($file) && ! parent::imageShouldNotHaveThumb($file)) { Image::make($file->getRealPath()) ->orientate() //Apply orientation from exif data ->save($new_file_path, 90); @@ -79,10 +80,11 @@ private function uploadValidator($file) if (empty($file)) { return parent::error('file-empty'); - } elseif (!$file instanceof UploadedFile) { + } elseif (! $file instanceof UploadedFile) { return parent::error('instance'); } elseif ($file->getError() == UPLOAD_ERR_INI_SIZE) { $max_size = ini_get('upload_max_filesize'); + return parent::error('file-size', ['max' => $max_size]); } elseif ($file->getError() != UPLOAD_ERR_OK) { return 'File failed to upload. Error code: ' . $file->getError(); diff --git a/src/lang/de/lfm.php b/src/lang/de/lfm.php index 6c0b0d96..c5a60957 100644 --- a/src/lang/de/lfm.php +++ b/src/lang/de/lfm.php @@ -70,4 +70,3 @@ 'resize-new-width' => 'Breite:', 'locale-bootbox' => 'de', ]; - diff --git a/src/lang/el/lfm.php b/src/lang/el/lfm.php index 4b54d682..d65bcb2f 100644 --- a/src/lang/el/lfm.php +++ b/src/lang/el/lfm.php @@ -44,7 +44,7 @@ 'error-folder-exist'=> 'Υπάρχει ήδη φάκελος με αυτό το όνομα!', 'error-folder-alnum'=> 'Επιτρέπονται μόνο γράμματα και αριθμοί για το όνομα των φακέλων!', 'error-mime' => 'Λανθασμένος τύπος αρχείου: ', - 'error-size' => 'Μέγιστο μέγεθος αρχείου:', + 'error-size' => 'Μέγιστο μέγεθος αρχείου:', 'error-instance' => 'Το ανεβασμένο αρχείο έπρεπε να είναι του τύπου UploadedFile', 'error-invalid' => 'Λάθος αίτημα ανεβάσματος', 'error-other' => 'Παρουσιάστηκε ένα σφάλμα: ', diff --git a/src/lang/en/lfm.php b/src/lang/en/lfm.php index 13e511c5..1aed0944 100644 --- a/src/lang/en/lfm.php +++ b/src/lang/en/lfm.php @@ -49,7 +49,7 @@ 'error-folder-alnum'=> 'Only alphanumeric folder names are allowed!', 'error-folder-not-found'=> 'Folder not found! (:folder)', 'error-mime' => 'Unexpected MimeType: ', - 'error-size' => 'Over limit size:', + 'error-size' => 'Over limit size:', 'error-instance' => 'The uploaded file should be an instance of UploadedFile', 'error-invalid' => 'Invalid upload request', 'error-other' => 'An error has occured: ', diff --git a/src/lang/fa/lfm.php b/src/lang/fa/lfm.php index 657a558b..05d10593 100644 --- a/src/lang/fa/lfm.php +++ b/src/lang/fa/lfm.php @@ -49,7 +49,7 @@ 'error-folder-alnum'=> 'فقط اسامی الفبایی برای پوشه مجاز است!', 'error-folder-not-found'=> 'پوشه‌ای یافت نشد! (:folder)', 'error-mime' => 'پسوند غیرمجاز: ', - 'error-size' => 'سایز بیش از حد:', + 'error-size' => 'سایز بیش از حد:', 'error-instance' => 'فایل آپلود شده باید نمونه ای از UploadedFile باشد', 'error-invalid' => 'درخواست آپلود غیرمعتبر', 'error-other' => 'خطایی رخ داد: ', diff --git a/src/lang/ro/lfm.php b/src/lang/ro/lfm.php index 6d9d3ab4..b9b40d8e 100644 --- a/src/lang/ro/lfm.php +++ b/src/lang/ro/lfm.php @@ -46,7 +46,7 @@ 'error-folder-alnum'=> 'Sunt permise doar nume alfanumerice pentru foldere!', 'error-folder-not-found'=> 'Folderul nu a fost gasit! (:folder)', 'error-mime' => 'Unexpected MimeType: ', - 'error-size' => 'Dimensiune peste limită:', + 'error-size' => 'Dimensiune peste limită:', 'error-instance' => 'Fișierul încărcat trebuie să fie o instanță a UploadedFile', 'error-invalid' => 'Cerere invalidă de upload', 'error-other' => 'A apărut o eroare: ', diff --git a/src/lang/uk/lfm.php b/src/lang/uk/lfm.php index 5fe6a19b..70e5c526 100644 --- a/src/lang/uk/lfm.php +++ b/src/lang/uk/lfm.php @@ -46,7 +46,7 @@ 'error-folder-alnum'=> 'Дозволені лише буквено-цифрові імена папок!', 'error-folder-not-found'=> 'Папку не знайдено! (:folder)', 'error-mime' => 'Недозволений MimeType: ', - 'error-size' => 'Розмір перевищує дозволений:', + 'error-size' => 'Розмір перевищує дозволений:', 'error-instance' => 'Завантажений файл має бути екземпляром UploadedFile', 'error-invalid' => 'Неправильний запит на завантаження', 'error-other' => 'Сталася помилка: ', diff --git a/src/middlewares/CreateDefaultFolder.php b/src/middlewares/CreateDefaultFolder.php index 8739605e..9ddda73a 100644 --- a/src/middlewares/CreateDefaultFolder.php +++ b/src/middlewares/CreateDefaultFolder.php @@ -2,8 +2,8 @@ namespace Unisharp\Laravelfilemanager\middlewares; -use Unisharp\Laravelfilemanager\traits\LfmHelpers; use Closure; +use Unisharp\Laravelfilemanager\traits\LfmHelpers; class CreateDefaultFolder { @@ -19,11 +19,11 @@ public function handle($request, Closure $next) private function checkDefaultFolderExists($type = 'share') { - if ($type === 'user' && !$this->allowMultiUser()) { + if ($type === 'user' && ! $this->allowMultiUser()) { return; } - if ($type === 'share' && !$this->allowShareFolder()) { + if ($type === 'share' && ! $this->allowShareFolder()) { return; } diff --git a/src/middlewares/MultiUser.php b/src/middlewares/MultiUser.php index b997e4d5..732bcf5d 100644 --- a/src/middlewares/MultiUser.php +++ b/src/middlewares/MultiUser.php @@ -2,8 +2,8 @@ namespace Unisharp\Laravelfilemanager\middlewares; -use Unisharp\Laravelfilemanager\traits\LfmHelpers; use Closure; +use Unisharp\Laravelfilemanager\traits\LfmHelpers; class MultiUser { @@ -13,7 +13,7 @@ public function handle($request, Closure $next) { if ($this->allowMultiUser()) { $previous_dir = $request->input('working_dir'); - $working_dir = $this->rootFolder('user'); + $working_dir = $this->rootFolder('user'); if ($previous_dir == null) { $request->merge(compact('working_dir')); diff --git a/src/routes.php b/src/routes.php index 00a95421..69b7cbd5 100644 --- a/src/routes.php +++ b/src/routes.php @@ -1,7 +1,8 @@ 'LfmController@show', - 'as' => 'show' + 'as' => 'show', ]); // Show integration error messages Route::get('/errors', [ 'uses' => 'LfmController@getErrors', - 'as' => 'getErrors' + 'as' => 'getErrors', ]); // upload Route::any('/upload', [ 'uses' => 'UploadController@upload', - 'as' => 'upload' + 'as' => 'upload', ]); // list images & files Route::get('/jsonitems', [ 'uses' => 'ItemsController@getItems', - 'as' => 'getItems' + 'as' => 'getItems', ]); // folders Route::get('/newfolder', [ 'uses' => 'FolderController@getAddfolder', - 'as' => 'getAddfolder' + 'as' => 'getAddfolder', ]); Route::get('/deletefolder', [ 'uses' => 'FolderController@getDeletefolder', - 'as' => 'getDeletefolder' + 'as' => 'getDeletefolder', ]); Route::get('/folders', [ 'uses' => 'FolderController@getFolders', - 'as' => 'getFolders' + 'as' => 'getFolders', ]); // crop Route::get('/crop', [ 'uses' => 'CropController@getCrop', - 'as' => 'getCrop' + 'as' => 'getCrop', ]); Route::get('/cropimage', [ 'uses' => 'CropController@getCropimage', - 'as' => 'getCropimage' + 'as' => 'getCropimage', ]); Route::get('/cropnewimage', [ 'uses' => 'CropController@getNewCropimage', - 'as' => 'getCropimage' + 'as' => 'getCropimage', ]); // rename Route::get('/rename', [ 'uses' => 'RenameController@getRename', - 'as' => 'getRename' + 'as' => 'getRename', ]); // scale/resize Route::get('/resize', [ 'uses' => 'ResizeController@getResize', - 'as' => 'getResize' + 'as' => 'getResize', ]); Route::get('/doresize', [ 'uses' => 'ResizeController@performResize', - 'as' => 'performResize' + 'as' => 'performResize', ]); // download Route::get('/download', [ 'uses' => 'DownloadController@getDownload', - 'as' => 'getDownload' + 'as' => 'getDownload', ]); // delete Route::get('/delete', [ 'uses' => 'DeleteController@getDelete', - 'as' => 'getDelete' + 'as' => 'getDelete', ]); Route::get('/demo', 'DemoController@index'); diff --git a/src/traits/LfmHelpers.php b/src/traits/LfmHelpers.php index 3b3e6242..39bc7480 100644 --- a/src/traits/LfmHelpers.php +++ b/src/traits/LfmHelpers.php @@ -12,7 +12,7 @@ trait LfmHelpers *****************************/ /** - * Directory separator for url + * Directory separator for url. * * @var string|null */ @@ -80,7 +80,7 @@ private function composeSegments($type, $is_thumb, $file_name) $this->getPathPrefix($type), $this->getFormatedWorkingDir(), $this->appendThumbFolderPath($is_thumb), - $file_name + $file_name, ]); $full_path = $this->removeDuplicateSlash($full_path); @@ -144,7 +144,7 @@ private function getFormatedWorkingDir() */ private function appendThumbFolderPath($is_thumb) { - if (!$is_thumb) { + if (! $is_thumb) { return; } @@ -153,7 +153,7 @@ private function appendThumbFolderPath($is_thumb) // to add thumbs substring to the end of url $in_thumb_folder = str_contains($this->getFormatedWorkingDir(), $this->ds . $thumb_folder_name); - if (!$in_thumb_folder) { + if (! $in_thumb_folder) { return $thumb_folder_name . $this->ds; } } @@ -230,6 +230,7 @@ private function translateToOsPath($path) if ($this->isRunningOnWindows()) { $path = str_replace($this->ds, '\\', $path); } + return $path; } @@ -244,6 +245,7 @@ private function translateToLfmPath($path) if ($this->isRunningOnWindows()) { $path = str_replace('\\', $this->ds, $path); } + return $path; } @@ -319,7 +321,6 @@ public function translateToUtf8($input) return $input; } - /**************************** *** Config / Settings *** ****************************/ @@ -327,7 +328,7 @@ public function translateToUtf8($input) /** * Check current lfm type is image or not. * - * @return boolean + * @return bool */ public function isProcessingImages() { @@ -337,11 +338,11 @@ public function isProcessingImages() /** * Check current lfm type is file or not. * - * @return boolean + * @return bool */ public function isProcessingFiles() { - return !$this->isProcessingImages(); + return ! $this->isProcessingImages(); } /** @@ -362,7 +363,7 @@ public function currentLfmType() /** * Check if users are allowed to use their private folders. * - * @return boolean + * @return bool */ public function allowMultiUser() { @@ -373,11 +374,11 @@ public function allowMultiUser() * Check if users are allowed to use the shared folder. * This can be disabled only when allowMultiUser() is true. * - * @return boolean + * @return bool */ public function allowShareFolder() { - if (!$this->allowMultiUser()) { + if (! $this->allowMultiUser()) { return true; } @@ -402,7 +403,6 @@ public function applyIniOverrides() } } - /**************************** *** File System *** ****************************/ @@ -446,7 +446,7 @@ public function objectPresenter($item) $item_name = $this->getName($item); $is_file = is_file($item); - if (!$is_file) { + if (! $is_file) { $file_type = trans('laravel-filemanager::lfm.type-folder'); $icon = 'fa-folder-o'; $thumb_url = asset('vendor/laravel-filemanager/img/folder.png'); @@ -470,17 +470,17 @@ public function objectPresenter($item) $thumb_url = null; } - return (object)[ + return (object) [ 'name' => $item_name, 'url' => $is_file ? $this->getFileUrl($item_name) : '', 'size' => $is_file ? $this->humanFilesize(File::size($item)) : '', 'updated' => filemtime($item), 'path' => $is_file ? '' : $this->getInternalPath($item), - 'time' => date("Y-m-d h:m", filemtime($item)), + 'time' => date('Y-m-d h:m', filemtime($item)), 'type' => $file_type, 'icon' => $icon, 'thumb' => $thumb_url, - 'is_file' => $is_file + 'is_file' => $is_file, ]; } @@ -492,7 +492,7 @@ public function objectPresenter($item) */ public function createFolderByPath($path) { - if (!File::exists($path)) { + if (! File::exists($path)) { File::makeDirectory($path, 0777, true, true); } } @@ -501,7 +501,7 @@ public function createFolderByPath($path) * Check a folder and its subfolders is empty or not. * * @param string $directory_path Real path of a directory. - * @return boolean + * @return bool */ public function directoryIsEmpty($directory_path) { @@ -512,7 +512,7 @@ public function directoryIsEmpty($directory_path) * Check a file is image or not. * * @param mixed $file Real path of a file or instance of UploadedFile. - * @return boolean + * @return bool */ public function fileIsImage($file) { @@ -525,7 +525,7 @@ public function fileIsImage($file) * Check thumbnail should be created when the file is uploading. * * @param mixed $file Real path of a file or instance of UploadedFile. - * @return boolean + * @return bool */ public function imageShouldNotHaveThumb($file) { @@ -576,7 +576,6 @@ public function sortFilesAndDirectories($arr_items, $sort_type) return $arr_items; } - /**************************** *** Miscellaneouses *** ****************************/ @@ -616,21 +615,22 @@ public function error($error_type, $variables = []) /** * Make file size readable. * - * @param integer $bytes File size in bytes. - * @param integer $decimals Decimals. + * @param int $bytes File size in bytes. + * @param int $decimals Decimals. * @return string */ public function humanFilesize($bytes, $decimals = 2) { - $size = array('B','kB','MB','GB','TB','PB','EB','ZB','YB'); + $size = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; $factor = floor((strlen($bytes) - 1) / 3); + return sprintf("%.{$decimals}f", $bytes / pow(1024, $factor)) . ' ' . @$size[$factor]; } /** * Check current operating system is Windows or not. * - * @return boolean + * @return bool */ public function isRunningOnWindows() { diff --git a/tests/ApiTest.php b/tests/ApiTest.php index 673fe9bf..86926cd6 100644 --- a/tests/ApiTest.php +++ b/tests/ApiTest.php @@ -28,29 +28,29 @@ public function testFolder() auth()->loginUsingId(1); $create = $this->getResponseByRouteName('getAddfolder', [ - 'name' => 'testcase' + 'name' => 'testcase', ]); $create_duplicate = $this->getResponseByRouteName('getAddfolder', [ - 'name' => 'testcase' + 'name' => 'testcase', ]); $create_empty = $this->getResponseByRouteName('getAddfolder', [ - 'name' => '' + 'name' => '', ]); Config::set('lfm.alphanumeric_directory', true); $create_alphanumeric = $this->getResponseByRouteName('getAddfolder', [ - 'name' => '測試資料夾' + 'name' => '測試資料夾', ]); $rename = $this->getResponseByRouteName('getRename', [ 'file' => 'testcase', - 'new_name' => 'testcase2' + 'new_name' => 'testcase2', ]); $delete = $this->getResponseByRouteName('getDelete', [ - 'items' => 'testcase2' + 'items' => 'testcase2', ]); $this->assertEquals('OK', $create); @@ -65,6 +65,7 @@ private function getResponseByRouteName($route_name, $input = []) { $response = $this->call('GET', route('unisharp.lfm.' . $route_name), $input); $data = json_encode($response); + return $response->getContent(); } }