Merge pull request #97 from Adyen/develop

Merge from develop for new 1.6.0 release
Adyen · Jan 25, 2019 · b644c34 · b644c34
2 parents 8272f52 + 8bd4f09
commit b644c34
Show file tree

Hide file tree

Showing 92 changed files with 2,356 additions and 557 deletions.
diff --git a/src/Adyen/AdyenException.php b/src/Adyen/AdyenException.php
@@ -9,12 +9,12 @@ class AdyenException extends Exception
 	/**
 	 * @var null
 	 */
-	protected $_status;
+	protected $status;
 
 	/**
 	 * @var null
 	 */
-	protected $_errorType;
+	protected $errorType;
 
 	/**
 	 * AdyenException constructor.
@@ -27,8 +27,8 @@ class AdyenException extends Exception
 	 */
 	public function __construct($message = "", $code = 0, Exception $previous = null, $status = null, $errorType = null)
 	{
-		$this->_status = $status;
-		$this->_errorType = $errorType;
+		$this->status = $status;
+		$this->errorType = $errorType;
 		parent::__construct($message, (int)$code, $previous);
 	}
 
@@ -39,14 +39,14 @@ public function __construct($message = "", $code = 0, Exception $previous = null
 	 */
 	public function getStatus()
 	{
-		return $this->_status;
+		return $this->status;
 	}
 
 	/**
 	 * Get Adyen Error type
 	 */
 	public function getErrorType()
 	{
-		return $this->_errorType;
+		return $this->errorType;
 	}
 }
diff --git a/src/Adyen/ApiKeyAuthenticatedService.php b/src/Adyen/ApiKeyAuthenticatedService.php
@@ -7,5 +7,5 @@ class ApiKeyAuthenticatedService extends Service
 	/**
 	 * @var bool
 	 */
-	protected $_requiresApiKey = true;
+	protected $requiresApiKey = true;
 }