Style CI fixes

gnikyt · Oct 19, 2018 · 313e322 · 313e322
1 parent f094144
commit 313e322
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 54 deletions.
diff --git a/src/OhMyBrew/BasicShopifyResource/Models/Collect.php b/src/OhMyBrew/BasicShopifyResource/Models/Collect.php
@@ -2,10 +2,8 @@
 
 namespace OhMyBrew\BasicShopifyResource\Models;
 
-use OhMyBrew\BasicShopifyResource\Resource;
 use OhMyBrew\BasicShopifyResource\Relationships\HasOne;
-use OhMyBrew\BasicShopifyResource\Models\Product;
-use OhMyBrew\BasicShopifyResource\Models\CustomCollection;
+use OhMyBrew\BasicShopifyResource\Resource;
 
 /**
  * Custom Collection API.

diff --git a/src/OhMyBrew/BasicShopifyResource/Models/CustomCollection.php b/src/OhMyBrew/BasicShopifyResource/Models/CustomCollection.php
@@ -2,8 +2,8 @@
 
 namespace OhMyBrew\BasicShopifyResource\Models;
 
-use OhMyBrew\BasicShopifyResource\Resource;
 use OhMyBrew\BasicShopifyResource\Relationships\HasMany;
+use OhMyBrew\BasicShopifyResource\Resource;
 
 /**
  * Custom Collection API.

diff --git a/src/OhMyBrew/BasicShopifyResource/Models/Image.php b/src/OhMyBrew/BasicShopifyResource/Models/Image.php
@@ -2,8 +2,8 @@
 
 namespace OhMyBrew\BasicShopifyResource\Models;
 
-use OhMyBrew\BasicShopifyResource\Resource;
 use OhMyBrew\BasicShopifyResource\Relationships\HasOne;
+use OhMyBrew\BasicShopifyResource\Resource;
 
 /**
  * Image API.

diff --git a/src/OhMyBrew/BasicShopifyResource/Models/Product.php b/src/OhMyBrew/BasicShopifyResource/Models/Product.php
@@ -2,9 +2,9 @@
 
 namespace OhMyBrew\BasicShopifyResource\Models;
 
-use OhMyBrew\BasicShopifyResource\Resource;
-use OhMyBrew\BasicShopifyResource\Relationships\IncludesMany;
 use OhMyBrew\BasicShopifyResource\Relationships\HasMany;
+use OhMyBrew\BasicShopifyResource\Relationships\IncludesMany;
+use OhMyBrew\BasicShopifyResource\Resource;
 
 /**
  * Product API.

diff --git a/src/OhMyBrew/BasicShopifyResource/Models/Variant.php b/src/OhMyBrew/BasicShopifyResource/Models/Variant.php
@@ -2,11 +2,9 @@
 
 namespace OhMyBrew\BasicShopifyResource\Models;
 
-use OhMyBrew\BasicShopifyResource\Resource;
 use OhMyBrew\BasicShopifyResource\Relationships\HasOne;
 use OhMyBrew\BasicShopifyResource\Relationships\HasOneThrough;
-use OhMyBrew\BasicShopifyResource\Models\Image;
-use OhMyBrew\BasicShopifyResource\Models\Product;
+use OhMyBrew\BasicShopifyResource\Resource;
 
 class Variant extends Resource
 {
@@ -50,12 +48,12 @@ function () {
             'image'   => (new HasOneThrough(Image::class))
                 ->setThrough(Product::class)
                 ->setThroughId(
-                   /**
-                    * @codeCoverageIgnore
-                    */
+                    /**
+                     * @codeCoverageIgnore
+                     */
                     function () {
-                    return $this->product_id;
-                })
+                        return $this->product_id;
+                    }),
         ];
     }
 }
diff --git a/src/OhMyBrew/BasicShopifyResource/Relationships/HasMany.php b/src/OhMyBrew/BasicShopifyResource/Relationships/HasMany.php
@@ -2,6 +2,6 @@
 
 namespace OhMyBrew\BasicShopifyResource\Relationships;
 
-use OhMyBrew\BasicShopifyResource\Relationships\Relationship;
-
-class HasMany extends Relationship { }
+class HasMany extends Relationship
+{
+}
diff --git a/src/OhMyBrew/BasicShopifyResource/Relationships/HasOne.php b/src/OhMyBrew/BasicShopifyResource/Relationships/HasOne.php
@@ -2,6 +2,6 @@
 
 namespace OhMyBrew\BasicShopifyResource\Relationships;
 
-use OhMyBrew\BasicShopifyResource\Relationships\Relationship;
-
-class HasOne extends Relationship { }
+class HasOne extends Relationship
+{
+}
diff --git a/src/OhMyBrew/BasicShopifyResource/Relationships/HasOneThrough.php b/src/OhMyBrew/BasicShopifyResource/Relationships/HasOneThrough.php
@@ -3,7 +3,6 @@
 namespace OhMyBrew\BasicShopifyResource\Relationships;
 
 use Closure;
-use OhMyBrew\BasicShopifyResource\Relationships\Relationship;
 
 class HasOneThrough extends Relationship
 {

diff --git a/src/OhMyBrew/BasicShopifyResource/Relationships/IncludesMany.php b/src/OhMyBrew/BasicShopifyResource/Relationships/IncludesMany.php
@@ -2,6 +2,6 @@
 
 namespace OhMyBrew\BasicShopifyResource\Relationships;
 
-use OhMyBrew\BasicShopifyResource\Relationships\Relationship;
-
-class IncludesMany extends Relationship { }
+class IncludesMany extends Relationship
+{
+}
diff --git a/src/OhMyBrew/BasicShopifyResource/Relationships/IncludesOne.php b/src/OhMyBrew/BasicShopifyResource/Relationships/IncludesOne.php
@@ -2,6 +2,6 @@
 
 namespace OhMyBrew\BasicShopifyResource\Relationships;
 
-use OhMyBrew\BasicShopifyResource\Relationships\Relationship;
-
-class IncludesOne extends Relationship { }
+class IncludesOne extends Relationship
+{
+}
diff --git a/src/OhMyBrew/BasicShopifyResource/Resource.php b/src/OhMyBrew/BasicShopifyResource/Resource.php
@@ -3,12 +3,12 @@
 namespace OhMyBrew\BasicShopifyResource;
 
 use Exception;
-use Tightenco\Collect\Support\Collection;
-use OhMyBrew\BasicShopifyResource\Relationships\IncludesMany;
-use OhMyBrew\BasicShopifyResource\Relationships\IncludesOne;
 use OhMyBrew\BasicShopifyResource\Relationships\HasMany;
 use OhMyBrew\BasicShopifyResource\Relationships\HasOne;
 use OhMyBrew\BasicShopifyResource\Relationships\HasOneThrough;
+use OhMyBrew\BasicShopifyResource\Relationships\IncludesMany;
+use OhMyBrew\BasicShopifyResource\Relationships\IncludesOne;
+use Tightenco\Collect\Support\Collection;
 
 /**
  * Resource class which all models are based on.
@@ -218,7 +218,7 @@ public static function allThrough($resource, array $params = [])
      * @param int   $resourceId The ID of the resource.
      * @param array $params     Additional param to pass with the request.
      *
-     * @return Resource
+     * @return resource
      */
     public static function find($resourceId, array $params = [])
     {
@@ -233,7 +233,7 @@ public static function find($resourceId, array $params = [])
      * @param object|string $throughResource The resource to loop through
      * @param array         $params          Additional param to pass with the request.
      *
-     * @return Resource
+     * @return resource
      */
     public static function findThrough($resourceId, $throughResource, array $params = [])
     {
@@ -245,10 +245,10 @@ public static function findThrough($resourceId, $throughResource, array $params
      * Relationship of includesOne.
      * This resource includes a single nested resource.
      *
-     * @param string      $resource The class name of the resource.
-     * @param array       $params   Additional param to pass with the request.
+     * @param string $resource The class name of the resource.
+     * @param array  $params   Additional param to pass with the request.
      *
-     * @return Resource
+     * @return resource
      */
     public function includesOne($resource, array $params = [])
     {
@@ -257,7 +257,7 @@ public function includesOne($resource, array $params = [])
         $id = $instance->{$instance->resourceName_id};
 
         if ($id === null) {
-            return null;
+            return;
         }
 
         return $instance::find($id, $params);
@@ -303,7 +303,7 @@ public function hasMany($resource, array $params)
      * @param string $resource The class name of the resource.
      * @param array  $params   Additional param to pass with the request.
      *
-     * @return Resource
+     * @return resource
      */
     public function hasOne($resource, array $params)
     {
@@ -322,16 +322,16 @@ public function hasOne($resource, array $params)
      * @param string $throughResource The through resource class.
      * @param int    $throughId       Through resource ID.
      *
-     * @return Resource
+     * @return resource
      */
-    public function hasOneThrough($resource, array $params = [], $throughResource, $throughId)
+    public function hasOneThrough($resource, array $params, $throughResource, $throughId)
     {
         $instance = new $resource();
         $throughInstance = new $throughResource();
         $id = $this->{"{$instance->resourceName}_id"};
 
         if ($id === null) {
-            return null;
+            return;
         }
 
         return $instance::findThrough($id, $throughInstance::find($throughId), $params);

diff --git a/test/Models/CollectTest.php b/test/Models/CollectTest.php
@@ -2,10 +2,10 @@
 
 namespace OhMyBrew\BasicShopifyResource\Test\Models;
 
-use OhMyBrew\BasicShopifyResource\Test\TestCase;
 use OhMyBrew\BasicShopifyResource\Models\Collect;
 use OhMyBrew\BasicShopifyResource\Models\CustomCollection;
 use OhMyBrew\BasicShopifyResource\Models\Product;
+use OhMyBrew\BasicShopifyResource\Test\TestCase;
 use Tightenco\Collect\Support\Collection;
 
 class CollectTest extends TestCase
@@ -53,4 +53,4 @@ public function testRelationships()
         $collection = $collect->collection;
         $this->assertInstanceOf(CustomCollection::class, $collection);
     }
-}
+}
diff --git a/test/Models/CustomCollection.php b/test/Models/CustomCollection.php
@@ -2,12 +2,10 @@
 
 namespace OhMyBrew\BasicShopifyResource\Test\Models;
 
-use OhMyBrew\BasicShopifyResource\Models\Product;
-use OhMyBrew\BasicShopifyResource\Models\Image;
 use OhMyBrew\BasicShopifyResource\Test\TestCase;
 use Tightenco\Collect\Support\Collection;
 
-class CustomCollectionTest extends TestCase
+class CustomCollection extends TestCase
 {
     public function testSetup()
     {
@@ -48,4 +46,4 @@ public function testRelationships()
         $collects = $collection->collects;
         $this->assertInstanceOf(Collection::class, $collects);
     }
-}
+}
diff --git a/test/Models/ImageTest.php b/test/Models/ImageTest.php
@@ -2,8 +2,8 @@
 
 namespace OhMyBrew\BasicShopifyResource\Test\Models;
 
-use OhMyBrew\BasicShopifyResource\Models\Product;
 use OhMyBrew\BasicShopifyResource\Models\Image;
+use OhMyBrew\BasicShopifyResource\Models\Product;
 use OhMyBrew\BasicShopifyResource\Test\TestCase;
 use Tightenco\Collect\Support\Collection;
 
@@ -48,4 +48,4 @@ public function testRelationships()
         $product = $image->product;
         $this->assertInstanceOf(Product::class, $product);
     }
-}
+}
diff --git a/test/Models/ProductTest.php b/test/Models/ProductTest.php
@@ -63,4 +63,4 @@ public function testRelationships()
         $this->assertInstanceOf(Collection::class, $collects);
         $this->assertTrue($collects->count() > 0);
     }
-}
+}
diff --git a/test/Models/VariantTest.php b/test/Models/VariantTest.php
@@ -2,9 +2,9 @@
 
 namespace OhMyBrew\BasicShopifyResource\Test\Models;
 
+use OhMyBrew\BasicShopifyResource\Models\Image;
 use OhMyBrew\BasicShopifyResource\Models\Product;
 use OhMyBrew\BasicShopifyResource\Models\Variant;
-use OhMyBrew\BasicShopifyResource\Models\Image;
 use OhMyBrew\BasicShopifyResource\Test\TestCase;
 use Tightenco\Collect\Support\Collection;
 
@@ -61,4 +61,4 @@ public function testRelationships()
         $image = $variant->image;
         $this->assertInstanceOf(Image::class, $image);
     }
-}
+}
diff --git a/test/TestCase.php b/test/TestCase.php
@@ -2,12 +2,12 @@
 
 namespace OhMyBrew\BasicShopifyResource\Test;
 
-use ReflectionClass;
-use ReflectionProperty;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Response;
 use OhMyBrew\BasicShopifyResource\Connection;
+use ReflectionClass;
+use ReflectionProperty;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {