From 835de5448ada9ad23aa2660cdef6fea11a3c57e6 Mon Sep 17 00:00:00 2001 From: Lloric Mayuga Garcia Date: Wed, 4 Sep 2019 07:17:50 +0800 Subject: [PATCH] Fix deprecated Signed-off-by: Lloric Mayuga Garcia --- src/Lfm.php | 3 ++- src/LfmItem.php | 5 +++-- src/Middlewares/MultiUser.php | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Lfm.php b/src/Lfm.php index f1e5ceb7..c69a95c5 100644 --- a/src/Lfm.php +++ b/src/Lfm.php @@ -5,6 +5,7 @@ use Illuminate\Contracts\Config\Repository as Config; use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; +use Illuminate\Support\Str; use UniSharp\LaravelFilemanager\Middlewares\CreateDefaultFolder; use UniSharp\LaravelFilemanager\Middlewares\MultiUser; @@ -73,7 +74,7 @@ public function currentLfmType() { $lfm_type = 'file'; - $request_type = lcfirst(str_singular($this->input('type') ?: '')); + $request_type = lcfirst(Str::singular($this->input('type') ?: '')); $available_types = array_keys($this->config->get('lfm.folder_categories') ?: []); if (in_array($request_type, $available_types)) { diff --git a/src/LfmItem.php b/src/LfmItem.php index a464ae31..74d133af 100644 --- a/src/LfmItem.php +++ b/src/LfmItem.php @@ -2,6 +2,7 @@ namespace UniSharp\LaravelFilemanager; +use Illuminate\Support\Str; use Symfony\Component\HttpFoundation\File\UploadedFile; class LfmItem @@ -21,7 +22,7 @@ public function __construct(LfmPath $lfm, Lfm $helper) public function __get($var_name) { if (!array_key_exists($var_name, $this->attributes)) { - $function_name = camel_case($var_name); + $function_name = Str::camel($var_name); $this->attributes[$var_name] = $this->$function_name(); } @@ -66,7 +67,7 @@ public function isFile() public function isImage() { if (!$this->isDirectory()) { - return starts_with($this->mimeType(), 'image'); + return Str::startsWith($this->mimeType(), 'image'); } return false; diff --git a/src/Middlewares/MultiUser.php b/src/Middlewares/MultiUser.php index 49f78ece..50830f6e 100644 --- a/src/Middlewares/MultiUser.php +++ b/src/Middlewares/MultiUser.php @@ -3,6 +3,7 @@ namespace UniSharp\LaravelFilemanager\Middlewares; use Closure; +use Illuminate\Support\Str; use UniSharp\LaravelFilemanager\Lfm; class MultiUser @@ -32,11 +33,11 @@ public function handle($request, Closure $next) private function validDir($previous_dir) { - if (starts_with($previous_dir, $this->helper->getRootFolder('share'))) { + if (Str::startsWith($previous_dir, $this->helper->getRootFolder('share'))) { return true; } - if (starts_with($previous_dir, $this->helper->getRootFolder('user'))) { + if (Str::startsWith($previous_dir, $this->helper->getRootFolder('user'))) { return true; }