Merge pull request #827 from lloricode/patch-1

Fix deprecated helper functions, then add support for laravel 6

Author: streamtw

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "unisharp/laravel-filemanager",
-  "description": "A file upload/editor intended for use with Laravel 6 and CKEditor / TinyMCE",
+  "description": "A file upload/editor intended for use with Laravel 5 to 6 and CKEditor / TinyMCE",
   "license": "MIT",
   "keywords": [
     "filemanager",
@@ -27,11 +27,11 @@
     "ext-exif": "*",
     "ext-fileinfo": "*",
     "intervention/image": "2.*",
-    "illuminate/config": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.*.*",
-    "illuminate/filesystem": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.*.*",
-    "illuminate/support": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.*.*",
-    "illuminate/http": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.*.*",
-    "illuminate/container": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.*.*"
+    "illuminate/config": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0",
+    "illuminate/filesystem": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0",
+    "illuminate/support": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0",
+    "illuminate/http": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0",
+    "illuminate/container": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.2",

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)) {

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;

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;
         }