Removed deprecated global helper array and str. Replaced with \Illumi…

…nate\Support classes (#60)
beyondcode · Oct 14, 2019 · b4819e5 · b4819e5
1 parent afbe30a
commit b4819e5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/Model.php b/src/Model.php
@@ -3,6 +3,7 @@
 namespace BeyondCode\ErdGenerator;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 class Model
 {
@@ -30,7 +31,7 @@ public function getModel()
      */
     public function getNodeName()
     {
-        return str_replace('-', '', str_slug($this->model));
+        return str_replace('-', '', Str::slug($this->model));
     }
 
     /**
@@ -48,4 +49,4 @@ public function getRelations()
     {
         return $this->relations;
     }
-}
+}
diff --git a/src/ModelRelation.php b/src/ModelRelation.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace BeyondCode\ErdGenerator;
+use Illuminate\Support\Str;
 
 class ModelRelation
 {
@@ -32,7 +33,7 @@ public function getModel()
      */
     public function getModelNodeName()
     {
-        return str_slug($this->model);
+        return Str::slug($this->model);
     }
 
     /**
@@ -66,4 +67,4 @@ public function getName()
     {
         return $this->name;
     }
-}
+}
diff --git a/src/RelationFinder.php b/src/RelationFinder.php
@@ -8,6 +8,8 @@
 use Illuminate\Support\Collection;
 use ReflectionClass;
 use ReflectionMethod;
+use Illuminate\Support\Arr;
+
 
 class RelationFinder
 {
@@ -40,7 +42,7 @@ public function getModelRelations(string $model)
 
         $relations = $relations->filter();
 
-        if ($ignoreRelations = array_get(config('erd-generator.ignore', []),$model))
+        if ($ignoreRelations = Arr::get(config('erd-generator.ignore', []),$model))
         {
             $relations = $relations->diffKeys(array_flip($ignoreRelations));
         }
@@ -96,5 +98,5 @@ protected function getRelationshipFromMethodAndModel(ReflectionMethod $method, s
         } catch (\Throwable $e) {}
         return null;
     }
-    
+
 }
diff --git a/tests/GetModelRelationsTest.php b/tests/GetModelRelationsTest.php
@@ -8,6 +8,8 @@
 use BeyondCode\ErdGenerator\Tests\Models\Comment;
 use BeyondCode\ErdGenerator\Tests\Models\Post;
 use BeyondCode\ErdGenerator\Tests\Models\User;
+use Illuminate\Support\Arr;
+
 
 class GetModelRelationsTest extends TestCase
 {
@@ -63,7 +65,7 @@ public function it_will_ignore_a_relation_if_it_is_excluded_on_config()
         $relations = $finder->getModelRelations(User::class);
 
         $this->assertCount(2, $relations);
-        $this->assertNull(array_get($relations, 'posts'));
+        $this->assertNull(Arr::get($relations, 'posts'));
     }
 
-}
+}