Zwartpet / php-certificate-toolbox

src/LEConnector.php

Indentation +127 added lines, -127 removed lines

@@ -46,7 +46,7 @@ 
 
 	public $keyChange;
 	public $newAccount;
-    public $newNonce;
+	public $newNonce;
 	public $newOrder;
 	public $revokeCert;
 
@@ -55,13 +55,13 @@ 
 
 	private $log;
 
-    /**
-     * Initiates the LetsEncrypt Connector class.
-     *
-     * @param int 		$log			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
-     * @param string	$baseURL 		The LetsEncrypt server URL to make requests to.
-     * @param array		$accountKeys 	Array containing location of account keys files.
-     */
+	/**
+	 * Initiates the LetsEncrypt Connector class.
+	 *
+	 * @param int 		$log			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
+	 * @param string	$baseURL 		The LetsEncrypt server URL to make requests to.
+	 * @param array		$accountKeys 	Array containing location of account keys files.
+	 */
 	public function __construct($log, $baseURL, $accountKeys)
 	{
 		$this->baseURL = $baseURL;
@@ -71,9 +71,9 @@ 
 		$this->getNewNonce();
 	}
 
-    /**
-     * Requests the LetsEncrypt Directory and stores the necessary URLs in this LetsEncrypt Connector instance.
-     */
+	/**
+	 * Requests the LetsEncrypt Directory and stores the necessary URLs in this LetsEncrypt Connector instance.
+	 */
 	private function getLEDirectory()
 	{
 		$req = $this->get('/directory');
@@ -84,42 +84,42 @@ 
 		$this->revokeCert = $req['body']['revokeCert'];
 	}
 
-    /**
-     * Requests a new nonce from the LetsEncrypt server and stores it in this LetsEncrypt Connector instance.
-     */
+	/**
+	 * Requests a new nonce from the LetsEncrypt server and stores it in this LetsEncrypt Connector instance.
+	 */
 	private function getNewNonce()
 	{
 		if($this->head($this->newNonce)['status'] !== 200) throw LEConnectorException::NoNewNonceException();
 	}
 
-    /**
-     * Makes a Curl request.
-     *
-     * @param string	$method	The HTTP method to use. Accepting GET, POST and HEAD requests.
-     * @param string 	$URL 	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
-     * @param object 	$data  	The body to attach to a POST request. Expected as a JSON encoded string.
-     *
-     * @return array 	Returns an array with the keys 'request', 'header', 'status' and 'body'.
-     */
+	/**
+	 * Makes a Curl request.
+	 *
+	 * @param string	$method	The HTTP method to use. Accepting GET, POST and HEAD requests.
+	 * @param string 	$URL 	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
+	 * @param object 	$data  	The body to attach to a POST request. Expected as a JSON encoded string.
+	 *
+	 * @return array 	Returns an array with the keys 'request', 'header', 'status' and 'body'.
+	 */
 	private function request($method, $URL, $data = null)
 	{
 		if($this->accountDeactivated) throw LEConnectorException::AccountDeactivatedException();
 
 		$headers = array('Accept: application/json', 'Content-Type: application/jose+json');
 		$requestURL = preg_match('~^http~', $URL) ? $URL : $this->baseURL . $URL;
-        $handle = curl_init();
-        curl_setopt($handle, CURLOPT_URL, $requestURL);
-        curl_setopt($handle, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($handle, CURLOPT_HEADER, true);
-
-        switch ($method) {
-            case 'GET':
-                break;
-            case 'POST':
-                curl_setopt($handle, CURLOPT_POST, true);
-                curl_setopt($handle, CURLOPT_POSTFIELDS, $data);
-                break;
+		$handle = curl_init();
+		curl_setopt($handle, CURLOPT_URL, $requestURL);
+		curl_setopt($handle, CURLOPT_HTTPHEADER, $headers);
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($handle, CURLOPT_HEADER, true);
+
+		switch ($method) {
+			case 'GET':
+				break;
+			case 'POST':
+				curl_setopt($handle, CURLOPT_POST, true);
+				curl_setopt($handle, CURLOPT_POSTFIELDS, $data);
+				break;
 			case 'HEAD':
 				curl_setopt($handle, CURLOPT_CUSTOMREQUEST, 'HEAD');
 				curl_setopt($handle, CURLOPT_NOBODY, true);
@@ -127,25 +127,25 @@ 
 			default:
 				throw LEConnectorException::MethodNotSupportedException($method);
 				break;
-        }
-        $response = curl_exec($handle);
+		}
+		$response = curl_exec($handle);
 
-        if(curl_errno($handle)) {
-            throw LEConnectorException::CurlErrorException(curl_error($handle));
-        }
+		if(curl_errno($handle)) {
+			throw LEConnectorException::CurlErrorException(curl_error($handle));
+		}
 
-        $headerSize = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
-        $statusCode = curl_getinfo($handle, CURLINFO_HTTP_CODE);
+		$headerSize = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
+		$statusCode = curl_getinfo($handle, CURLINFO_HTTP_CODE);
 
-        $header = substr($response, 0, $headerSize);
-        $body = substr($response, $headerSize);
+		$header = substr($response, 0, $headerSize);
+		$body = substr($response, $headerSize);
 		$jsonbody = json_decode($body, true);
 		$jsonresponse = array(
-            'request' => $method . ' ' . $requestURL,
-            'header' => $header,
-            'status' => $statusCode,
-            'body' => $jsonbody === null ? $body : $jsonbody,
-        );
+			'request' => $method . ' ' . $requestURL,
+			'header' => $header,
+			'status' => $statusCode,
+			'body' => $jsonbody === null ? $body : $jsonbody,
+		);
 		if($this->log instanceof \Psr\Log\LoggerInterface) 
 		{
 			$this->log->debug($method . ' response received', $jsonresponse);
@@ -167,122 +167,122 @@ 
 			throw LEConnectorException::InvalidResponseException($jsonresponse);
 		}
 
-        return $jsonresponse;
+		return $jsonresponse;
 	}
 
-    /**
-     * Makes a GET request.
-     *
-     * @param string	$url 	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
-     *
-     * @return array 	Returns an array with the keys 'request', 'header', 'status' and 'body'.
-     */
+	/**
+	 * Makes a GET request.
+	 *
+	 * @param string	$url 	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
+	 *
+	 * @return array 	Returns an array with the keys 'request', 'header', 'status' and 'body'.
+	 */
 	public function get($url)
 	{
 		return $this->request('GET', $url);
 	}
 
 	/**
-     * Makes a POST request.
-     *
-     * @param string 	$url	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
+	 * Makes a POST request.
+	 *
+	 * @param string 	$url	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
 	 * @param object 	$data	The body to attach to a POST request. Expected as a json string.
-     *
-     * @return array 	Returns an array with the keys 'request', 'header', 'status' and 'body'.
-     */
+	 *
+	 * @return array 	Returns an array with the keys 'request', 'header', 'status' and 'body'.
+	 */
 	public function post($url, $data = null)
 	{
 		return $this->request('POST', $url, $data);
 	}
 
 	/**
-     * Makes a HEAD request.
-     *
-     * @param string 	$url	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
-     *
-     * @return array	Returns an array with the keys 'request', 'header', 'status' and 'body'.
-     */
+	 * Makes a HEAD request.
+	 *
+	 * @param string 	$url	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
+	 *
+	 * @return array	Returns an array with the keys 'request', 'header', 'status' and 'body'.
+	 */
 	public function head($url)
 	{
 		return $this->request('HEAD', $url);
 	}
 
-    /**
-     * Generates a JSON Web Key signature to attach to the request.
-     *
-     * @param array 	$payload		The payload to add to the signature.
-     * @param string	$url 			The URL to use in the signature.
-     * @param string 	$privateKeyFile The private key to sign the request with. Defaults to 'private.pem'. Defaults to accountKeys[private_key].
-     *
-     * @return string	Returns a JSON encoded string containing the signature.
-     */
+	/**
+	 * Generates a JSON Web Key signature to attach to the request.
+	 *
+	 * @param array 	$payload		The payload to add to the signature.
+	 * @param string	$url 			The URL to use in the signature.
+	 * @param string 	$privateKeyFile The private key to sign the request with. Defaults to 'private.pem'. Defaults to accountKeys[private_key].
+	 *
+	 * @return string	Returns a JSON encoded string containing the signature.
+	 */
 	public function signRequestJWK($payload, $url, $privateKeyFile = '')
-    {
+	{
 		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
 		$privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
-        $details = openssl_pkey_get_details($privateKey);
-
-        $protected = array(
-            "alg" => "RS256",
-            "jwk" => array(
-                "kty" => "RSA",
-                "n" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["n"]),
-                "e" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["e"]),
-            ),
+		$details = openssl_pkey_get_details($privateKey);
+
+		$protected = array(
+			"alg" => "RS256",
+			"jwk" => array(
+				"kty" => "RSA",
+				"n" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["n"]),
+				"e" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["e"]),
+			),
 			"nonce" => $this->nonce,
 			"url" => $url
-        );
+		);
 
-        $payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
-        $protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
+		$payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
+		$protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
-        $signed64 = LEFunctions::Base64UrlSafeEncode($signed);
+		openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+		$signed64 = LEFunctions::Base64UrlSafeEncode($signed);
 
-        $data = array(
-            'protected' => $protected64,
-            'payload' => $payload64,
-            'signature' => $signed64
-        );
+		$data = array(
+			'protected' => $protected64,
+			'payload' => $payload64,
+			'signature' => $signed64
+		);
 
-        return json_encode($data);
-    }
+		return json_encode($data);
+	}
 
 	/**
-     * Generates a Key ID signature to attach to the request.
-     *
-     * @param array 	$payload		The payload to add to the signature.
+	 * Generates a Key ID signature to attach to the request.
+	 *
+	 * @param array 	$payload		The payload to add to the signature.
 	 * @param string	$kid			The Key ID to use in the signature.
-     * @param string	$url 			The URL to use in the signature.
-     * @param string 	$privateKeyFile The private key to sign the request with. Defaults to 'private.pem'. Defaults to accountKeys[private_key].
-     *
-     * @return string	Returns a JSON encoded string containing the signature.
-     */
+	 * @param string	$url 			The URL to use in the signature.
+	 * @param string 	$privateKeyFile The private key to sign the request with. Defaults to 'private.pem'. Defaults to accountKeys[private_key].
+	 *
+	 * @return string	Returns a JSON encoded string containing the signature.
+	 */
 	public function signRequestKid($payload, $kid, $url, $privateKeyFile = '')
-    {
+	{
 		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
-        $privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
-        $details = openssl_pkey_get_details($privateKey);
+		$privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
+		$details = openssl_pkey_get_details($privateKey);
 
-        $protected = array(
-            "alg" => "RS256",
-            "kid" => $kid,
+		$protected = array(
+			"alg" => "RS256",
+			"kid" => $kid,
 			"nonce" => $this->nonce,
 			"url" => $url
-        );
+		);
 
-        $payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
-        $protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
+		$payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
+		$protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
-        $signed64 = LEFunctions::Base64UrlSafeEncode($signed);
+		openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+		$signed64 = LEFunctions::Base64UrlSafeEncode($signed);
 
-        $data = array(
-            'protected' => $protected64,
-            'payload' => $payload64,
-            'signature' => $signed64
-        );
+		$data = array(
+			'protected' => $protected64,
+			'payload' => $payload64,
+			'signature' => $signed64
+		);
 
-        return json_encode($data);
-    }
+		return json_encode($data);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -89,7 +89,7 @@ 
      */
 	private function getNewNonce()
 	{
-		if($this->head($this->newNonce)['status'] !== 200) throw LEConnectorException::NoNewNonceException();
+		if ($this->head($this->newNonce)['status'] !== 200) throw LEConnectorException::NoNewNonceException();
 	}
 
     /**
@@ -103,7 +103,7 @@ 
      */
 	private function request($method, $URL, $data = null)
 	{
-		if($this->accountDeactivated) throw LEConnectorException::AccountDeactivatedException();
+		if ($this->accountDeactivated) throw LEConnectorException::AccountDeactivatedException();
 
 		$headers = array('Accept: application/json', 'Content-Type: application/jose+json');
 		$requestURL = preg_match('~^http~', $URL) ? $URL : $this->baseURL . $URL;
@@ -130,7 +130,7 @@ 
         }
         $response = curl_exec($handle);
 
-        if(curl_errno($handle)) {
+        if (curl_errno($handle)) {
             throw LEConnectorException::CurlErrorException(curl_error($handle));
         }
 
@@ -146,22 +146,22 @@ 
             'status' => $statusCode,
             'body' => $jsonbody === null ? $body : $jsonbody,
         );
-		if($this->log instanceof \Psr\Log\LoggerInterface) 
+		if ($this->log instanceof \Psr\Log\LoggerInterface) 
 		{
 			$this->log->debug($method . ' response received', $jsonresponse);
 		}
-		elseif($this->log >= LEClient::LOG_DEBUG) LEFunctions::log($jsonresponse);
+		elseif ($this->log >= LEClient::LOG_DEBUG) LEFunctions::log($jsonresponse);
 		
-		if(preg_match('~Replay\-Nonce: (\S+)~i', $header, $matches))
+		if (preg_match('~Replay\-Nonce: (\S+)~i', $header, $matches))
 		{
 			$this->nonce = trim($matches[1]);
 		}
 		else
 		{
-			if($method == 'POST') $this->getNewNonce(); // Not expecting a new nonce with GET and HEAD requests.
+			if ($method == 'POST') $this->getNewNonce(); // Not expecting a new nonce with GET and HEAD requests.
 		}
 
-		if((($method == 'POST' OR $method == 'GET') AND $statusCode !== 200 AND $statusCode !== 201) OR
+		if ((($method == 'POST' OR $method == 'GET') AND $statusCode !== 200 AND $statusCode !== 201) OR
 			($method == 'HEAD' AND $statusCode !== 200))
 		{
 			throw LEConnectorException::InvalidResponseException($jsonresponse);
@@ -218,7 +218,7 @@ 
      */
 	public function signRequestJWK($payload, $url, $privateKeyFile = '')
     {
-		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
+		if ($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
 		$privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
         $details = openssl_pkey_get_details($privateKey);
 
@@ -236,7 +236,7 @@ 
         $payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
         $protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+        openssl_sign($protected64 . '.' . $payload64, $signed, $privateKey, "SHA256");
         $signed64 = LEFunctions::Base64UrlSafeEncode($signed);
 
         $data = array(
@@ -260,7 +260,7 @@ 
      */
 	public function signRequestKid($payload, $kid, $url, $privateKeyFile = '')
     {
-		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
+		if ($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
         $privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
         $details = openssl_pkey_get_details($privateKey);
 
@@ -274,7 +274,7 @@ 
         $payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
         $protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+        openssl_sign($protected64 . '.' . $payload64, $signed, $privateKey, "SHA256");
         $signed64 = LEFunctions::Base64UrlSafeEncode($signed);
 
         $data = array(

Braces +19 added lines, -8 removed lines

@@ -89,7 +89,9 @@ 
      */
 	private function getNewNonce()
 	{
-		if($this->head($this->newNonce)['status'] !== 200) throw LEConnectorException::NoNewNonceException();
+		if($this->head($this->newNonce)['status'] !== 200) {
+			throw LEConnectorException::NoNewNonceException();
+		}
 	}
 
     /**
@@ -103,7 +105,9 @@ 
      */
 	private function request($method, $URL, $data = null)
 	{
-		if($this->accountDeactivated) throw LEConnectorException::AccountDeactivatedException();
+		if($this->accountDeactivated) {
+			throw LEConnectorException::AccountDeactivatedException();
+		}
 
 		$headers = array('Accept: application/json', 'Content-Type: application/jose+json');
 		$requestURL = preg_match('~^http~', $URL) ? $URL : $this->baseURL . $URL;
@@ -149,16 +153,19 @@ 
 		if($this->log instanceof \Psr\Log\LoggerInterface) 
 		{
 			$this->log->debug($method . ' response received', $jsonresponse);
+		} elseif($this->log >= LEClient::LOG_DEBUG) {
+			LEFunctions::log($jsonresponse);
 		}
-		elseif($this->log >= LEClient::LOG_DEBUG) LEFunctions::log($jsonresponse);
 		
 		if(preg_match('~Replay\-Nonce: (\S+)~i', $header, $matches))
 		{
 			$this->nonce = trim($matches[1]);
-		}
-		else
+		} else
 		{
-			if($method == 'POST') $this->getNewNonce(); // Not expecting a new nonce with GET and HEAD requests.
+			if($method == 'POST') {
+				$this->getNewNonce();
+			}
+			// Not expecting a new nonce with GET and HEAD requests.
 		}
 
 		if((($method == 'POST' OR $method == 'GET') AND $statusCode !== 200 AND $statusCode !== 201) OR
@@ -218,7 +225,9 @@ 
      */
 	public function signRequestJWK($payload, $url, $privateKeyFile = '')
     {
-		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
+		if($privateKeyFile == '') {
+			$privateKeyFile = $this->accountKeys['private_key'];
+		}
 		$privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
         $details = openssl_pkey_get_details($privateKey);
 
@@ -260,7 +269,9 @@ 
      */
 	public function signRequestKid($payload, $kid, $url, $privateKeyFile = '')
     {
-		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
+		if($privateKeyFile == '') {
+			$privateKeyFile = $this->accountKeys['private_key'];
+		}
         $privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
         $details = openssl_pkey_get_details($privateKey);
 

src/LEAccount.php

Indentation +40 added lines, -40 removed lines

@@ -52,14 +52,14 @@ 
 
 	private $log;
 
-    /**
-     * Initiates the LetsEncrypt Account class.
-     *
-     * @param LEConnector	$connector 		The LetsEncrypt Connector instance to use for HTTP requests.
-     * @param int 			$log 			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
-     * @param array 		$email	 		The array of strings containing e-mail addresses. Only used when creating a new account.
-     * @param array 		$accountKeys 	Array containing location of account keys files.
-     */
+	/**
+	 * Initiates the LetsEncrypt Account class.
+	 *
+	 * @param LEConnector	$connector 		The LetsEncrypt Connector instance to use for HTTP requests.
+	 * @param int 			$log 			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
+	 * @param array 		$email	 		The array of strings containing e-mail addresses. Only used when creating a new account.
+	 * @param array 		$accountKeys 	Array containing location of account keys files.
+	 */
 	public function __construct($connector, $log, $email, $accountKeys)
 	{
 		$this->connector = $connector;
@@ -85,13 +85,13 @@ 
 		$this->getLEAccountData();
 	}
 
-    /**
-     * Creates a new LetsEncrypt account.
-     *
-     * @param array 	$email 	The array of strings containing e-mail addresses.
-     *
-     * @return object	Returns the new account URL when the account was successfully created, false if not.
-     */
+	/**
+	 * Creates a new LetsEncrypt account.
+	 *
+	 * @param array 	$email 	The array of strings containing e-mail addresses.
+	 *
+	 * @return object	Returns the new account URL when the account was successfully created, false if not.
+	 */
 	private function createLEAccount($email)
 	{
 		$contact = array_map(function($addr) { return empty($addr) ? '' : (strpos($addr, 'mailto') === false ? 'mailto:' . $addr : $addr); }, $email);
@@ -105,11 +105,11 @@ 
 		return false;
 	}
 
-    /**
-     * Gets the LetsEncrypt account URL associated with the stored account keys.
-     *
-     * @return object	Returns the account URL if it is found, or false when none is found.
-     */
+	/**
+	 * Gets the LetsEncrypt account URL associated with the stored account keys.
+	 *
+	 * @return object	Returns the account URL if it is found, or false when none is found.
+	 */
 	private function getLEAccount()
 	{
 		$sign = $this->connector->signRequestJWK(array('onlyReturnExisting' => true), $this->connector->newAccount);
@@ -122,9 +122,9 @@ 
 		return false;
 	}
 
-    /**
-     * Gets the LetsEncrypt account data from the account URL.
-     */
+	/**
+	 * Gets the LetsEncrypt account data from the account URL.
+	 */
 	private function getLEAccountData()
 	{
 		$sign = $this->connector->signRequestKid(array('' => ''), $this->connector->accountURL, $this->connector->accountURL);
@@ -145,13 +145,13 @@ 
 		}
 	}
 
-    /**
-     * Updates account data. Now just supporting new contact information.
-     *
-     * @param array 	$email	The array of strings containing e-mail adresses.
-     *
-     * @return boolean	Returns true if the update is successful, false if not.
-     */
+	/**
+	 * Updates account data. Now just supporting new contact information.
+	 *
+	 * @param array 	$email	The array of strings containing e-mail adresses.
+	 *
+	 * @return boolean	Returns true if the update is successful, false if not.
+	 */
 	public function updateAccount($email)
 	{
 		$contact = array_map(function($addr) { return empty($addr) ? '' : (strpos($addr, 'mailto') === false ? 'mailto:' . $addr : $addr); }, $email);
@@ -180,11 +180,11 @@ 
 		}
 	}
 
-    /**
-     * Creates new RSA account keys and updates the keys with LetsEncrypt.
-     *
-     * @return boolean	Returns true if the update is successful, false if not.
-     */
+	/**
+	 * Creates new RSA account keys and updates the keys with LetsEncrypt.
+	 *
+	 * @return boolean	Returns true if the update is successful, false if not.
+	 */
 	public function changeAccountKeys()
 	{
 		LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'].'.new', $this->accountKeys['public_key'].'.new');
@@ -220,11 +220,11 @@ 
 		}
 	}
 
-    /**
-     * Deactivates the LetsEncrypt account.
-     *
-     * @return boolean	Returns true if the deactivation is successful, false if not.
-     */
+	/**
+	 * Deactivates the LetsEncrypt account.
+	 *
+	 * @return boolean	Returns true if the deactivation is successful, false if not.
+	 */
 	public function deactivateAccount()
 	{
 		$sign = $this->connector->signRequestKid(array('status' => 'deactivated'), $this->connector->accountURL, $this->connector->accountURL);

Spacing +22 added lines, -22 removed lines

@@ -66,13 +66,13 @@ 
 		$this->accountKeys = $accountKeys;
 		$this->log = $log;
 
-		if(!file_exists($this->accountKeys['private_key']) OR !file_exists($this->accountKeys['public_key']))
+		if (!file_exists($this->accountKeys['private_key']) OR !file_exists($this->accountKeys['public_key']))
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('No account found, attempting to create account.');
 			}
-			else if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
+			else if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
 			
 			LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'], $this->accountKeys['public_key']);
 			$this->connector->accountURL = $this->createLEAccount($email);
@@ -81,7 +81,7 @@ 
 		{
 			$this->connector->accountURL = $this->getLEAccount();
 		}
-		if($this->connector->accountURL == false) throw LEAccountException::AccountNotFoundException();
+		if ($this->connector->accountURL == false) throw LEAccountException::AccountNotFoundException();
 		$this->getLEAccountData();
 	}
 
@@ -98,9 +98,9 @@ 
 
 		$sign = $this->connector->signRequestJWK(array('contact' => $contact, 'termsOfServiceAgreed' => true), $this->connector->newAccount);
 		$post = $this->connector->post($this->connector->newAccount, $sign);
-		if($post['status'] === 201)
+		if ($post['status'] === 201)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
+			if (preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
 		}
 		return false;
 	}
@@ -115,9 +115,9 @@ 
 		$sign = $this->connector->signRequestJWK(array('onlyReturnExisting' => true), $this->connector->newAccount);
 		$post = $this->connector->post($this->connector->newAccount, $sign);
 
-		if($post['status'] === 200)
+		if ($post['status'] === 200)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
+			if (preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
 		}
 		return false;
 	}
@@ -129,7 +129,7 @@ 
 	{
 		$sign = $this->connector->signRequestKid(array('' => ''), $this->connector->accountURL, $this->connector->accountURL);
 		$post = $this->connector->post($this->connector->accountURL, $sign);
-		if($post['status'] === 200)
+		if ($post['status'] === 200)
 		{
 			$this->id = isset($post['body']['id']) ? $post['body']['id'] : '';
 			$this->key = $post['body']['key'];
@@ -158,7 +158,7 @@ 
 
 		$sign = $this->connector->signRequestKid(array('contact' => $contact), $this->connector->accountURL, $this->connector->accountURL);
 		$post = $this->connector->post($this->connector->accountURL, $sign);
-		if($post['status'] === 200)
+		if ($post['status'] === 200)
 		{
 			$this->id = isset($post['body']['id']) ? $post['body']['id'] : '';
 			$this->key = $post['body']['key'];
@@ -167,11 +167,11 @@ 
 			$this->initialIp = $post['body']['initialIp'];
 			$this->createdAt = $post['body']['createdAt'];
 			$this->status = $post['body']['status'];
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Account data updated.');
 			}
-			else if($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account data updated.', 'function updateAccount');
+			else if ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account data updated.', 'function updateAccount');
 			return true;
 		}
 		else
@@ -187,7 +187,7 @@ 
      */
 	public function changeAccountKeys()
 	{
-		LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'].'.new', $this->accountKeys['public_key'].'.new');
+		LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'] . '.new', $this->accountKeys['public_key'] . '.new');
 		$oldPrivateKey = openssl_pkey_get_private(file_get_contents($this->accountKeys['private_key']));
 		$oldDetails = openssl_pkey_get_details($oldPrivateKey);
 		$innerPayload = array('account' => $this->connector->accountURL, 'oldKey' => array(
@@ -195,23 +195,23 @@ 
 			"n" => LEFunctions::Base64UrlSafeEncode($oldDetails["rsa"]["n"]),
 			"e" => LEFunctions::Base64UrlSafeEncode($oldDetails["rsa"]["e"])
 		));
-		$outerPayload = $this->connector->signRequestJWK($innerPayload, $this->connector->keyChange, $this->accountKeys['private_key'].'.new');
+		$outerPayload = $this->connector->signRequestJWK($innerPayload, $this->connector->keyChange, $this->accountKeys['private_key'] . '.new');
 		$sign = $this->connector->signRequestKid($outerPayload, $this->connector->accountURL, $this->connector->keyChange);
 		$post = $this->connector->post($this->connector->keyChange, $sign);
-		if($post['status'] === 200)
+		if ($post['status'] === 200)
 		{
 			unlink($this->accountKeys['private_key']);
 			unlink($this->accountKeys['public_key']);
-			rename($this->accountKeys['private_key'].'.new', $this->accountKeys['private_key']);
-			rename($this->accountKeys['public_key'].'.new', $this->accountKeys['public_key']);
+			rename($this->accountKeys['private_key'] . '.new', $this->accountKeys['private_key']);
+			rename($this->accountKeys['public_key'] . '.new', $this->accountKeys['public_key']);
 			
 			$this->getLEAccountData();
 
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Account keys changed.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account keys changed.', 'function changeAccountKey');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account keys changed.', 'function changeAccountKey');
 			return true;
 		}
 		else
@@ -229,14 +229,14 @@ 
 	{
 		$sign = $this->connector->signRequestKid(array('status' => 'deactivated'), $this->connector->accountURL, $this->connector->accountURL);
 		$post = $this->connector->post($this->connector->accountURL, $sign);
-		if($post['status'] === 200)
+		if ($post['status'] === 200)
 		{
 			$this->connector->accountDeactivated = true;
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Account deactivated.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account deactivated.', 'function deactivateAccount');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account deactivated.', 'function deactivateAccount');
 			
 			return true;
 		}

Braces +22 added lines, -17 removed lines

@@ -71,17 +71,19 @@ 
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('No account found, attempting to create account.');
+			} else if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
 			}
-			else if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
 			
 			LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'], $this->accountKeys['public_key']);
 			$this->connector->accountURL = $this->createLEAccount($email);
-		}
-		else
+		} else
 		{
 			$this->connector->accountURL = $this->getLEAccount();
 		}
-		if($this->connector->accountURL == false) throw LEAccountException::AccountNotFoundException();
+		if($this->connector->accountURL == false) {
+			throw LEAccountException::AccountNotFoundException();
+		}
 		$this->getLEAccountData();
 	}
 
@@ -100,7 +102,9 @@ 
 		$post = $this->connector->post($this->connector->newAccount, $sign);
 		if($post['status'] === 201)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
+			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) {
+				return trim($matches[1]);
+			}
 		}
 		return false;
 	}
@@ -117,7 +121,9 @@ 
 
 		if($post['status'] === 200)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
+			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) {
+				return trim($matches[1]);
+			}
 		}
 		return false;
 	}
@@ -138,8 +144,7 @@ 
 			$this->initialIp = $post['body']['initialIp'];
 			$this->createdAt = $post['body']['createdAt'];
 			$this->status = $post['body']['status'];
-		}
-		else
+		} else
 		{
 			throw LEAccountException::AccountNotFoundException();
 		}
@@ -170,11 +175,11 @@ 
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Account data updated.');
+			} else if($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Account data updated.', 'function updateAccount');
 			}
-			else if($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account data updated.', 'function updateAccount');
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -210,11 +215,11 @@ 
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Account keys changed.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Account keys changed.', 'function changeAccountKey');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account keys changed.', 'function changeAccountKey');
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -235,12 +240,12 @@ 
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Account deactivated.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Account deactivated.', 'function deactivateAccount');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Account deactivated.', 'function deactivateAccount');
 			
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}

src/LEAuthorization.php

Indentation +17 added lines, -17 removed lines

@@ -49,13 +49,13 @@ 
 
 	private $log;
 
-    /**
-     * Initiates the LetsEncrypt Authorization class. Child of a LetsEncrypt Order instance.
-     *
-     * @param LEConnector	$connector			The LetsEncrypt Connector instance to use for HTTP requests.
-     * @param int 			$log 				The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
-     * @param string 		$authorizationURL 	The URL of the authorization, given by a LetsEncrypt order request.
-     */
+	/**
+	 * Initiates the LetsEncrypt Authorization class. Child of a LetsEncrypt Order instance.
+	 *
+	 * @param LEConnector	$connector			The LetsEncrypt Connector instance to use for HTTP requests.
+	 * @param int 			$log 				The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
+	 * @param string 		$authorizationURL 	The URL of the authorization, given by a LetsEncrypt order request.
+	 */
 	public function __construct($connector, $log, $authorizationURL)
 	{
 		$this->connector = $connector;
@@ -81,9 +81,9 @@ 
 		}
 	}
 
-    /**
-     * Updates the data associated with the current LetsEncrypt Authorization instance.
-     */
+	/**
+	 * Updates the data associated with the current LetsEncrypt Authorization instance.
+	 */
 
 	public function updateData()
 	{
@@ -106,14 +106,14 @@ 
 		}
 	}
 
-    /**
-     * Gets the challenge of the given $type for this LetsEncrypt Authorization instance. Throws a Runtime Exception if the given $type is not found in this
+	/**
+	 * Gets the challenge of the given $type for this LetsEncrypt Authorization instance. Throws a Runtime Exception if the given $type is not found in this
 	 * LetsEncrypt Authorization instance.
-     *
-     * @param int	$type 	The type of verification. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS.
-     *
-     * @return array	Returns an array with the challenge of the requested $type.
-     */
+	 *
+	 * @param int	$type 	The type of verification. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS.
+	 *
+	 * @return array	Returns an array with the challenge of the requested $type.
+	 */
 	public function getChallenge($type)
 	{
 		foreach($this->challenges as $challenge)

Spacing +8 added lines, -8 removed lines

@@ -64,7 +64,7 @@ 
 
 		$sign = $this->connector->signRequestKid('', $this->connector->accountURL, $this->authorizationURL);
 		$post = $this->connector->post($this->authorizationURL, $sign);
-		if($post['status'] === 200)
+		if ($post['status'] === 200)
 		{
 			$this->identifier = $post['body']['identifier'];
 			$this->status = $post['body']['status'];
@@ -73,11 +73,11 @@ 
 		}
 		else
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Cannot find authorization \'' . $authorizationURL . '\'.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
 		}
 	}
 
@@ -89,7 +89,7 @@ 
 	{
 		$sign = $this->connector->signRequestKid('', $this->connector->accountURL, $this->authorizationURL);
 		$post = $this->connector->post($this->authorizationURL, $sign);
-		if($post['status'] === 200)
+		if ($post['status'] === 200)
 		{
 			$this->identifier = $post['body']['identifier'];
 			$this->status = $post['body']['status'];
@@ -98,11 +98,11 @@ 
 		}
 		else
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Cannot find authorization \'' . $this->authorizationURL . '\'.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $this->authorizationURL . '\'.', 'function updateData');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $this->authorizationURL . '\'.', 'function updateData');
 		}
 	}
 
@@ -116,9 +116,9 @@ 
      */
 	public function getChallenge($type)
 	{
-		foreach($this->challenges as $challenge)
+		foreach ($this->challenges as $challenge)
 		{
-			if($challenge['type'] == $type) return $challenge;
+			if ($challenge['type'] == $type) return $challenge;
 		}
 		throw LEAuthorizationException::NoChallengeFoundException($type, $this->identifier['value']);
 	}

Braces +9 added lines, -7 removed lines

@@ -70,14 +70,14 @@ 
 			$this->status = $post['body']['status'];
 			$this->expires = $post['body']['expires'];
 			$this->challenges = $post['body']['challenges'];
-		}
-		else
+		} else
 		{
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Cannot find authorization \'' . $authorizationURL . '\'.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
 		}
 	}
 
@@ -95,14 +95,14 @@ 
 			$this->status = $post['body']['status'];
 			$this->expires = $post['body']['expires'];
 			$this->challenges = $post['body']['challenges'];
-		}
-		else
+		} else
 		{
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Cannot find authorization \'' . $this->authorizationURL . '\'.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Cannot find authorization \'' . $this->authorizationURL . '\'.', 'function updateData');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $this->authorizationURL . '\'.', 'function updateData');
 		}
 	}
 
@@ -118,7 +118,9 @@ 
 	{
 		foreach($this->challenges as $challenge)
 		{
-			if($challenge['type'] == $type) return $challenge;
+			if($challenge['type'] == $type) {
+				return $challenge;
+			}
 		}
 		throw LEAuthorizationException::NoChallengeFoundException($type, $this->identifier['value']);
 	}

src/Exceptions/LEOrderException.php

Spacing +3 added lines, -3 removed lines

@@ -38,10 +38,10 @@
 class LEOrderException extends LEException
 {
 	public const INVALIDKEYTYPEEXCEPTION 		= 0x31;
-	public const INVALIDORDERSTATUSEXCEPTION 	= 0x32;
-	public const CREATEFAILEDEXCEPTION 			= 0x33;
+	public const INVALIDORDERSTATUSEXCEPTION = 0x32;
+	public const CREATEFAILEDEXCEPTION = 0x33;
 	public const INVALIDARGUMENTEXCEPTION		= 0x34;
-	public const INVALIDCONFIGURATIONEXCEPTION	= 0x35;	
+	public const INVALIDCONFIGURATIONEXCEPTION = 0x35;	
 	
 	public static function InvalidKeyTypeException(string $keyType)
 	{

src/Exceptions/LEClientException.php

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
  */
 class LEClientException extends LEException
 {
-	public const INVALIDARGUMENTEXCEPTION 	= 0x01;
-	public const INVALIDDIRECTORYEXCEPTION 	= 0x02;
+	public const INVALIDARGUMENTEXCEPTION = 0x01;
+	public const INVALIDDIRECTORYEXCEPTION = 0x02;
 	
 	public static function InvalidArgumentException(string $message)
 	{

src/Exceptions/LEFunctionsException.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 {
 	public const INVALIDARGUMENTEXCEPTION 	= 0x51;
 	public const GENERATEKEYPAIREXCEPTION 	= 0x52;
-	public const PHPVERSIONEXCEPTION 		= 0x53;
+	public const PHPVERSIONEXCEPTION = 0x53;
 	
 	public static function InvalidArgumentException(string $message)
 	{

src/Exceptions/LEAccountException.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
  */
 class LEAccountException extends LEException
 {
-	public const ACCOUNTNOTFOUNDEEXCEPTION 	= 0x21;
+	public const ACCOUNTNOTFOUNDEEXCEPTION = 0x21;
 	
 	public static function AccountNotFoundException()
 	{

src/Exceptions/LEAuthorizationException.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
  */
 class LEAuthorizationException extends LEException
 {
-	public const NOCHALLENGEFOUNDEEXCEPTION	= 0x41;
+	public const NOCHALLENGEFOUNDEEXCEPTION = 0x41;
 	
 	public static function NoChallengeFoundException($type, $identifier)
 	{

src/Exceptions/LEConnectorException.php

Spacing +3 added lines, -3 removed lines

@@ -37,11 +37,11 @@
  */
 class LEConnectorException extends LEException
 {
-	public const NONEWNONCEEXCEPTION 			= 0x11;
+	public const NONEWNONCEEXCEPTION = 0x11;
 	public const ACCOUNTDEACTIVATEDEXCEPTION 	= 0x12;
 	public const METHODNOTSUPPORTEDEXCEPTION 	= 0x13;
-	public const CURLERROREXCEPTION 			= 0x14;
-	public const INVALIDRESPONSEEXCEPTION 		= 0x15;
+	public const CURLERROREXCEPTION = 0x14;
+	public const INVALIDRESPONSEEXCEPTION = 0x15;
 	
 	public static function NoNewNonceException()
 	{