Giant load of bugfixes

CupOfTea696 · Mar 8, 2015 · b96afb0 · b96afb0
1 parent 762f267
commit b96afb0
Show file tree

Hide file tree

Showing 28 changed files with 150 additions and 140 deletions.
diff --git a/src/CupOfTea/YouTube/API/Provider.php b/src/CupOfTea/YouTube/API/Provider.php
@@ -4,9 +4,13 @@
 use Illuminate\Http\Request;
 use CupOfTea\YouTube\Models\RefreshToken;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use CupOfTea\YouTube\Exceptions\ResourceNotFoundException;
 use CupOfTea\YouTube\Contracts\Provider as ProviderContract;
 
 class Provider implements ProviderContract {
+
+    const PACKAGE = 'CupOfTea/YouTube';
+    const VERSION = '0.1.1-alpha';
 
 	/**
 	 * Available Resources for this API.
@@ -96,7 +100,7 @@ class Provider implements ProviderContract {
 	 */
 	public function __construct(Request $request, $clientId, $clientSecret, $cfg)
 	{
-		$this->request = $request;
+        $this->request = $request;
         $this->session = $request->getSession();
 		$this->clientId = $clientId;
 		$this->clientSecret = $clientSecret;
@@ -446,10 +450,25 @@ protected function getCode()
 	 *
 	 * @return \GuzzleHttp\Client
 	 */
-	protected function getHttpClient($base_url = false){
+	public function getHttpClient($base_url = false){
         $base_url = $base_url ? $base_url : $this->base_url;
 
-        return new \GuzzleHttp\Client(['base_url' => $this->base_url]);
+        $defaultAgent = self::PACKAGE . '/' . self::VERSION;
+        $defaultAgent .= ' Guzzle/' . \GuzzleHttp\ClientInterface::VERSION;
+        if(extension_loaded('curl'))
+            $defaultAgent .= ' curl/' . curl_version()['version'];
+        $defaultAgent .= ' PHP/' . PHP_VERSION;
+        $defaultAgent .= ' (gzip)';
+
+        return new \GuzzleHttp\Client([
+            'base_url' => $base_url,
+            'defaults' => [
+                'headers' => [
+                    'User-Agent' => $defaultAgent,
+                    'Accept-Encoding' => 'gzip',
+                ],
+            ],
+        ]);
 	}
 
 	/**
@@ -474,14 +493,14 @@ public function setRequest(Request $request)
 	 */
     public function __call($resource, $a){
         $resource = strtolower($resource);
-        if(!array_get($resource, $this->available_resources))
+        if(!in_array($resource, $this->available_resources))
             throw new ResourceNotFoundException(ucfirst($resource));
 
-        if($instance = array_get($resource, $this->resources))
+        if($instance = in_array($resource, $this->resources))
             return $instance;
 
-        $instance = 'Resource\\' . ucfirst($resource);
-        return $this->resources[$resource] = new $instance($this);
+        $instance = __NAMESPACE__ . '\\Resource\\' . ucfirst($resource);
+        return $this->resources[$resource] = new $instance($this, $this->cfg);
     }
 
     /*************************/

diff --git a/src/CupOfTea/YouTube/API/Resource/Activities.php b/src/CupOfTea/YouTube/API/Resource/Activities.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\InsertMethod;
 
-class Activities implements ArrayAccess, ResourceContract {
+class Activities extends Resource {
 
     use GetMethod, InsertMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Channels.php b/src/CupOfTea/YouTube/API/Resource/Channels.php
@@ -1,19 +1,21 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
+use CupOfTea\YouTube\Traits\HasSubResources;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
-use CupOfTea\YouTube\Contracts\HasSubResources as HasSubResourcesContract;
 
-use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\UpdateMethod;
+use CupOfTea\YouTube\Traits\ListMethod, CupOfTea\YouTube\Traits\UpdateMethod;
 
-class Channels implements ArrayAccess, ResourceContract, HasSubResourcesContract {
+class Channels extends Resource{
 
-    use GetMethod, UpdateMethod;
+    use ListMethod, UpdateMethod,
+        HasSubResources;
 
     /**
-	 * {@inheritdoc}
+	 * Available SubResources for this API.
+	 *
+	 * @var array
 	 */
 	protected $available_subresources = ['banners', 'sections'];
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Channels/Banners.php b/src/CupOfTea/YouTube/API/Resource/Channels/Banners.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource\Channels;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\InsertMethod;
 
-class Banners implements ArrayAccess, ResourceContract {
+class Banners extends Resource {
 
     use InsertMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Channels/Sections.php b/src/CupOfTea/YouTube/API/Resource/Channels/Sections.php
@@ -1,14 +1,13 @@
 <?php namespace CupOfTea\YouTube\API\Resource\Channels;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\InsertMethod,
     CupOfTea\YouTube\Traits\UpdateMethod, CupOfTea\YouTube\Traits\DeleteMethod;
 
-class Sections implements ArrayAccess, ResourceContract {
+class Sections extends Resource {
 
     use GetMethod, InsertMethod, UpdateMethod, DeleteMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/GuideCategories.php b/src/CupOfTea/YouTube/API/Resource/GuideCategories.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\GetMethod;
 
-class GuideCategories implements ArrayAccess, ResourceContract {
+class GuideCategories extends Resource {
 
     use GetMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Playlists.php b/src/CupOfTea/YouTube/API/Resource/Playlists.php
@@ -1,20 +1,22 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
-use CupOfTea\YouTube\Contracts\HasSubResources as HasSubResourcesContract;
+use CupOfTea\YouTube\Traits\HasSubResources;
 
 use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\InsertMethod,
     CupOfTea\YouTube\Traits\UpdateMethod, CupOfTea\YouTube\Traits\DeleteMethod;
 
-class Playlists implements ArrayAccess, ResourceContract, HasSubResourcesContract {
+class Playlists extends Resource {
 
-    use GetMethod, InsertMethod, UpdateMethod, DeleteMethod;
+    use GetMethod, InsertMethod, UpdateMethod, DeleteMethod,
+        HasSubResources;
 
     /**
-	 * {@inheritdoc}
+	 * Available SubResources for this API.
+	 *
+	 * @var array
 	 */
 	protected $available_subresources = ['items'];
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Playlists/Items.php b/src/CupOfTea/YouTube/API/Resource/Playlists/Items.php
@@ -1,14 +1,13 @@
 <?php namespace CupOfTea\YouTube\API\Resource\Playlists;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\InsertMethod,
     CupOfTea\YouTube\Traits\UpdateMethod, CupOfTea\YouTube\Traits\DeleteMethod;
 
-class Items implements ArrayAccess, ResourceContract {
+class Items extends Resource {
 
     use GetMethod, InsertMethod, UpdateMethod, DeleteMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Search.php b/src/CupOfTea/YouTube/API/Resource/Search.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\ListMethod;
 
-class Search implements ArrayAccess, ResourceContract {
+class Search extends Resource {
 
     use ListMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Subscriptions.php b/src/CupOfTea/YouTube/API/Resource/Subscriptions.php
@@ -1,14 +1,13 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\InsertMethod;
     CupOfTea\YouTube\Traits\DeleteMethod
 
-class Activities implements ArrayAccess, ResourceContract {
+class Subscriptions extends Resource {
 
     use GetMethod, InsertMethod, DeleteMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Thumbnails.php b/src/CupOfTea/YouTube/API/Resource/Thumbnails.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\SetMethod;
 
-class Activities implements ArrayAccess, ResourceContract {
+class Thumbnails extends Resource {
 
     use SetMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Videos.php b/src/CupOfTea/YouTube/API/Resource/Videos.php
@@ -1,21 +1,23 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
+use CupOfTea\YouTube\Traits\HasSubResources;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
-use CupOfTea\YouTube\Contracts\HasSubResources as HasSubResourcesContract;
 
 use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\InsertMethod,
     CupOfTea\YouTube\Traits\UpdateMethod, CupOfTea\YouTube\Traits\DeleteMethod,
     CupOfTea\YouTube\Traits\RateMethod, CupOfTea\YouTube\Traits\GetRatingMethod;
 
-class Videos implements ArrayAccess, ResourceContract, HasSubResourcesContract {
+class Videos extends Resource {
 
-    use GetMethod, InsertMethod, UpdateMethod, DeleteMethod, RateMethod, GetRatingMethod;
+    use GetMethod, InsertMethod, UpdateMethod, DeleteMethod, RateMethod, GetRatingMethod,
+        HasSubResources;
 
     /**
-	 * {@inheritdoc}
+	 * Available SubResources for this API.
+	 *
+	 * @var array
 	 */
 	protected $available_subresources = ['categories'];
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Videos/Categories.php b/src/CupOfTea/YouTube/API/Resource/Videos/Categories.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource\Videos;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\GetMethod;
 
-class Catefories implements ArrayAccess, ResourceContract {
+class Catefories extends Resource {
 
     use GetMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/Watermarks.php b/src/CupOfTea/YouTube/API/Resource/Watermarks.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\SetMethod, CupOfTea\YouTube\Traits\UnsetMethod;
 
-class Watermarks implements ArrayAccess, ResourceContract {
+class Watermarks extends Resource {
 
     use SetMethod, UnsetMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/i18n.php b/src/CupOfTea/YouTube/API/Resource/i18n.php
@@ -1,14 +1,18 @@
 <?php namespace CupOfTea\YouTube\API\Resource;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\HasSubResources as HasSubResourcesContract;
+use CupOfTea\YouTube\Traits\HasSubResources;
 
-class i18n implements HasSubResourcesContract{
+class i18n extends Resource{
+
+    use HasSubResources;
 
     /**
-	 * {@inheritdoc}
+	 * Available SubResources for this API.
+	 *
+	 * @var array
 	 */
 	protected $available_subresources = ['languages', 'regions'];
 

diff --git a/src/CupOfTea/YouTube/API/Resource/i18n/Languages.php b/src/CupOfTea/YouTube/API/Resource/i18n/Languages.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource\i18n;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\InsertMethod;
 
-class Activities implements ArrayAccess, ResourceContract {
+class Languages extends Resource {
 
     use GetMethod;
 

diff --git a/src/CupOfTea/YouTube/API/Resource/i18n/Regions.php b/src/CupOfTea/YouTube/API/Resource/i18n/Regions.php
@@ -1,13 +1,12 @@
 <?php namespace CupOfTea\YouTube\API\Resource\i18n;
 
-use ArrayAccess;
 use CupOfTea\YouTube\Contracts\Provider;
+use CupOfTea\YouTube\Abstraction\Resource;
 use CupOfTea\YouTube\Exceptions\UnauthorisedException;
-use CupOfTea\YouTube\Contracts\Resource as ResourceContract;
 
 use CupOfTea\YouTube\Traits\GetMethod, CupOfTea\YouTube\Traits\InsertMethod;
 
-class Activities implements ArrayAccess, ResourceContract {
+class Regions extends Resource {
 
     use GetMethod;