[WIP] v3.0.0 Overview Design (for brainstorming only, all inputs are welcomed)

lib/Account.php

@@ -1,42 +1,25 @@
 <?php
 namespace Omise;
 
-use Omise\Res\OmiseApiResource;
-
-class Account extends OmiseApiResource
+class Account extends \Omise\ApiResource
 {
-    const ENDPOINT = 'account';
+    const OBJECT_NAME = 'account';
 
     /**
-     * Retrieves an account.
-     *
-     * @param  string $publickey
-     * @param  string $secretkey
+     * Retrieves Omise account info.
      *
-     * @return OmiseAccount
+     * @return Omise\Account
      */
-    public static function retrieve($publickey = null, $secretkey = null)
+    public static function retrieve()
     {
-        return parent::g_retrieve(get_class(), self::getUrl(), $publickey, $secretkey);
+        return parent::resourceRetrieve();
     }
 
     /**
-     * (non-PHPdoc)
-     *
-     * @see OmiseApiResource::g_reload()
+     * @see Omise\ApiResource::resourceReload()
      */
     public function reload()
     {
-        parent::g_reload(self::getUrl());
-    }
-
-    /**
-     * @param  string $id
-     *
-     * @return string
-     */
-    private static function getUrl($id = '')
-    {
-        return \Omise\ApiRequestor::OMISE_API_URL . self::ENDPOINT . '/' . $id;
+        parent::resourceReload();
     }
 }

lib/Balance.php

@@ -1,42 +1,25 @@
 <?php
 namespace Omise;
 
-use Omise\Res\OmiseApiResource;
-
-class Balance extends OmiseApiResource
+class Balance extends \Omise\ApiResource
 {
-    const ENDPOINT = 'balance';
+    const OBJECT_NAME = 'balance';
 
     /**
-     * Retrieves a current balance in the account.
-     *
-     * @param  string $publickey
-     * @param  string $secretkey
+     * Retrieves a current balance in the given account.
      *
-     * @return OmiseBalance
+     * @return Omise\Balance
      */
-    public static function retrieve($publickey = null, $secretkey = null)
+    public static function retrieve()
     {
-        return parent::g_retrieve(get_class(), self::getUrl(), $publickey, $secretkey);
+        return parent::resourceRetrieve();
     }
 
     /**
-     * (non-PHPdoc)
-     *
-     * @see OmiseApiResource::g_reload()
+     * @see Omise\ApiResource::resourceReload()
      */
     public function reload()
     {
-        parent::g_reload(self::getUrl());
-    }
-
-    /**
-     * @param  string $id
-     *
-     * @return string
-     */
-    private static function getUrl($id = '')
-    {
-        return \Omise\ApiRequestor::OMISE_API_URL . self::ENDPOINT . '/' . $id;
+        parent::resourceReload();
     }
 }

lib/Capabilities.php

@@ -1,11 +1,11 @@
 <?php
 namespace Omise;
 
-use Omise\Res\OmiseApiResource;
+use Omise\ApiResource;
 
-class Capabilities extends OmiseApiResource
+class Capabilities extends ApiResource
 {
-    const ENDPOINT = 'capability';
+    const OBJECT_NAME = 'capability';
 
     /**
      * @var array  of the filterable keys.
@@ -14,9 +14,9 @@ class Capabilities extends OmiseApiResource
         'backend' => ['currency', 'type', 'chargeAmount']
     ];
 
-    protected function __construct($publickey = null, $secretkey = null)
+    public function __construct()
     {
-        parent::__construct($publickey, $secretkey);
+        parent::__construct();
         $this->setupFilterShortcuts();
     }
 
@@ -44,31 +44,26 @@ protected function setupFilterShortcuts()
     /**
      * Retrieves capabilities.
      *
-     * @param  string $publickey
-     * @param  string $secretkey
-     *
-     * @return OmiseCapabilities
+     * @return Omise\Capabilities
      */
-    public static function retrieve($publickey = null, $secretkey = null)
+    public static function retrieve()
     {
-        return parent::g_retrieve(get_class(), self::getUrl(), $publickey, $secretkey);
+        return parent::resourceRetrieve();
     }
 
     /**
-     * (non-PHPdoc)
-     *
-     * @see OmiseApiResource::g_reload()
+     * @see Omise\ApiResource::resourceReload()
      */
     public function reload()
     {
-        parent::g_reload(self::getUrl());
+        parent::resourceReload();
     }
 
     /**
      * Retrieves array of payment backends. Optionally pass in as many filter functions as you want
      * (muliple arguments, or a single array)
      *
-     * @param [func1,fun2,...] OR func1, func2,...
+     * @param  [func1,fun2,...] OR func1, func2,...
      *
      * @return array
      */
@@ -170,18 +165,8 @@ private static function argsToVariadic($argArray)
     /**
      * @return string
      */
-    private static function getUrl()
-    {
-        return \Omise\ApiRequestor::OMISE_API_URL . self::ENDPOINT;
-    }
-
-    /**
-     * Returns the public key.
-     *
-     * @return string
-     */
-    protected function getResourceKey()
+    protected function credential()
     {
-        return $this->_publickey;
+        return 'pkey_test_5fcnkn4378pmguq5zpy';
     }
 }

lib/Card.php

@@ -15,51 +15,41 @@ class Card extends OmiseApiResource
      *
      * @param array  $array
      * @param string $customerID
-     * @param string $publickey
-     * @param string $secretkey
      */
-    public function __construct($array, $customerID, $publickey = null, $secretkey = null)
+    public function __construct($array, $customerID)
     {
-        parent::__construct($publickey, $secretkey);
+        parent::__construct();
 
         $this->_customerID = $customerID;
         $this->refresh($array);
     }
 
     /**
-     * (non-PHPdoc)
-     *
-     * @see OmiseApiResource::g_reload()
+     * @see Omise\Res\OmiseApiResource::g_reload()
      */
     public function reload()
     {
         parent::g_reload($this->getUrl($this['id']));
     }
 
     /**
-     * (non-PHPdoc)
-     *
-     * @see OmiseApiResource::g_update()
+     * @see Omise\Res\OmiseApiResource::g_update()
      */
     public function update($params)
     {
         parent::g_update($this->getUrl($this['id']), $params);
     }
 
     /**
-     * (non-PHPdoc)
-     *
-     * @see OmiseApiResource::g_destroy()
+     * @see Omise\Res\OmiseApiResource::g_destroy()
      */
     public function destroy()
     {
         parent::g_destroy($this->getUrl($this['id']));
     }
 
     /**
-     * (non-PHPdoc)
-     *
-     * @see OmiseApiResource::isDestroyed()
+     * @see Omise\Res\OmiseApiResource::isDestroyed()
      */
     public function isDestroyed()
     {

lib/CardList.php

@@ -13,12 +13,10 @@ class CardList extends OmiseApiResource
     /**
      * @param array  $cards
      * @param string $customerID
-     * @param string $publickey
-     * @param string $secretkey
      */
-    public function __construct($cards, $customerID, $publickey = null, $secretkey = null)
+    public function __construct($cards, $customerID)
     {
-        parent::__construct($publickey, $secretkey);
+        parent::__construct();
         $this->_customerID = $customerID;
         $this->refresh($cards);
     }
@@ -28,13 +26,13 @@ public function __construct($cards, $customerID, $publickey = null, $secretkey =
      *
      * @param  string $id
      *
-     * @return OmiseCard
+     * @return Omise\Card
      */
     public function retrieve($id)
     {
         $result = $this->apiRequestor->get($this->getUrl($id), self::getResourceKey());
 
-        return new Card($result, $this->_customerID, $this->_publickey, $this->_secretkey);
+        return new Card($result, $this->_customerID);
     }