namespace the tests, also fix issue with model config strings

rtconner · Aug 12, 2019 · 2e60145 · 2e60145
1 parent 20339ec
commit 2e60145
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -12,8 +12,8 @@
   ],
   "require": {
     "php": ">= 7.0",
-    "illuminate/database": "^5.0",
-    "illuminate/support": "^5.0"
+    "illuminate/database": ">= 5.0",
+    "illuminate/support": ">= 5.0"
   },
   "require-dev": {
     "orchestra/testbench": "~3.8",
@@ -28,7 +28,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Tests\\": "tests/"
+      "ConnerTests\\": "tests/"
     }
   },
   "extra": {

diff --git a/src/Events/TagAdded.php b/src/Events/TagAdded.php
@@ -1,4 +1,6 @@
-<?php namespace Conner\Tagging\Events;
+<?php
+
+namespace Conner\Tagging\Events;
 
 use Conner\Tagging\Model\Tagged;
 use Conner\Tagging\Taggable;

diff --git a/src/Taggable.php b/src/Taggable.php
@@ -186,7 +186,10 @@ public function scopeWithAllTags(Builder $query, $tagNames): Builder
         $className = $query->getModel()->getMorphClass();
 
         foreach($tagNames as $tagSlug) {
-            $tags = Tagged::query()
+
+            $model = TaggingUtility::taggedModelString();
+
+            $tags = $model::query()
                 ->where('tag_slug', TaggingUtility::normalize($tagSlug))
                 ->where('taggable_type', $className)
                 ->get()
@@ -245,7 +248,9 @@ private function addTag($tagName)
         $previousCount = $this->tagged()->where('tag_slug', '=', $tagSlug)->take(1)->count();
         if($previousCount >= 1) { return; }
 
-        $tagged = new Tagged([
+        $model = TaggingUtility::taggedModelString();
+
+        $tagged = new $model([
             'tag_name' => TaggingUtility::displayize($tagName),
             'tag_slug' => $tagSlug,
         ]);
@@ -286,7 +291,9 @@ private function removeSingleTag($tagName)
      */
     public static function existingTags(): Collection
     {
-        return Tagged::query()
+        $model = TaggingUtility::taggedModelString();
+
+        return $model::query()
             ->distinct()
             ->join('tagging_tags', 'tag_slug', '=', 'tagging_tags.slug')
             ->where('taggable_type', '=', (new static)->getMorphClass())
@@ -301,7 +308,9 @@ public static function existingTags(): Collection
      */
     public static function existingTagsInGroups($groups): Collection
     {
-        return Tagged::query()
+        $model = TaggingUtility::taggedModelString();
+
+        return $model::query()
             ->distinct()
             ->join('tagging_tags', 'tag_slug', '=', 'tagging_tags.slug')
             ->join('tagging_tag_groups', 'tag_group_id', '=', 'tagging_tag_groups.id')
@@ -372,7 +381,9 @@ private function assembleTagsForScoping($query, $tagNames)
         $tagNames = array_map($normalizer, $tagNames);
         $className = $query->getModel()->getMorphClass();
 
-        $tags = Tagged::query()
+        $model = TaggingUtility::taggedModelString();
+
+        $tags = $model::query()
             ->whereIn('tag_slug', $tagNames)
             ->where('taggable_type', $className)
             ->get()

diff --git a/tests/CommonUsageTest.php b/tests/CommonUsageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Illuminate\Support\Collection;
 

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Conner\Tagging\Model\Tag;
 

diff --git a/tests/EventTests.php b/tests/EventTests.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Conner\Tagging\Events\TagAdded;
 use Conner\Tagging\Events\TagRemoved;

diff --git a/tests/TagGroupTest.php b/tests/TagGroupTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Conner\Tagging\Model\Tag;
 use Conner\Tagging\Model\TagGroup;

diff --git a/tests/TagTest.php b/tests/TagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Conner\Tagging\Model\Tag;
 

diff --git a/tests/TaggableContractTest.php b/tests/TaggableContractTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Conner\Tagging\Contracts\TaggableContract;
 use Conner\Tagging\Taggable;

diff --git a/tests/TaggedTest.php b/tests/TaggedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Conner\Tagging\Model\Tagged;
 

diff --git a/tests/TaggingUtilityTest.php b/tests/TaggingUtilityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Conner\Tagging\Model\Tag;
 use Conner\Tagging\TaggingUtility;

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace ConnerTests;
 
 use Conner\Tagging\Contracts\TaggableContract;
 use Conner\Tagging\Providers\TaggingServiceProvider;