Removed branch alias from composer, added collection key, injected curl instead of HTTP client, implemented curl on Resource::fetchAll

Author: jguittard

composer.json

@@ -28,12 +28,6 @@
     "squizlabs/php_codesniffer": "~2.0",
     "phpunit/PHPUnit": "~4.5.0"
   },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "1.0-dev",
-      "dev-develop": "1.0-dev"
-    }
-  },
   "autoload": {
     "psr-4": {
       "Zoho\\Subscriptions\\": "src/"

config/module.config.php

@@ -20,6 +20,7 @@
         'resources' => [
             'Zoho\Subscriptions\Resource\Product' => [
                 'path' => '/products',
+                'collectionName' => 'products',
                 'input-filter' => [
                     0 => [
                         'name' => 'name',
@@ -126,6 +127,7 @@
             ],
             'Zoho\Subscriptions\Resource\Plan' => [
                 'path' => '/plans',
+                'collectionName' => 'plans',
                 'input-filter' => [
                     0 => [
                         'name' => 'name',
@@ -332,6 +334,7 @@
             ],
             'Zoho\Subscriptions\Resource\Addon' => [
                 'path' => '/addons',
+                'collectionName' => 'addons',
                 'input-filter' => [
                     0 => [
                         'name' => '',
@@ -347,6 +350,7 @@
             ],
             'Zoho\Subscriptions\Resource\Coupon' => [
                 'path' => '/coupons',
+                'collectionName' => 'coupons',
                 'input-filter' => [
                     0 => [
                         'name' => '',
@@ -362,6 +366,7 @@
             ],
             'Zoho\Subscriptions\Resource\Customer' => [
                 'path' => '/customers',
+                'collectionName' => 'customers',
                 'input-filter' => [
                     0 => [
                         'name' => 'displayName',
@@ -625,6 +630,7 @@
             ],
             'Zoho\Subscriptions\Resource\ContactPerson' => [
                 'path' => '/customers/:customer_id/contactpersons',
+                'collectionName' => 'contactpersons',
                 'input-filter' => [
                     0 => [
                         'name' => 'contactpersonId',
@@ -780,6 +786,7 @@
             ],
             'Zoho\Subscriptions\Resource\Subscription' => [
                 'path' => '/subscriptions',
+                'collectionName' => 'subscriptions',
                 'input-filter' => [
                     0 => [
                         'name' => 'name',
@@ -857,6 +864,7 @@
             ],
             'Zoho\Subscriptions\Resource\Invoice' => [
                 'path' => '/invoices',
+                'collectionName' => 'invoices',
                 'input-filter' => [
                     0 => [
                         'name' => '',
@@ -872,6 +880,7 @@
             ],
             'Zoho\Subscriptions\Resource\Payment' => [
                 'path' => '/payments',
+                'collectionName' => 'payments',
                 'input-filter' => [
                     0 => [
                         'name' => '',
@@ -887,6 +896,7 @@
             ],
             'Zoho\Subscriptions\Resource\HostedPage' => [
                 'path' => '/hostedpages',
+                'collectionName' => 'hostedpages',
                 'input-filter' => [
                     0 => [
                         'name' => '',

src/Factory/ResourceAbstractFactory.php

@@ -96,7 +96,7 @@ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $
         $zohoConfig = $config['zoho'];
         $resourceConfig = $config['zoho']['resources'][$requestedName];
 
-        $opensslCapath = ini_get('openssl.capath');
+        /*$opensslCapath = ini_get('openssl.capath');
 
         if (!empty($opensslCapath)) {
             $clientConfig = ['sslcapath' => $opensslCapath];
@@ -111,7 +111,14 @@ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $
             'Authorization' => 'Zoho-authtoken ' . $zohoConfig['auth_token'],
         ));
 
-        $resource = new Resource($httpClient);
+        $resource = new Resource($httpClient);*/
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, [
+            'Authorization: Zoho-authtoken ' . $zohoConfig['auth_token'],
+            'X-com-zoho-subscriptions-organizationid: ' . $zohoConfig['organization_id'],
+        ]);
+        $resource = new Resource($curl);
         $resource->setPath($resourceConfig['path']);
 
         $entityClass = str_replace('Resource', 'Entity', $requestedName);

src/Service/Resource.php

@@ -34,6 +34,16 @@ class Resource implements InputFilterAwareInterface
      */
     protected $httpClient;
 
+    /**
+     * @var mixed
+     */
+    protected $curl;
+
+    /**
+     * @var string
+     */
+    protected $collectionName;
+
     /**
      * @var string
      */
@@ -54,6 +64,28 @@ public function hasErrors()
         return count($this->errors) > 0;
     }
 
+    /**
+     * Get the collectionName
+     *
+     * @return string
+     */
+    public function getCollectionName()
+    {
+        return $this->collectionName;
+    }
+
+    /**
+     * Set the collectionName
+     *
+     * @param string $collectionName
+     * @return Resource
+     */
+    public function setCollectionName($collectionName)
+    {
+        $this->collectionName = $collectionName;
+        return $this;
+    }
+
     /**
      * @return string
      */
@@ -111,23 +143,24 @@ public function setHydrator(HydratorInterface $hydrator)
     /**
      * Constructor
      *
-     * @param Http\Client $httpClient
+     * @param $curl
      */
-    public function __construct(Http\Client $httpClient)
+    public function __construct($curl)
     {
-        $this->httpClient = $httpClient;
-        $this->httpClient->setUri(self::ZOHO_API_ENDPOINT);
+        $this->curl = $curl;
     }
 
     /**
      * @return array
      */
     public function fetchAll()
     {
-        $this->httpClient->setMethod(Http\Request::METHOD_GET)
-                         ->setUri(self::ZOHO_API_ENDPOINT . $this->getPath());
-
-        return $this->httpClient->send();
+        curl_setopt($this->curl, CURLOPT_URL, self::ZOHO_API_ENDPOINT . $this->getPath());
+        $result = curl_exec($this->curl);
+        $result = json_decode($result);
+        curl_close($this->curl);
+        $collectioNName = $this->getCollectionName();
+        return $result->$collectioNName;
     }
 
     /**

src/Service/ResourceInterface.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: julien
+ * Date: 26/06/15
+ * Time: 10:06
+ */
+
+namespace Zoho\Subscriptions\Service;
+
+
+interface ResourceInterface
+{
+
+}