Bump zing/coding-standard to ^6.1 (#8)

zingimmick · Feb 21, 2022 · 9178962 · 9178962
1 parent 67a7d99
commit 9178962
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "nunomaduro/larastan": "^1.0 || ^2.0",
         "orchestra/testbench": "^6.0 || ^7.0",
         "phpunit/phpunit": "^8.0,<8.5.12 || ^9.3.3",
-        "zing/coding-standard": "^5.3 || ^6.0"
+        "zing/coding-standard": "^6.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/HasMoreRelationships.php b/src/HasMoreRelationships.php
@@ -278,7 +278,7 @@ protected function guessBelongsToOneRelation(): ?string
     {
         /** @phpstan-var array{function: string}|null $caller */
         $caller = Arr::first(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), function ($trace): bool {
-            return ! in_array(
+            return ! \in_array(
                 $trace['function'],
                 array_merge(static::$oneMethods, ['guessBelongsToOneRelation']),
                 true

diff --git a/src/Relations/BelongsToOne.php b/src/Relations/BelongsToOne.php
@@ -20,9 +20,9 @@
  */
 class BelongsToOne extends BelongsToMany implements SupportsPartialRelations
 {
-    use SupportsDefaultModels;
     use CanBeOneOfMany;
     use ComparesRelatedModels;
+    use SupportsDefaultModels;
 
     /**
      * Initialize the relation on a set of models.

diff --git a/src/Relations/MorphToOne.php b/src/Relations/MorphToOne.php
@@ -20,9 +20,9 @@
  */
 class MorphToOne extends MorphToMany implements SupportsPartialRelations
 {
-    use SupportsDefaultModels;
     use CanBeOneOfMany;
     use ComparesRelatedModels;
+    use SupportsDefaultModels;
 
     /**
      * Initialize the relation on a set of models.

diff --git a/tests/BelongsToOneTest.php b/tests/BelongsToOneTest.php
@@ -137,7 +137,7 @@ public function testRetrievedTimes(): void
 
         Group::query()->with('leader')->get();
 
-        $this->assertSame(2, $retrievedLogins);
+        self::assertSame(2, $retrievedLogins);
     }
 
     public function testReceivingModel(): void
@@ -157,8 +157,8 @@ public function testReceivingModel(): void
 
         /** @var \Zing\LaravelEloquentRelationships\Tests\Models\User $leader */
         $leader = $group->leader;
-        $this->assertNotNull($leader);
-        $this->assertSame($user->getKey(), $leader->getKey());
+        self::assertNotNull($leader);
+        self::assertSame($user->getKey(), $leader->getKey());
     }
 
     public function testExists(): void
@@ -179,12 +179,12 @@ public function testExists(): void
         $exists = Group::query()->whereHas('leader', function ($q) use ($previousUser): void {
             $q->whereKey($previousUser->getKey());
         })->exists();
-        $this->assertFalse($exists);
+        self::assertFalse($exists);
 
         $exists = Group::query()->whereHas('leader', function ($q) use ($currentUser): void {
             $q->whereKey($currentUser->getKey());
         })->exists();
-        $this->assertTrue($exists);
+        self::assertTrue($exists);
     }
 
     public function testIs(): void
@@ -202,8 +202,8 @@ public function testIs(): void
                 'status' => 1,
             ]);
 
-        $this->assertFalse($group->leader()->is($previousImage));
+        self::assertFalse($group->leader()->is($previousImage));
 
-        $this->assertTrue($group->leader()->is($currentImage));
+        self::assertTrue($group->leader()->is($currentImage));
     }
 }
diff --git a/tests/MorphToOneTest.php b/tests/MorphToOneTest.php
@@ -137,7 +137,7 @@ public function testRetrievedTimes(): void
 
         Product::query()->with('cover')->get();
 
-        $this->assertSame(2, $retrievedLogins);
+        self::assertSame(2, $retrievedLogins);
     }
 
     public function testReceivingModel(): void
@@ -157,8 +157,8 @@ public function testReceivingModel(): void
 
         /** @var \Zing\LaravelEloquentRelationships\Tests\Models\Image $cover */
         $cover = $product->cover;
-        $this->assertNotNull($cover);
-        $this->assertSame('test', $cover->url);
+        self::assertNotNull($cover);
+        self::assertSame('test', $cover->url);
     }
 
     public function testMorphType(): void
@@ -186,8 +186,8 @@ public function testMorphType(): void
 
         /** @var \Zing\LaravelEloquentRelationships\Tests\Models\Image $cover */
         $cover = $product->cover;
-        $this->assertNotNull($cover);
-        $this->assertSame('test', $cover->url);
+        self::assertNotNull($cover);
+        self::assertSame('test', $cover->url);
     }
 
     public function testExists(): void
@@ -207,12 +207,12 @@ public function testExists(): void
         $exists = Product::query()->whereHas('cover', function ($q) use ($previousImage): void {
             $q->whereKey($previousImage->getKey());
         })->exists();
-        $this->assertFalse($exists);
+        self::assertFalse($exists);
 
         $exists = Product::query()->whereHas('cover', function ($q) use ($currentImage): void {
             $q->whereKey($currentImage->getKey());
         })->exists();
-        $this->assertTrue($exists);
+        self::assertTrue($exists);
     }
 
     public function testGetResults(): void

diff --git a/tests/MorphedByOneTest.php b/tests/MorphedByOneTest.php
@@ -128,7 +128,7 @@ public function testRetrievedTimes(): void
 
         Image::query()->with('bestProduct')->get();
 
-        $this->assertSame(2, $retrievedLogins);
+        self::assertSame(2, $retrievedLogins);
     }
 
     public function testReceivingModel(): void
@@ -148,8 +148,8 @@ public function testReceivingModel(): void
 
         /** @var \Zing\LaravelEloquentRelationships\Tests\Models\Product $product */
         $product = $image->bestProduct;
-        $this->assertNotNull($product);
-        $this->assertSame('test', $product->name);
+        self::assertNotNull($product);
+        self::assertSame('test', $product->name);
     }
 
     public function testMorphType(): void
@@ -177,8 +177,8 @@ public function testMorphType(): void
 
         /** @var \Zing\LaravelEloquentRelationships\Tests\Models\Product $product */
         $product = $image->bestProduct;
-        $this->assertNotNull($product);
-        $this->assertSame('test', $product->name);
+        self::assertNotNull($product);
+        self::assertSame('test', $product->name);
     }
 
     public function testExists(): void
@@ -198,11 +198,11 @@ public function testExists(): void
         $exists = Image::query()->whereHas('bestProduct', function ($q) use ($previousProduct): void {
             $q->whereKey($previousProduct->getKey());
         })->exists();
-        $this->assertFalse($exists);
+        self::assertFalse($exists);
 
         $exists = Image::query()->whereHas('bestProduct', function ($q) use ($currentProduct): void {
             $q->whereKey($currentProduct->getKey());
         })->exists();
-        $this->assertTrue($exists);
+        self::assertTrue($exists);
     }
 }