Merge branch 'master' of https://github.com/MacsiDigital/laravel-api-…

…client

src/Contracts/Entry.php

@@ -4,13 +4,11 @@
 
 interface Entry
 {
-
  public function getNode($key);
 
  public function getRequest() ;
 
  public function setRequest($request);
 
  public function newRequest();
-
 }

src/Contracts/Relation.php

@@ -4,5 +4,4 @@
 
 interface Relation
 {
-
-}
+}

src/Dev/Address.php

@@ -6,12 +6,11 @@
 
 class Address extends Resource
 {
- protected $storeResource = 'MacsiDigital\API\Dev\Resources\StoreAddress';
+ protected $storeResource = 'MacsiDigital\API\Dev\Resources\StoreAddress';
  protected $updateResource = 'MacsiDigital\API\Dev\Resources\UpdateAddress';
 
- public function user() 
+ public function user()
  {
-  return $this->belongsTo(User::class);
+  return $this->belongsTo(User::class);
  }
-
 }

src/Dev/Api.php

@@ -16,11 +16,10 @@ public function newRequest()
  return Client::baseUrl(config('api.base_url'))->withOptions(config('api.options'));
  }
 
- public function setConfig() 
+ public function setConfig()
  {
  // Normally you would use a proper config file but for our tests we will include it
  $config = include 'config.php';
  config($config);
  }
-
 }

src/Dev/Resources/StoreAddress.php

@@ -6,11 +6,9 @@
 
 class StoreAddress extends PersistResource
 {
-
  protected $persistAttributes = [
-  'street' => 'required|string|max:255',
-  'town' => 'required|string|max:255',
-  'postcode' => 'required|string|max:10',
+  'street' => 'required|string|max:255',
+  'town' => 'required|string|max:255',
+  'postcode' => 'required|string|max:10',
  ];
-
 }

src/Dev/Resources/StoreUser.php

@@ -7,12 +7,11 @@
 class StoreUser extends PersistResource
 {
  protected $persistAttributes = [
-  'name' => 'required|string|max:255',
-  'email' => 'required|email|string|max:255',
-  'password' => 'required|string|max:10',
-  'address.street' => 'string|max:255',
-  'address.town' => 'string|max:255',
-  'address.postcode' => 'string|max:10',
+  'name' => 'required|string|max:255',
+  'email' => 'required|email|string|max:255',
+  'password' => 'required|string|max:10',
+  'address.street' => 'string|max:255',
+  'address.town' => 'string|max:255',
+  'address.postcode' => 'string|max:10',
  ];
-
 }

src/Dev/Resources/UpdateAddress.php

@@ -6,11 +6,9 @@
 
 class UpdateAddress extends PersistResource
 {
-
  protected $persistAttributes = [
-  'street' => 'required|string|max:255',
-  'town' => 'required|string|max:255',
-  'postcode' => 'required|string|max:10',
+  'street' => 'required|string|max:255',
+  'town' => 'required|string|max:255',
+  'postcode' => 'required|string|max:10',
  ];
-
 }

src/Dev/Resources/UpdateUser.php

@@ -7,16 +7,15 @@
 class UpdateUser extends PersistResource
 {
  protected $persistAttributes = [
-  'name' => 'string|max:255',
-  'email' => 'email|string|max:255',
-  'password' => 'string|max:10',
-  'address.street' => 'string|max:255',
-  'address.town' => 'string|max:255',
-  'address.postcode' => 'string|max:10',
+  'name' => 'string|max:255',
+  'email' => 'email|string|max:255',
+  'password' => 'string|max:10',
+  'address.street' => 'string|max:255',
+  'address.town' => 'string|max:255',
+  'address.postcode' => 'string|max:10',
  ];
 
  protected $relatedResource = [
  // 'address' => '\MacsiDigital\API\Dev\Resources\UpdateAddress'
  ];
-
 }

src/Dev/User.php

@@ -6,12 +6,11 @@
 
 class User extends Resource
 {
- protected $storeResource = 'MacsiDigital\API\Dev\Resources\StoreUser';
+ protected $storeResource = 'MacsiDigital\API\Dev\Resources\StoreUser';
  protected $updateResource = 'MacsiDigital\API\Dev\Resources\UpdateUser';
 
- public function address() 
+ public function address()
  {
-  return $this->hasOne(Address::class);
+  return $this->hasOne(Address::class);
  }
-
 }

src/Dev/config.php

@@ -1,10 +1,10 @@
 <?php
 
 return [
- 'api' => [
- 'base_url' => 'http://playground.test/api/',
- 'options' => [
+ 'api' => [
+ 'base_url' => 'http://playground.test/api/',
+ 'options' => [
 
- ]
- ]
-];
+ ],
+ ],
+];

src/Exceptions/Base.php

@@ -6,5 +6,4 @@
 
 class Base extends Exception
 {
-
-}
+}

src/Exceptions/CantDeleteException.php

@@ -4,8 +4,8 @@
 
 class CantDeleteException extends Base
 {
- public function __construct($class, $key)
+ public function __construct($class, $key)
  {
  parent::__construct('There was an error deleting '.$class.' with a key of '.$key);
  }
-}
+}

src/Exceptions/HttpException.php

@@ -8,6 +8,6 @@ class HttpException extends Exception
 {
  public function __construct($code = 0, $message, \Throwable $previous = null)
  {
-  parent::__construct('HTTP Request returned Status Code '.$code.'. '.$message);
+  parent::__construct('HTTP Request returned Status Code '.$code.'. '.$message);
  }
-}
+}

src/Exceptions/IncorrectRelationshipModel.php

@@ -4,9 +4,8 @@
 
 class IncorrectRelationshipModel extends Base
 {
- public function __construct($related, $object)
+ public function __construct($related, $object)
  {
  parent::__construct('The relation must be of class '.get_class($related).', '.get_class($object).' passed.');
  }
 }
-

src/Exceptions/InvalidActionException.php

@@ -7,4 +7,4 @@
 class InvalidActionException extends Exception
 {
  //
-}
+}

src/Exceptions/JsonEncodingException.php

@@ -32,4 +32,4 @@ public static function forAttribute($model, $key, $message)
 
  return new static("Unable to encode attribute [{$key}] for model [{$class}] to JSON: {$message}.");
  }
-}
+}

src/Exceptions/KeyNotFoundException.php

@@ -4,8 +4,8 @@
 
 class KeyNotFoundException extends Base
 {
- public function __construct($class) 
- {
- parent::__construct('Priamry key for '.$class.' not set, so cant perform this action.');
- }
-}
+ public function __construct($class)
+ {
+ parent::__construct('Priamry key for '.$class.' not set, so cant perform this action.');
+ }
+}

src/Exceptions/ModelNotFoundException.php

@@ -63,4 +63,4 @@ public function getIds()
  {
  return $this->ids;
  }
-}
+}

src/Exceptions/NodeNotFoundException.php

@@ -4,5 +4,4 @@
 
 class NodeNotFoundException extends Base
 {
-
-}
+}

src/Exceptions/NotAPersistableModel.php

@@ -4,7 +4,7 @@
 
 class NotAPersistableModel extends Base
 {
- public function __construct($related)
+ public function __construct($related)
  {
  parent::__construct(get_class($related).' cannot be saved directly to the API. It needs to be saved as part of its parent.');
  }

src/Exceptions/OutOfResultSetException.php

@@ -4,8 +4,8 @@
 
 class OutOfResultSetException extends Base
 {
- public function __construct()
+ public function __construct()
  {
  parent::__construct('You are trying to retrieve results outside of the available results.');
  }
-}
+}

src/Exceptions/RelationAlreadyExistsException.php

@@ -4,8 +4,8 @@
 
 class RelationAlreadyExistsException extends Base
 {
- public function __construct($owner, $related)
+ public function __construct($owner, $related)
  {
  parent::__construct(get_class($owner).' already has a set relationship from '.get_class($related).' this is a One relationship and cna only have 1 set relation.');
  }
-}
+}

src/Exceptions/RequestException.php

@@ -26,4 +26,4 @@ public function __construct(Response $response)
 
  $this->response = $response;
  }
-}
+}

src/Exceptions/ValidationFailedException.php

@@ -6,9 +6,8 @@
 
 class ValidationFailedException extends Exception
 {
-
  public function __construct($error)
  {
  parent::__construct('You have validation errors:- '.implode(', ', $error->all()));
  }
-}
+}

src/Providers/APIServiceProvider.php

@@ -2,15 +2,13 @@
 
 namespace MacsiDigital\API\Providers;
 
-use MacsiDigital\API\Dev\User;
-use MacsiDigital\API\Support\Entry;
 use Illuminate\Support\ServiceProvider;
+use MacsiDigital\API\Support\Entry;
 
 class APIServiceProvider extends ServiceProvider
 {
- public function boot()
+ public function boot()
  {
-
  }
 
  /**
@@ -26,6 +24,5 @@ public function register()
  // $this->app->bind(Entry::class, function ($app) {
  // return new Entry();
  // });
-
  }
 }

src/Support/ApiResource.php

@@ -5,6 +5,5 @@
 
 class ApiResource extends Resource
 {
- use InteractsWithAPI;
-
-}
+ use InteractsWithAPI;
+}

src/Support/Authentication/JWT.php

@@ -13,6 +13,6 @@ public static function generateToken($token, $secret)
 
  public static function decodeToken($jwt, $secret)
  {
- return FirebaseJWT::decode($jwt, $secret, array('HS256'));
+ return FirebaseJWT::decode($jwt, $secret, ['HS256']);
  }
-}
+}

src/Support/Authentication/OAuth1.php

@@ -10,4 +10,4 @@ public static function generate($options)
  {
  return new GuzzleOauth1($options);
  }
-}
+}