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

Fix PHP unit failing

Author: phuonghuynh

.editorconfig

@@ -0,0 +1,15 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# PHP PSR-2 Coding Standards
+# http://www.php-fig.org/psr/psr-2/
+
+root = true
+
+[*.php]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4

README.md

@@ -37,7 +37,7 @@ require_once("/path/to/Finix/Bootstrap.php");
 
 ```php
 require(__DIR__ . '/src/Finix/Settings.php');
-Finix\Settings::configure('http://b.papi.staging.finix.io', '$USERNAME', '$PASSWORD');
+Finix\Settings::configure('https://api-staging.finix.io/', '$USERNAME', '$PASSWORD');
 require(__DIR__ . '/src/Finix/Bootstrap.php');
 \Finix\Bootstrap::init();
 ```

bootstrap.php

@@ -1,17 +1,15 @@
 <?php
 
 require(__DIR__ . '/src/Finix/Settings.php');
-require(__DIR__ . '/tests/Finix/SampleData.php');
+require(__DIR__ . '/tests/Finix/Fixtures.php');
 require(__DIR__ . '/src/Finix/Bootstrap.php');
 
-use \Finix\Tests\SampleData;
+use \Finix\Tests\Fixtures;
 use \Finix\Settings;
 use \Finix\Bootstrap;
 
-Settings::configure(
-  SampleData::$apiUrl,
-  SampleData::$username,
-  SampleData::$password
-);
+Settings::configure([
+    "root_url" => Fixtures::$apiUrl
+]);
 
-Bootstrap::init();
+Bootstrap::init();

circle.yml

@@ -14,4 +14,5 @@ dependencies:
 test:
   override:
     - mkdir -p $CIRCLE_TEST_REPORTS/phpunit
-    - ./vendor/bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit.xml
+    - ./vendor/bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit.xml:
+        timeout: 1200

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "finix/processing-php",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A PHP HTTP Client conforming to the HAL hypermedia type for the Finix processing API",
   "license": "Apache2",
   "authors": [

src/Finix/Bootstrap.php

@@ -53,11 +53,13 @@ private static function _autoload($base, $classname)
      */
     private static function initializeResources()
     {
-        if (self::$initialized)
+        if (self::$initialized) {
             return;
+        }
 
         Resource::init();
 
+        Resources\User::init();
         Resources\Application::init();
         Resources\Identity::init();
         Resources\Processor::init();

src/Finix/Http/Auth/BasicAuthentication.php

@@ -3,6 +3,7 @@
 namespace Finix\Http\Auth;
 
 use Finix\Http;
+use Finix\Settings;
 use Finix\Http\AbstractClient;
 use GuzzleHttp\Message\RequestInterface;
 
@@ -86,7 +87,8 @@ private function isRequestAuthorized(RequestInterface $httpRequest)
      */
     private function getCredentials()
     {
-        $basic = base64_encode($this->user_id . ':' . $this->password);
+        $basic = base64_encode(Settings::$username . ':' . Settings::$password);
+//        $basic = base64_encode($this->user_id . ':' . $this->password);
         return $basic;
     }
 }

src/Finix/Resource.php

@@ -4,6 +4,7 @@
 use Finix\Http\Auth\BasicAuthentication;
 use Finix\Http\JsonBody;
 use Finix\Http\Request;
+use Finix\Resources\Verification;
 use Finix\Utils\ArrayProxy;
 use \stdClass;
 
@@ -15,7 +16,8 @@ abstract class Resource
     protected $state;
 
     protected static $href;
-    protected static $client;
+    protected $client;
+//    protected static $client;
     protected static $registry;
 
     /**
@@ -24,10 +26,10 @@ abstract class Resource
      */
     public static function getHrefSpec($resource = null)
     {
-        if(is_null($resource)){
+        if (is_null($resource)) {
             $resource = get_called_class();
         }
-        if(!is_string($resource)) {
+        if (!is_string($resource)) {
             $resource = get_class($resource);
         }
         return self::getRegistry()->getHrefSpecForResource($resource);
@@ -36,9 +38,9 @@ public static function getHrefSpec($resource = null)
     /**
      * @return Hal\Client
      */
-    public static function getClient()
+    public function getClient()
     {
-        return self::$client;
+        return $this->client;
     }
 
     /**
@@ -51,23 +53,33 @@ public static function getRegistry()
 
     public static function init()
     {
-        self::$client = new Hal\Client(
-            Settings::$url_root,
-            '/',
-            null,
-            new BasicAuthentication(Settings::$username, Settings::$password));
         self::$registry = new Registry();
     }
 
     public function __construct(array $state = null, array $links = null)
     {
+        $this->client = self::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))
-        {
+        if ($this->state->has_key($name)) {
             return $this->state[$name];
         }
 
@@ -92,8 +104,8 @@ public function __set($name, $value)
     public function __isset($name)
     {
         if (array_key_exists($name, $this->resource->getAllLinks()) ||
-            array_key_exists($name, $this->resource->getState()))
-        {
+            array_key_exists($name, $this->resource->getState())
+        ) {
             return true;
         }
 
@@ -111,11 +123,21 @@ public function __isset($name)
     public static function retrieve($id)
     {
         $uri = self::getHrefSpec()->collection_uri . '/' . $id;
-        $resource = self::getClient()->sendRequest(new Request($uri));
+        $resource = self::createClient()->sendRequest(new Request($uri));
         $class = get_called_class();
         return new $class($resource->getState(), $resource->getAllLinks());
     }
 
+    public function refresh() {
+        $request = new Request(
+            $this->resource->getLink("self")->getHref(),
+            'GET'
+        );
+        $resource = $this->getClient()->sendRequest($request);
+        $this->setResource($resource);
+        return $this;
+    }
+
     /**
      * @return \Finix\Resource
      * @throws Hal\Exception\HalClientErrorException
@@ -128,12 +150,11 @@ public static function retrieve($id)
     public function save()
     {
         if (empty($this->state["tags"])) {
-          $this->state["tags"] = new stdClass();
+            $this->state["tags"] = new stdClass();
         }
 
         $payload = new JsonBody(iterator_to_array($this->state));
-        if($this->isUpdate())
-        {
+        if ($this->isUpdate()) {
             $request = new Request(
                 $this->resource->getLink("self")->getHref(),
                 'PUT',
@@ -199,5 +220,9 @@ private function setResource($resource)
         $this->state = new ArrayProxy($resource->getState());
     }
 
-
-}
+    public function verifyOn(Verification $verification)
+    {
+        $verifyLink = $this->resource->getLink("verifications")->getHref();
+        return $verification->create($verifyLink);
+    }
+}

src/Finix/Resources/Application.php

@@ -11,4 +11,13 @@ public static function init()
         self::getRegistry()->add(get_called_class(), new HrefSpec('applications', 'id', '/'));
     }
 
-}
+    public function createPartnerUser(User $user)
+    {
+        return $user->create($this->resource->getLink("users")->getHref());
+    }
+
+    public function createProcessor(Processor $processor)
+    {
+        return $processor->create($this->resource->getLink("processors")->getHref());
+    }
+}

src/Finix/Resources/Authorization.php

@@ -11,4 +11,16 @@ public static function init()
         self::getRegistry()->add(get_called_class(), new HrefSpec('authorizations', 'id', '/'));
     }
 
-}
+    public function capture($amount, $fee = 0)
+    {
+        $this->state["capture_amount"] = $amount;
+        $this->state["fee"] = $fee;
+        return $this->save();
+    }
+
+    public function void($voidMe)
+    {
+        $this->state["void_me"] = $voidMe;
+        return $this->save();
+    }
+}