Merge pull request #23 from phuonghuynh/feature/refactor-and-fix

Fix Dispute test

Author: phuonghuynh

src/Finix/Bootstrap.php

@@ -2,6 +2,7 @@
 
 namespace Finix;
 use Finix\Resources;
+use Finix\Http\Auth\BasicAuthentication;
 
 /**
  * Bootstrapper for Finix does autoloading and resource initialization.
@@ -76,4 +77,19 @@ private static function initializeResources()
 
         self::$initialized = true;
     }
-}
+
+    public static function createClient()
+    {
+        if (Settings::$username == null || Settings::$password == null) {
+            $client = new Hal\Client(Settings::$url_root, '/');
+        }
+        else {
+            $client = new Hal\Client(
+                Settings::$url_root,
+                '/',
+                null,
+                new BasicAuthentication(Settings::$username, Settings::$password));
+        }
+        return $client;
+    }
+}

src/Finix/Pagination.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Finix;
+
+
+class Pagination extends Resource
+{
+
+    public function __construct(Hal\Resource $halResource, $class)
+    {
+        parent::__construct($halResource->getState(), $halResource->getAllLinks());
+        $resources = $halResource->getAllEmbeddedResources();
+        $resources = reset($resources);
+        $items = array();
+        foreach ($resources as $name => $resource) {
+            array_push($items, new $class($resource->getState(), $resource->getAllLinks()));
+        }
+        $this->state->items = $items;
+    }
+}

src/Finix/Resource.php

@@ -58,25 +58,10 @@ public static function init()
 
     public function __construct(array $state = null, array $links = null)
     {
-        $this->client = self::createClient();
+        $this->client = Bootstrap::createClient();
         $this->setResource(new Hal\Resource($state, $links));
     }
 
-    private static function createClient()
-    {
-        if (Settings::$username == null || Settings::$password == null) {
-            $client = new Hal\Client(Settings::$url_root, '/');
-        }
-        else {
-            $client = new Hal\Client(
-                Settings::$url_root,
-                '/',
-                null,
-                new BasicAuthentication(Settings::$username, Settings::$password));
-        }
-        return $client;
-    }
-
     public function __get($name)
     {
         if ($this->state->has_key($name)) {
@@ -123,12 +108,19 @@ public function __isset($name)
     public static function retrieve($id)
     {
         $uri = self::getHrefSpec()->collection_uri . '/' . $id;
-        $resource = self::createClient()->sendRequest(new Request($uri));
+        $resource = Bootstrap::createClient()->sendRequest(new Request($uri));
         $class = get_called_class();
         return new $class($resource->getState(), $resource->getAllLinks());
     }
 
-    public function refresh() {
+    public static function getPagination($href)
+    {
+        $resource = Bootstrap::createClient()->sendRequest(new Request($href));
+        return new Pagination($resource, get_called_class());
+    }
+
+    public function refresh()
+    {
         $request = new Request(
             $this->resource->getLink("self")->getHref(),
             'GET'
@@ -204,11 +196,12 @@ private function isUpdate()
 
 
     /**
+     * @param string $rel
      * @return string
      */
-    public function getHref()
+    public function getHref($rel = "self")
     {
-        return $this->resource->getLink("self")->getHref();
+        return $this->resource->getLink($rel)->getHref();
     }
 
     /**

tests/Finix/ScenariosTest.php

@@ -3,6 +3,7 @@
 
 
 use Finix\Resources\Dispute;
+use Finix\Resources\Transfer;
 use Finix\Resources\Verification;
 use Finix\Settings;
 
@@ -26,12 +27,14 @@ class ScenariosTest extends \PHPUnit_Framework_TestCase
     private $pushFundTransfer2;
     private $pushFundTransfer1;
     private $settlement;
+    private $receiptImage;
 
     protected function setUp()
     {
-        Settings::configure(["username" => null, "password" => null]);
+        $this->receiptImage = realpath("../../data/receipt.jpg");
 
         date_default_timezone_set("UTC");
+        Settings::configure(["username" => null, "password" => null]);
 
         $this->user = Fixtures::createAdminUser();
 
@@ -124,6 +127,12 @@ public function testSettlement()
         });
 
         $this->settlement = Fixtures::createSettlement($this->identity);
-        var_dump($this->settlement);
+    }
+
+    public function testDispute() {
+        $disputePage = Dispute::getPagination($this->pushFundTransfer->getHref("disputes"));
+        $dispute = $disputePage->items[0];
+        $file = $dispute->uploadEvidence($this->receiptImage);
+        $this->assertEquals($file->dispute, $dispute->id);
     }
 }