Use Kirschbaum\PowerJoins\PowerJoins

kitloong · kitloong · commit 2e974c8ba749 · 2021-09-08T22:46:05.000+08:00
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ First, you need to define the model relationship the way Compoships did.
 
 ```php
 use Awobaz\Compoships\Compoships;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 
 class User extends Model
 {
diff --git a/src/PowerJoins.php b/src/PowerJoins.php
diff --git a/src/PowerJoinsServiceProvider.php b/src/PowerJoinsServiceProvider.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\ServiceProvider;
-use Kirschbaum\PowerJoins\EloquentJoins;
 use KitLoong\PowerJoins\Mixins\RelationshipsExtraMethods;
 
 class PowerJoinsServiceProvider extends ServiceProvider
@@ -14,7 +13,6 @@ class PowerJoinsServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        EloquentJoins::registerEloquentMacros();
         Relation::mixin(new RelationshipsExtraMethods, true);
     }
 }
diff --git a/tests/JoinRelationshipTest.php b/tests/JoinRelationshipTest.php
@@ -2,7 +2,7 @@
 
 namespace KitLoong\PowerJoins\Tests;
 
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 use KitLoong\PowerJoins\Tests\Models\Post;
 use KitLoong\PowerJoins\Tests\Models\User;
 use KitLoong\PowerJoins\Tests\Models\Image;
diff --git a/tests/Models/Category.php b/tests/Models/Category.php
@@ -3,7 +3,7 @@
 namespace KitLoong\PowerJoins\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
diff --git a/tests/Models/Comment.php b/tests/Models/Comment.php
@@ -4,7 +4,7 @@
 
 use Awobaz\Compoships\Compoships;
 use Illuminate\Database\Eloquent\Model;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Comment extends Model
diff --git a/tests/Models/Group.php b/tests/Models/Group.php
@@ -3,7 +3,7 @@
 namespace KitLoong\PowerJoins\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Group extends Model
diff --git a/tests/Models/Image.php b/tests/Models/Image.php
@@ -2,7 +2,7 @@
 
 namespace KitLoong\PowerJoins\Tests\Models;
 
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
diff --git a/tests/Models/ImageTranslation.php b/tests/Models/ImageTranslation.php
@@ -3,7 +3,7 @@
 namespace KitLoong\PowerJoins\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 
 class ImageTranslation extends Model
 {
diff --git a/tests/Models/Post.php b/tests/Models/Post.php
@@ -3,7 +3,7 @@
 namespace KitLoong\PowerJoins\Tests\Models;
 
 use Awobaz\Compoships\Compoships;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/tests/Models/PostTranslation.php b/tests/Models/PostTranslation.php
@@ -3,7 +3,7 @@
 namespace KitLoong\PowerJoins\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 
 class PostTranslation extends Model
 {
diff --git a/tests/Models/User.php b/tests/Models/User.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
diff --git a/tests/Models/UserProfile.php b/tests/Models/UserProfile.php
@@ -3,7 +3,7 @@
 namespace KitLoong\PowerJoins\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use KitLoong\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\PowerJoins;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class UserProfile extends Model
diff --git a/tests/OrderByTest.php b/tests/OrderByTest.php
@@ -84,7 +84,7 @@ public function test_order_by_nested_relationship()
 
     /**
      * @test
-     * @covers \KitLoong\PowerJoins\PowerJoins::scopeOrderByPowerJoinsCount
+     * @covers \Kirschbaum\PowerJoins\PowerJoins::scopeOrderByPowerJoinsCount
      */
     public function test_order_by_relationship_count()
     {
@@ -105,7 +105,7 @@ public function test_order_by_relationship_count()
 
     /**
      * @test
-     * @covers \KitLoong\PowerJoins\PowerJoins::scopeOrderByPowerJoinsSum
+     * @covers \Kirschbaum\PowerJoins\PowerJoins::scopeOrderByPowerJoinsSum
      */
     public function test_order_by_relationship_sum()
     {
@@ -127,7 +127,7 @@ public function test_order_by_relationship_sum()
 
     /**
      * @test
-     * @covers \KitLoong\PowerJoins\PowerJoins::scopeOrderByPowerJoinsAvg
+     * @covers \Kirschbaum\PowerJoins\PowerJoins::scopeOrderByPowerJoinsAvg
      */
     public function test_order_by_relationship_avg()
     {
@@ -149,8 +149,8 @@ public function test_order_by_relationship_avg()
 
     /**
      * @test
-     * @covers \KitLoong\PowerJoins\PowerJoins::scopeOrderByPowerJoinsMin
-     * @covers \KitLoong\PowerJoins\PowerJoins::scopeOrderByPowerJoinsMax
+     * @covers \Kirschbaum\PowerJoins\PowerJoins::scopeOrderByPowerJoinsMin
+     * @covers \Kirschbaum\PowerJoins\PowerJoins::scopeOrderByPowerJoinsMax
      */
     public function test_order_by_relationship_min_and_max()
     {
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,6 +2,7 @@
 
 namespace KitLoong\PowerJoins\Tests;
 
+use Kirschbaum\PowerJoins\PowerJoinsServiceProvider as BasePowerJoinsServiceProvider;
 use KitLoong\PowerJoins\PowerJoinsServiceProvider;
 
 class TestCase extends \Orchestra\Testbench\TestCase
@@ -16,7 +17,10 @@ public function setUp(): void
 
     protected function getPackageProviders($app)
     {
-        return [PowerJoinsServiceProvider::class];
+        return [
+            BasePowerJoinsServiceProvider::class,
+            PowerJoinsServiceProvider::class
+        ];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ First, you need to define the model relationship the way Compoships did.`
`30`	`30`
`31`	`31`	```php
`32`	`32`	`use Awobaz\Compoships\Compoships;`
`33`		`-use KitLoong\PowerJoins\PowerJoins;`
	`33`	`+use Kirschbaum\PowerJoins\PowerJoins;`
`34`	`34`
`35`	`35`	`class User extends Model`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Database\Eloquent\Relations\Relation;`
`6`	`6`	`use Illuminate\Support\ServiceProvider;`
`7`		`-use Kirschbaum\PowerJoins\EloquentJoins;`
`8`	`7`	`use KitLoong\PowerJoins\Mixins\RelationshipsExtraMethods;`
`9`	`8`
`10`	`9`	`class PowerJoinsServiceProvider extends ServiceProvider`
`@@ -14,7 +13,6 @@ class PowerJoinsServiceProvider extends ServiceProvider`
`14`	`13`	`*/`
`15`	`14`	`public function register()`
`16`	`15`	`{`
`17`		`- EloquentJoins::registerEloquentMacros();`
`18`	`16`	`Relation::mixin(new RelationshipsExtraMethods, true);`
`19`	`17`	`}`
`20`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace KitLoong\PowerJoins\Tests\Models;`
`4`	`4`
`5`	`5`	`use Illuminate\Database\Eloquent\Model;`
`6`		`-use KitLoong\PowerJoins\PowerJoins;`
	`6`	`+use Kirschbaum\PowerJoins\PowerJoins;`
`7`	`7`
`8`	`8`	`class ImageTranslation extends Model`
`9`	`9`	`{`