Follow PSR2 standards

Author: lsolesen

.scrutinizer.yml

@@ -12,4 +12,4 @@ build:
 checks:
   php:
     custom_coding_standard:
-      ruleset_path: 'ruleset.xml'
+      ruleset_path: 'phpcs.xml'

.travis.yml

@@ -22,7 +22,7 @@ before_script:
 
 script:
   - phpunit --coverage-clover build/logs/clover.xml ./Tests
-  - vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --standard=ruleset.xml QuickPay
+  - vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --standard=phpcs.xml QuickPay
 
 after_script:
   - php vendor/bin/coveralls -v

QuickPay/API/Client.php

@@ -3,7 +3,7 @@
 
 /**
  * @class       QuickPay_Client
- * @since       1.0.0
+ * @since       0.1.0
  * @package     QuickPay
  * @category    Class
  * @author      Patrick Tolvstein, Perfect Solution ApS

QuickPay/API/Constants.php

@@ -3,7 +3,7 @@
 
 /**
  * @class       QuickPay_Constants
- * @since       1.0.0
+ * @since       0.1.0
  * @package     QuickPay
  * @category    Class
  * @author      Patrick Tolvstein, Perfect Solution ApS

QuickPay/API/Exception.php

@@ -4,7 +4,7 @@
 /**
  * @class       QuickPay_Exception
  * @extends     Exception
- * @since       1.0.0
+ * @since       0.1.0
  * @package     QuickPay
  * @category    Class
  * @author      Patrick Tolvstein, Perfect Solution ApS

QuickPay/API/Request.php

@@ -5,12 +5,12 @@
 use QuickPay\API\Response;
 
 /**
- * @class         QuickPay_Request
- * @since        1.0.0
- * @package        QuickPay
- * @category    Class
- * @author         Patrick Tolvstein, Perfect Solution ApS
- * @docs        http://tech.quickpay.net/api/
+ * @class      QuickPay_Request
+ * @since      0.1.0
+ * @package    QuickPay
+ * @category   Class
+ * @author     Patrick Tolvstein, Perfect Solution ApS
+ * @docs       http://tech.quickpay.net/api/
  */
 class Request
 {
@@ -55,7 +55,7 @@ public function get($path, $query = array())
         }
 
         // Set the request params
-        $this->set_url($path);
+        $this->setUrl($path);
 
         // Start the request and return the response
         return $this->execute('GET');
@@ -72,7 +72,7 @@ public function get($path, $query = array())
     public function post($path, $form = array())
     {
         // Set the request params
-        $this->set_url($path);
+        $this->setUrl($path);
 
         // Start the request and return the response
         return $this->execute('POST', $form);
@@ -89,7 +89,7 @@ public function post($path, $form = array())
     public function put($path, $form = array())
     {
         // Set the request params
-        $this->set_url($path);
+        $this->setUrl($path);
 
         // Start the request and return the response
         return $this->execute('PUT', $form);
@@ -106,7 +106,7 @@ public function put($path, $form = array())
     public function patch($path, $form = array())
     {
         // Set the request params
-        $this->set_url($path);
+        $this->setUrl($path);
 
         // Start the request and return the response
         return $this->execute('PATCH', $form);
@@ -123,21 +123,21 @@ public function patch($path, $form = array())
     public function delete($path, $form = array())
     {
         // Set the request params
-        $this->set_url($path);
+        $this->setUrl($path);
 
         // Start the request and return the response
         return $this->execute('DELETE', $form);
     }
 
     /**
-     * set_url function.
+     * setUrl function.
      *
      * Takes an API request string and appends it to the API url
      *
      * @access protected
      * @return void
      */
-    protected function set_url($params)
+    protected function setUrl($params)
     {
         curl_setopt($this->client->ch, CURLOPT_URL, Constants::API_URL . trim($params, '/'));
     }
@@ -171,7 +171,7 @@ protected function execute($request_type, $form = array())
         $response_data = curl_exec($this->client->ch);
 
         if (curl_errno($this->client->ch) !== 0) {
-            //An error occurred
+            // An error occurred
             fclose($fh_header);
             throw new Exception(curl_error($this->client->ch), curl_errno($this->client->ch));
         }

QuickPay/API/Response.php

@@ -2,12 +2,12 @@
 namespace QuickPay\API;
 
 /**
- * @class         QuickPay_Response
- * @since        1.0.0
- * @package        QuickPay
- * @category    Class
- * @author         Patrick Tolvstein, Perfect Solution ApS
- * @docs        http://tech.quickpay.net/api/
+ * @class      QuickPay_Response
+ * @since      0.1.0
+ * @package    QuickPay
+ * @category   Class
+ * @author     Patrick Tolvstein, Perfect Solution ApS
+ * @docs       http://tech.quickpay.net/api/
  */
 class Response
 {
@@ -58,15 +58,16 @@ public function __construct($status_code, $sent_headers, $received_headers, $res
     }
 
     /**
-     * as_raw
+     * asRaw
      *
      * Returns the HTTP status code, headers and response body.
      * Usage: list($status_code, $headers, $response_body) = $response->as_raw().
      *
-     * @param  boolan $keep_authorization_value Normally the value of the Authorization: header is masked. True keeps the sent value.
-     * @return array            [integer, string[], string]
+     * @param  boolan $keep_authorization_value Normally the value of the
+     *                                          Authorization: header is masked. True keeps the sent value.
+     * @return array  [integer, string[], string]
      */
-    public function as_raw($keep_authorization_value = false)
+    public function asRaw($keep_authorization_value = false)
     {
         // To avoid unintentional logging of credentials the default is to mask the value of the Authorization: header
         if ($keep_authorization_value) {
@@ -93,13 +94,13 @@ public function as_raw($keep_authorization_value = false)
     }
 
     /**
-     * as_array
+     * asArray
      *
      * Returns the response body as an array
      *
      * @return array
      */
-    public function as_array()
+    public function asArray()
     {
         if ($response = json_decode($this->response_data, true)) {
             return $response;
@@ -109,13 +110,13 @@ public function as_array()
     }
 
     /**
-     * as_object
+     * asObject
      *
      * Returns the response body as an array
      *
      * @return \stdClass
      */
-    public function as_object()
+    public function asObject()
     {
         if ($response = json_decode($this->response_data)) {
             return $response;
@@ -125,25 +126,25 @@ public function as_object()
     }
 
     /**
-     * http_status
+     * httpStatus
      *
      * Returns the http_status code
      *
      * @return int
      */
-    public function http_status()
+    public function httpStatus()
     {
         return $this->status_code;
     }
 
     /**
-     * is_success
+     * isSuccess
      *
      * Checks if the http status code indicates a succesful or an error response.
      *
      * @return boolean
      */
-    public function is_success()
+    public function isSuccess()
     {
         if ($this->status_code > 299) {
             return false;

QuickPay/QuickPay.php

@@ -1,12 +1,6 @@
 <?php
 namespace QuickPay;
 
-require_once 'API/Constants.php';
-require_once 'API/Exception.php';
-require_once 'API/Client.php';
-require_once 'API/Request.php';
-require_once 'API/Response.php';
-
 use QuickPay\API\Client;
 use QuickPay\API\Request;
 
@@ -19,7 +13,6 @@ class QuickPay
      **/
     public $request;
 
-
     /**
     * __construct function.
     *

README.md

@@ -102,27 +102,27 @@ Getting the `HTTP status code`:
 
 ```php5
 $response = $client->request->get('/payments');
-$status = $response->http_status();
+$status = $response->httpStatus();
 
 if ($status == 200) {
     // Successful request
 }
 ```
 
-The returned response object supports 3 different ways of returning the response body, `as_raw()`, `as_object`, `as_array()`.
+The returned response object supports 3 different ways of returning the response body, `asRaw()`, `asObject`, `asArray()`.
 
 ```php5
 // Get the HTTP status code, headers and raw response body.
-list($status_code, $headers, $response_body) = $client->request->get('/payments')->as_raw();
+list($status_code, $headers, $response_body) = $client->request->get('/payments')->asRaw();
 
 // Get the response body as an object
-$response_body = $client->request->get('/payments')->as_object();
+$response_body = $client->request->get('/payments')->asObject();
 
 // Get the response body as an array
-$response_body = $client->request->get('/payments')->as_array();
+$response_body = $client->request->get('/payments')->asArray();
 
 // Example usage
-$payments = $client->request->get('/payments')->as_array();
+$payments = $client->request->get('/payments')->asArray();
 
 foreach($payments as $payment) {
     //...

Tests/api/RequestTest.php

@@ -30,34 +30,34 @@ public function testBadAuthentication()
 
         $response = $request->get('/ping');
 
-        $this->assertEquals(401, $response->http_status());
+        $this->assertEquals(401, $response->httpStatus());
     }
 
     public function testSuccessfulGetResponse()
     {
         $pingResponse = $this->request->get('/ping');
 
-        $this->assertTrue($pingResponse->is_success());
+        $this->assertTrue($pingResponse->isSuccess());
     }
 
     public function testFailedGetResponse()
     {
         $pingResponse = $this->request->get('/foobar');
 
-        $this->assertFalse($pingResponse->is_success());
+        $this->assertFalse($pingResponse->isSuccess());
     }
 
     public function testSuccesfulPostResponse()
     {
         $pingResponse = $this->request->post('/ping');
 
-        $this->assertTrue($pingResponse->is_success());
+        $this->assertTrue($pingResponse->isSuccess());
     }
 
     public function testFailedPostResponse()
     {
         $pingResponse = $this->request->post('/foobar');
 
-        $this->assertFalse($pingResponse->is_success());
+        $this->assertFalse($pingResponse->isSuccess());
     }
 }

Tests/api/ResponseTest.php

@@ -20,7 +20,7 @@ public function testSuccessResponseHTTPCodes($httpCode, $expectedResult)
     {
         $response = new Response($httpCode, '', '', '');
 
-        $result = $response->is_success();
+        $result = $response->isSuccess();
 
         $this->assertEquals($result, $expectedResult);
     }
@@ -48,7 +48,7 @@ public function testReturnOfHTTPStatusCodes($httpCode, $expectedCode)
     {
         $response = new Response($httpCode, '', '', '');
 
-        $statusCode = $response->http_status();
+        $statusCode = $response->httpStatus();
 
         $this->assertEquals($statusCode, $expectedCode);
     }
@@ -66,7 +66,7 @@ public function testReturnOfResponseDataAsArray()
     {
         $response = new Response(200, '', '', $this->responseTestData);
 
-        $responseArray = $response->as_array();
+        $responseArray = $response->asArray();
 
         $this->assertTrue(is_array($responseArray));
     }
@@ -75,7 +75,7 @@ public function testReturnOfEmptyResponseDataAsArray()
     {
         $response = new Response(200, '', '', '');
 
-        $responseArray = $response->as_array();
+        $responseArray = $response->asArray();
 
         $this->assertTrue(is_array($responseArray));
     }
@@ -84,7 +84,7 @@ public function testReturnOfResponseDataAsObject()
     {
         $response = new Response(200, '', '', $this->responseTestData);
 
-        $responseObject = $response->as_object();
+        $responseObject = $response->asObject();
 
         $this->assertTrue(is_object($responseObject));
     }
@@ -93,7 +93,7 @@ public function testReturnOfEmptyResponseDataAsObject()
     {
         $response = new Response(200, '', '', '');
 
-        $responseObject = $response->as_object();
+        $responseObject = $response->asObject();
 
         $this->assertTrue(is_object($responseObject));
     }
@@ -102,7 +102,7 @@ public function testReturnOfResponseDataAsRaw()
     {
         $response = new Response(200, '', '', $this->responseTestData);
 
-        list($statusCode, $headers, $responseRaw) = $response->as_raw();
+        list($statusCode, $headers, $responseRaw) = $response->asRaw();
 
         $this->assertTrue(is_int($statusCode));
         $this->assertTrue(is_array($headers));