Zwartpet / php-certificate-toolbox

src/LEOrder.php

Indentation +88 added lines, -88 removed lines

@@ -61,18 +61,18 @@ 
 	const CHALLENGE_TYPE_HTTP = 'http-01';
 	const CHALLENGE_TYPE_DNS = 'dns-01';
 
-    /**
-     * Initiates the LetsEncrypt Order class. If the base name is found in the $keysDir directory, the order data is requested. If no order was found locally, if the request is invalid or when there is a change in domain names, a new order is created.
-     *
-     * @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 		$certificateKeys 	Array containing location of certificate keys files.
-     * @param string 		$basename 			The base name for the order. Preferable the top domain (example.org). Will be the directory in which the keys are stored. Used for the CommonName in the certificate as well.
-     * @param array 		$domains 			The array of strings containing the domain names on the certificate.
-     * @param string 		$keyType 			Type of the key we want to use for certificate. Can be provided in ALGO-SIZE format (ex. rsa-4096 or ec-256) or simple "rsa" and "ec" (using default sizes)
-     * @param string 		$notBefore 			A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid.
-     * @param string 		$notAfter 			A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid.
-     */
+	/**
+	 * Initiates the LetsEncrypt Order class. If the base name is found in the $keysDir directory, the order data is requested. If no order was found locally, if the request is invalid or when there is a change in domain names, a new order is created.
+	 *
+	 * @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 		$certificateKeys 	Array containing location of certificate keys files.
+	 * @param string 		$basename 			The base name for the order. Preferable the top domain (example.org). Will be the directory in which the keys are stored. Used for the CommonName in the certificate as well.
+	 * @param array 		$domains 			The array of strings containing the domain names on the certificate.
+	 * @param string 		$keyType 			Type of the key we want to use for certificate. Can be provided in ALGO-SIZE format (ex. rsa-4096 or ec-256) or simple "rsa" and "ec" (using default sizes)
+	 * @param string 		$notBefore 			A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid.
+	 * @param string 		$notAfter 			A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid.
+	 */
 	public function __construct($connector, $log, $certificateKeys, $basename, $domains, $keyType = 'rsa-4096', $notBefore, $notAfter)
 	{
 		$this->connector = $connector;
@@ -189,13 +189,13 @@ 
 		}
 	}
 
-    /**
-     * Creates a new LetsEncrypt order and fills this instance with its data. Subsequently creates a new RSA keypair for the certificate.
-     *
-     * @param array		$domains 	The array of strings containing the domain names on the certificate.
-     * @param string 	$notBefore 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid.
-     * @param string 	$notAfter 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid.
-     */
+	/**
+	 * Creates a new LetsEncrypt order and fills this instance with its data. Subsequently creates a new RSA keypair for the certificate.
+	 *
+	 * @param array		$domains 	The array of strings containing the domain names on the certificate.
+	 * @param string 	$notBefore 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid.
+	 * @param string 	$notAfter 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid.
+	 */
 	private function createOrder($domains, $notBefore, $notAfter)
 	{
 		$dns = array();
@@ -252,9 +252,9 @@ 
 		}
 	}
 
-    /**
-     * Fetches the latest data concerning this LetsEncrypt Order instance and fills this instance with the new data.
-     */
+	/**
+	 * Fetches the latest data concerning this LetsEncrypt Order instance and fills this instance with the new data.
+	 */
 	private function updateOrderData()
 	{
 		$sign = $this->connector->signRequestKid('', $this->connector->accountURL, $this->orderURL);
@@ -280,8 +280,8 @@ 
 	}
 
 	/**
-     * Fetches the latest data concerning all authorizations connected to this LetsEncrypt Order instance and creates and stores a new LetsEncrypt Authorization instance for each one.
-     */
+	 * Fetches the latest data concerning all authorizations connected to this LetsEncrypt Order instance and creates and stores a new LetsEncrypt Authorization instance for each one.
+	 */
 	private function updateAuthorizations()
 	{
 		$this->authorizations = array();
@@ -295,11 +295,11 @@ 
 		}
 	}
 
-    /**
-     * Walks all LetsEncrypt Authorization instances and returns whether they are all valid (verified).
-     *
-     * @return boolean	Returns true if all authorizations are valid (verified), returns false if not.
-     */
+	/**
+	 * Walks all LetsEncrypt Authorization instances and returns whether they are all valid (verified).
+	 *
+	 * @return boolean	Returns true if all authorizations are valid (verified), returns false if not.
+	 */
 	public function allAuthorizationsValid()
 	{
 		if(count($this->authorizations) > 0)
@@ -313,16 +313,16 @@ 
 		return false;
 	}
 
-    /**
-     * Get all pending LetsEncrypt Authorization instances and return the necessary data for verification. The data in the return object depends on the $type.
-     *
-     * @param int	$type	The type of verification to get. Supporting http-01 and dns-01. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS. Throws
+	/**
+	 * Get all pending LetsEncrypt Authorization instances and return the necessary data for verification. The data in the return object depends on the $type.
+	 *
+	 * @param int	$type	The type of verification to get. Supporting http-01 and dns-01. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS. Throws
 	 *						a Runtime Exception when requesting an unknown $type. Keep in mind a wildcard domain authorization only accepts LEOrder::CHALLENGE_TYPE_DNS.
-     *
-     * @return object	Returns an array with verification data if successful, false if not pending LetsEncrypt Authorization instances were found. The return array always
+	 *
+	 * @return object	Returns an array with verification data if successful, false if not pending LetsEncrypt Authorization instances were found. The return array always
 	 *					contains 'type' and 'identifier'. For LEOrder::CHALLENGE_TYPE_HTTP, the array contains 'filename' and 'content' for necessary the authorization file.
 	 *					For LEOrder::CHALLENGE_TYPE_DNS, the array contains 'DNSDigest', which is the content for the necessary DNS TXT entry.
-     */
+	 */
 
 	public function getPendingAuthorizations($type)
 	{
@@ -364,16 +364,16 @@ 
 		return count($authorizations) > 0 ? $authorizations : false;
 	}
 
-    /**
-     * Sends a verification request for a given $identifier and $type. The function itself checks whether the verification is valid before making the request.
+	/**
+	 * Sends a verification request for a given $identifier and $type. The function itself checks whether the verification is valid before making the request.
 	 * Updates the LetsEncrypt Authorization instances after a successful verification.
-     *
-     * @param string	$identifier	The domain name to verify.
-     * @param int 		$type 		The type of verification. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS.
+	 *
+	 * @param string	$identifier	The domain name to verify.
+	 * @param int 		$type 		The type of verification. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS.
 	 * @param boolean	$localcheck	Whether to verify the authorization locally before making the authorization request to LE. Optional, default to true.
-     *
-     * @return boolean	Returns true when the verification request was successful, false if not.
-     */
+	 *
+	 * @return boolean	Returns true when the verification request was successful, false if not.
+	 */
 	public function verifyPendingOrderAuthorization($identifier, $type, $localcheck = true)
 	{
 		$privateKey = openssl_pkey_get_private(file_get_contents($this->connector->accountKeys['private_key']));
@@ -472,13 +472,13 @@ 
 		return false;
 	}
 
-    /**
-     * Deactivate an LetsEncrypt Authorization instance.
-     *
-     * @param string	$identifier The domain name for which the verification should be deactivated.
-     *
-     * @return boolean	Returns true is the deactivation request was successful, false if not.
-     */
+	/**
+	 * Deactivate an LetsEncrypt Authorization instance.
+	 *
+	 * @param string	$identifier The domain name for which the verification should be deactivated.
+	 *
+	 * @return boolean	Returns true is the deactivation request was successful, false if not.
+	 */
 	public function deactivateOrderAuthorization($identifier)
 	{
 		foreach($this->authorizations as $auth)
@@ -507,12 +507,12 @@ 
 		return false;
 	}
 
-    /**
-     * Generates a Certificate Signing Request for the identifiers in the current LetsEncrypt Order instance. If possible, the base name will be the certificate
+	/**
+	 * Generates a Certificate Signing Request for the identifiers in the current LetsEncrypt Order instance. If possible, the base name will be the certificate
 	 * common name and all domain names in this LetsEncrypt Order instance will be added to the Subject Alternative Names entry.
-     *
-     * @return string	Returns the generated CSR as string, unprepared for LetsEncrypt. Preparation for the request happens in finalizeOrder()
-     */
+	 *
+	 * @return string	Returns the generated CSR as string, unprepared for LetsEncrypt. Preparation for the request happens in finalizeOrder()
+	 */
 	public function generateCSR()
 	{
 		$domains = array_map(function ($dns) { return $dns['value']; }, $this->identifiers);
@@ -534,14 +534,14 @@ 
 		);
 
 		$san = implode(",", array_map(function ($dns) {
-            return "DNS:" . $dns;
-        }, $domains));
-        $tmpConf = tmpfile();
-        $tmpConfMeta = stream_get_meta_data($tmpConf);
-        $tmpConfPath = $tmpConfMeta["uri"];
-
-        fwrite($tmpConf,
-            'HOME = .
+			return "DNS:" . $dns;
+		}, $domains));
+		$tmpConf = tmpfile();
+		$tmpConfMeta = stream_get_meta_data($tmpConf);
+		$tmpConfPath = $tmpConfMeta["uri"];
+
+		fwrite($tmpConf,
+			'HOME = .
 			RANDFILE = $ENV::HOME/.rnd
 			[ req ]
 			default_bits = ' . $this->keySize . '
@@ -561,13 +561,13 @@ 
 		return $csr;
 	}
 
-    /**
-     * Checks, for redundancy, whether all authorizations are valid, and finalizes the order. Updates this LetsEncrypt Order instance with the new data.
-     *
-     * @param string	$csr	The Certificate Signing Request as a string. Can be a custom CSR. If empty, a CSR will be generated with the generateCSR() function.
-     *
-     * @return boolean	Returns true if the finalize request was successful, false if not.
-     */
+	/**
+	 * Checks, for redundancy, whether all authorizations are valid, and finalizes the order. Updates this LetsEncrypt Order instance with the new data.
+	 *
+	 * @param string	$csr	The Certificate Signing Request as a string. Can be a custom CSR. If empty, a CSR will be generated with the generateCSR() function.
+	 *
+	 * @return boolean	Returns true if the finalize request was successful, false if not.
+	 */
 	public function finalizeOrder($csr = '')
 	{
 		$this->updateOrderData();
@@ -617,22 +617,22 @@ 
 		return false;
 	}
 
-    /**
-     * Gets whether the LetsEncrypt Order is finalized by checking whether the status is processing or valid. Keep in mind, a certificate is not yet available when the status still is processing.
-     *
-     * @return boolean	Returns true if finalized, false if not.
-     */
+	/**
+	 * Gets whether the LetsEncrypt Order is finalized by checking whether the status is processing or valid. Keep in mind, a certificate is not yet available when the status still is processing.
+	 *
+	 * @return boolean	Returns true if finalized, false if not.
+	 */
 	public function isFinalized()
 	{
 		return ($this->status == 'processing' || $this->status == 'valid');
 	}
 
-    /**
-     * Requests the certificate for this LetsEncrypt Order instance, after finalization. When the order status is still 'processing', the order will be polled max
+	/**
+	 * Requests the certificate for this LetsEncrypt Order instance, after finalization. When the order status is still 'processing', the order will be polled max
 	 * four times with five seconds in between. If the status becomes 'valid' in the meantime, the certificate will be requested. Else, the function returns false.
-     *
-     * @return boolean	Returns true if the certificate is stored successfully, false if the certificate could not be retrieved or the status remained 'processing'.
-     */
+	 *
+	 * @return boolean	Returns true if the certificate is stored successfully, false if the certificate could not be retrieved or the status remained 'processing'.
+	 */
 	public function getCertificate()
 	{
 		$polling = 0;
@@ -713,14 +713,14 @@ 
 		return false;
 	}
 
-    /**
-     * Revokes the certificate in the current LetsEncrypt Order instance, if existent. Unlike stated in the ACME draft, the certificate revoke request cannot be signed
+	/**
+	 * Revokes the certificate in the current LetsEncrypt Order instance, if existent. Unlike stated in the ACME draft, the certificate revoke request cannot be signed
 	 * with the account private key, and will be signed with the certificate private key.
-     *
-     * @param int	$reason   The reason to revoke the LetsEncrypt Order instance certificate. Possible reasons can be found in section 5.3.1 of RFC5280.
-     *
-     * @return boolean	Returns true if the certificate was successfully revoked, false if not.
-     */
+	 *
+	 * @param int	$reason   The reason to revoke the LetsEncrypt Order instance certificate. Possible reasons can be found in section 5.3.1 of RFC5280.
+	 *
+	 * @return boolean	Returns true if the certificate was successfully revoked, false if not.
+	 */
 	public function revokeCertificate($reason = 0)
 	{
 		if($this->status == 'valid' || $this->status == 'ready')

Spacing +112 added lines, -112 removed lines

@@ -101,14 +101,14 @@ 
 			else throw LEOrderException::InvalidKeyTypeException($keyType);
 		}
 		
-		if(preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notBefore) == false OR preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notAfter) == false)
+		if (preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notBefore) == false OR preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notAfter) == false)
 		{
 			throw LEOrderException::InvalidArgumentException('notBefore and notAfter fields must be empty or be a string similar to 0000-00-00T00:00:00Z');
 		}
 
 		$this->certificateKeys = $certificateKeys;
 
-		if(file_exists($this->certificateKeys['private_key']) AND file_exists($this->certificateKeys['order']) AND file_exists($this->certificateKeys['public_key']))
+		if (file_exists($this->certificateKeys['private_key']) AND file_exists($this->certificateKeys['order']) AND file_exists($this->certificateKeys['public_key']))
 		{
 			$this->orderURL = file_get_contents($this->certificateKeys['order']);
 			if (filter_var($this->orderURL, FILTER_VALIDATE_URL) !== false)
@@ -117,24 +117,24 @@ 
 				{
 					$sign = $this->connector->signRequestKid('', $this->connector->accountURL, $this->orderURL);
 					$post = $this->connector->post($this->orderURL, $sign);
-					if($post['body']['status'] == "invalid")
+					if ($post['body']['status'] == "invalid")
 					{
 						throw LEOrderException::InvalidOrderStatusException();
 					}
 					
 					$orderdomains = array_map(function($ident) { return $ident['value']; }, $post['body']['identifiers']);
 					$diff = array_merge(array_diff($orderdomains, $domains), array_diff($domains, $orderdomains));
-					if(!empty($diff))
+					if (!empty($diff))
 					{
 						foreach ($this->certificateKeys as $file)
 						{
-							if (is_file($file)) rename($file, $file.'.old');
+							if (is_file($file)) rename($file, $file . '.old');
 						}
-						if($this->log instanceof \Psr\Log\LoggerInterface) 
+						if ($this->log instanceof \Psr\Log\LoggerInterface) 
 						{
 							$this->log->info('Domains do not match order data. Renaming current files and creating new order.');
 						}
-						elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
+						elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
 						$this->createOrder($domains, $notBefore, $notAfter, $keyType);
 					}
 					else
@@ -144,7 +144,7 @@ 
 						$this->identifiers = $post['body']['identifiers'];
 						$this->authorizationURLs = $post['body']['authorizations'];
 						$this->finalizeURL = $post['body']['finalize'];
-						if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+						if (array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
 						$this->updateAuthorizations();
 					}
 				}
@@ -154,11 +154,11 @@ 
 					{
 						if (is_file($file)) unlink($file);
 					}
-					if($this->log instanceof \Psr\Log\LoggerInterface) 
+					if ($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
+					elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 					$this->createOrder($domains, $notBefore, $notAfter);
 				}
 			}
@@ -169,22 +169,22 @@ 
 				{
 					if (is_file($file)) unlink($file);
 				}
-				if($this->log instanceof \Psr\Log\LoggerInterface) 
+				if ($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
+				elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 
 				$this->createOrder($domains, $notBefore, $notAfter);
 			}
 		}
 		else
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('No order found for \'' . $this->basename . '\'. Creating new order.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
 			$this->createOrder($domains, $notBefore, $notAfter);
 		}
 	}
@@ -199,18 +199,18 @@ 
 	private function createOrder($domains, $notBefore, $notAfter)
 	{
 		$dns = array();
-		foreach($domains as $domain)
+		foreach ($domains as $domain)
 		{
-			if(preg_match_all('~(\*\.)~', $domain) > 1) throw LEOrderException::InvalidArgumentException('Cannot create orders with multiple wildcards in one domain.');
+			if (preg_match_all('~(\*\.)~', $domain) > 1) throw LEOrderException::InvalidArgumentException('Cannot create orders with multiple wildcards in one domain.');
 			$dns[] = array('type' => 'dns', 'value' => $domain);
 		}
 		$payload = array("identifiers" => $dns, 'notBefore' => $notBefore, 'notAfter' => $notAfter);
 		$sign = $this->connector->signRequestKid($payload, $this->connector->accountURL, $this->connector->newOrder);
 		$post = $this->connector->post($this->connector->newOrder, $sign);
 
-		if($post['status'] === 201)
+		if ($post['status'] === 201)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches))
+			if (preg_match('~Location: (\S+)~i', $post['header'], $matches))
 			{
 				$this->orderURL = trim($matches[1]);
 				file_put_contents($this->certificateKeys['order'], $this->orderURL);
@@ -232,14 +232,14 @@ 
 				$this->identifiers = $post['body']['identifiers'];
 				$this->authorizationURLs = $post['body']['authorizations'];
 				$this->finalizeURL = $post['body']['finalize'];
-				if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+				if (array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
 				$this->updateAuthorizations();
 
-				if($this->log instanceof \Psr\Log\LoggerInterface) 
+				if ($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Created order for \'' . $this->basename . '\'.');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
+				elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
 			}
 			else
 			{
@@ -259,23 +259,23 @@ 
 	{
 		$sign = $this->connector->signRequestKid('', $this->connector->accountURL, $this->orderURL);
 		$post = $this->connector->post($this->orderURL, $sign);
-		if($post['status'] === 200)
+		if ($post['status'] === 200)
 		{
 			$this->status = $post['body']['status'];
 			$this->expires = $post['body']['expires'];
 			$this->identifiers = $post['body']['identifiers'];
 			$this->authorizationURLs = $post['body']['authorizations'];
 			$this->finalizeURL = $post['body']['finalize'];
-			if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+			if (array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
 			$this->updateAuthorizations();
 		}
 		else
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Cannot update data for order \'' . $this->basename . '\'.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
 		}
 	}
 
@@ -285,12 +285,12 @@ 
 	private function updateAuthorizations()
 	{
 		$this->authorizations = array();
-		foreach($this->authorizationURLs as $authURL)
+		foreach ($this->authorizationURLs as $authURL)
 		{
 			if (filter_var($authURL, FILTER_VALIDATE_URL))
 			{
 				$auth = new LEAuthorization($this->connector, $this->log, $authURL);
-				if($auth != false) $this->authorizations[] = $auth;
+				if ($auth != false) $this->authorizations[] = $auth;
 			}
 		}
 	}
@@ -302,11 +302,11 @@ 
      */
 	public function allAuthorizationsValid()
 	{
-		if(count($this->authorizations) > 0)
+		if (count($this->authorizations) > 0)
 		{
-			foreach($this->authorizations as $auth)
+			foreach ($this->authorizations as $auth)
 			{
-				if($auth->status != 'valid') return false;
+				if ($auth->status != 'valid') return false;
 			}
 			return true;
 		}
@@ -339,15 +339,15 @@ 
 		);
 		$digest = LEFunctions::Base64UrlSafeEncode(hash('sha256', json_encode($header), true));
 
-		foreach($this->authorizations as $auth)
+		foreach ($this->authorizations as $auth)
 		{
-			if($auth->status == 'pending')
+			if ($auth->status == 'pending')
 			{
 				$challenge = $auth->getChallenge($type);
-				if($challenge['status'] == 'pending')
+				if ($challenge['status'] == 'pending')
 				{
 					$keyAuthorization = $challenge['token'] . '.' . $digest;
-					switch(strtolower($type))
+					switch (strtolower($type))
 					{
 						case LEOrder::CHALLENGE_TYPE_HTTP:
 							$authorizations[] = array('type' => LEOrder::CHALLENGE_TYPE_HTTP, 'identifier' => $auth->identifier['value'], 'filename' => $challenge['token'], 'content' => $keyAuthorization);
@@ -387,34 +387,34 @@ 
 		);
 		$digest = LEFunctions::Base64UrlSafeEncode(hash('sha256', json_encode($header), true));
 
-		foreach($this->authorizations as $auth)
+		foreach ($this->authorizations as $auth)
 		{
-			if($auth->identifier['value'] == $identifier)
+			if ($auth->identifier['value'] == $identifier)
 			{
-				if($auth->status == 'pending')
+				if ($auth->status == 'pending')
 				{
 					$challenge = $auth->getChallenge($type);
-					if($challenge['status'] == 'pending')
+					if ($challenge['status'] == 'pending')
 					{
 						$keyAuthorization = $challenge['token'] . '.' . $digest;
-						switch($type)
+						switch ($type)
 						{
 							case LEOrder::CHALLENGE_TYPE_HTTP:
-								if($localcheck == false OR LEFunctions::checkHTTPChallenge($identifier, $challenge['token'], $keyAuthorization))
+								if ($localcheck == false OR LEFunctions::checkHTTPChallenge($identifier, $challenge['token'], $keyAuthorization))
 								{
 									$sign = $this->connector->signRequestKid(array('keyAuthorization' => $keyAuthorization), $this->connector->accountURL, $challenge['url']);
 									$post = $this->connector->post($challenge['url'], $sign);
-									if($post['status'] === 200)
+									if ($post['status'] === 200)
 									{
-										if($localcheck)
+										if ($localcheck)
 										{
-											if($this->log instanceof \Psr\Log\LoggerInterface) 
+											if ($this->log instanceof \Psr\Log\LoggerInterface) 
 											{
 												$this->log->info('HTTP challenge for \'' . $identifier . '\' valid.');
 											}
-											elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+											elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
 										}
-										while($auth->status == 'pending')
+										while ($auth->status == 'pending')
 										{
 											sleep(1);
 											$auth->updateData();
@@ -424,30 +424,30 @@ 
 								}
 								else
 								{
-									if($this->log instanceof \Psr\Log\LoggerInterface) 
+									if ($this->log instanceof \Psr\Log\LoggerInterface) 
 									{
 										$this->log->info('HTTP challenge for \'' . $identifier . '\' tested locally, found invalid.');
 									}
-									elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested locally, found invalid.', 'function verifyPendingOrderAuthorization');
+									elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested locally, found invalid.', 'function verifyPendingOrderAuthorization');
 								}
 								break;
 							case LEOrder::CHALLENGE_TYPE_DNS:
 								$DNSDigest = LEFunctions::Base64UrlSafeEncode(hash('sha256', $keyAuthorization, true));
-								if($localcheck == false OR LEFunctions::checkDNSChallenge($identifier, $DNSDigest))
+								if ($localcheck == false OR LEFunctions::checkDNSChallenge($identifier, $DNSDigest))
 								{
 									$sign = $this->connector->signRequestKid(array('keyAuthorization' => $keyAuthorization), $this->connector->accountURL, $challenge['url']);
 									$post = $this->connector->post($challenge['url'], $sign);
-									if($post['status'] === 200)
+									if ($post['status'] === 200)
 									{
-										if($localcheck)
+										if ($localcheck)
 										{
-											if($this->log instanceof \Psr\Log\LoggerInterface) 
+											if ($this->log instanceof \Psr\Log\LoggerInterface) 
 											{
 												$this->log->info('DNS challenge for \'' . $identifier . '\' valid.');
 											}
-											elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+											elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
 										}
-										while($auth->status == 'pending')
+										while ($auth->status == 'pending')
 										{
 											sleep(1);
 											$auth->updateData();
@@ -457,11 +457,11 @@ 
 								}
 								else
 								{
-									if($this->log instanceof \Psr\Log\LoggerInterface) 
+									if ($this->log instanceof \Psr\Log\LoggerInterface) 
 									{
 										$this->log->info('DNS challenge for \'' . $identifier . '\' tested locally, found invalid.');
 									}
-									elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested locally, found invalid.', 'function verifyPendingOrderAuthorization');
+									elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested locally, found invalid.', 'function verifyPendingOrderAuthorization');
 								}
 								break;
 						}
@@ -481,29 +481,29 @@ 
      */
 	public function deactivateOrderAuthorization($identifier)
 	{
-		foreach($this->authorizations as $auth)
+		foreach ($this->authorizations as $auth)
 		{
-			if($auth->identifier['value'] == $identifier)
+			if ($auth->identifier['value'] == $identifier)
 			{
 				$sign = $this->connector->signRequestKid(array('status' => 'deactivated'), $this->connector->accountURL, $auth->authorizationURL);
 				$post = $this->connector->post($auth->authorizationURL, $sign);
-				if($post['status'] === 200)
+				if ($post['status'] === 200)
 				{
-					if($this->log instanceof \Psr\Log\LoggerInterface) 
+					if ($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Authorization for \'' . $identifier . '\' deactivated.');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
+					elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
 					$this->updateAuthorizations();
 					return true;
 				}
 			}
 		}
-		if($this->log instanceof \Psr\Log\LoggerInterface) 
+		if ($this->log instanceof \Psr\Log\LoggerInterface) 
 		{
 			$this->log->info('No authorization found for \'' . $identifier . '\', cannot deactivate.');
 		}
-		elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
+		elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
 		return false;
 	}
 
@@ -515,12 +515,12 @@ 
      */
 	public function generateCSR()
 	{
-		$domains = array_map(function ($dns) { return $dns['value']; }, $this->identifiers);
-		if(in_array($this->basename, $domains))
+		$domains = array_map(function($dns) { return $dns['value']; }, $this->identifiers);
+		if (in_array($this->basename, $domains))
 		{
 			$CN = $this->basename;
 		}
-		elseif(in_array('*.' . $this->basename, $domains))
+		elseif (in_array('*.' . $this->basename, $domains))
 		{
 			$CN = '*.' . $this->basename;
 		}
@@ -533,7 +533,7 @@ 
 			"commonName" => $CN
 		);
 
-		$san = implode(",", array_map(function ($dns) {
+		$san = implode(",", array_map(function($dns) {
             return "DNS:" . $dns;
         }, $domains));
         $tmpConf = tmpfile();
@@ -557,7 +557,7 @@ 
 
 		$privateKey = openssl_pkey_get_private(file_get_contents($this->certificateKeys['private_key']));
 		$csr = openssl_csr_new($dn, $privateKey, array('config' => $tmpConfPath, 'digest_alg' => 'sha256'));
-		openssl_csr_export ($csr, $csr);
+		openssl_csr_export($csr, $csr);
 		return $csr;
 	}
 
@@ -571,48 +571,48 @@ 
 	public function finalizeOrder($csr = '')
 	{
 		$this->updateOrderData();
-		if($this->status == 'ready')
+		if ($this->status == 'ready')
 		{
-			if($this->allAuthorizationsValid())
+			if ($this->allAuthorizationsValid())
 			{
-				if(empty($csr)) $csr = $this->generateCSR();
-				if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) $csr = $matches[1];
+				if (empty($csr)) $csr = $this->generateCSR();
+				if (preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) $csr = $matches[1];
 				$csr = trim(LEFunctions::Base64UrlSafeEncode(base64_decode($csr)));
 				$sign = $this->connector->signRequestKid(array('csr' => $csr), $this->connector->accountURL, $this->finalizeURL);
 				$post = $this->connector->post($this->finalizeURL, $sign);
-				if($post['status'] === 200)
+				if ($post['status'] === 200)
 				{
 					$this->status = $post['body']['status'];
 					$this->expires = $post['body']['expires'];
 					$this->identifiers = $post['body']['identifiers'];
 					$this->authorizationURLs = $post['body']['authorizations'];
 					$this->finalizeURL = $post['body']['finalize'];
-					if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+					if (array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
 					$this->updateAuthorizations();
-					if($this->log instanceof \Psr\Log\LoggerInterface) 
+					if ($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Order for \'' . $this->basename . '\' finalized.');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
+					elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
 					return true;
 				}
 			}
 			else
 			{
-				if($this->log instanceof \Psr\Log\LoggerInterface) 
+				if ($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
+				elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
 			}
 		}
 		else
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
 		}
 		return false;
 	}
@@ -636,79 +636,79 @@ 
 	public function getCertificate()
 	{
 		$polling = 0;
-		while($this->status == 'processing' && $polling < 4)
+		while ($this->status == 'processing' && $polling < 4)
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
 			sleep(5);
 			$this->updateOrderData();
 			$polling++;
 		}
-		if($this->status == 'valid')
+		if ($this->status == 'valid')
 		{
-			if(!empty($this->certificateURL))
+			if (!empty($this->certificateURL))
 			{
 				$sign = $this->connector->signRequestKid('', $this->connector->accountURL, $this->certificateURL);
 				$post = $this->connector->post($this->certificateURL, $sign);
-				if($post['status'] === 200)
+				if ($post['status'] === 200)
 				{
-					if(preg_match_all('~(-----BEGIN\sCERTIFICATE-----[\s\S]+?-----END\sCERTIFICATE-----)~i', $post['body'], $matches))
+					if (preg_match_all('~(-----BEGIN\sCERTIFICATE-----[\s\S]+?-----END\sCERTIFICATE-----)~i', $post['body'], $matches))
 					{
-						if (isset($this->certificateKeys['certificate'])) file_put_contents($this->certificateKeys['certificate'],  $matches[0][0]);
+						if (isset($this->certificateKeys['certificate'])) file_put_contents($this->certificateKeys['certificate'], $matches[0][0]);
 
-						if(count($matches[0]) > 1 && isset($this->certificateKeys['fullchain_certificate']))
+						if (count($matches[0]) > 1 && isset($this->certificateKeys['fullchain_certificate']))
 						{
-							$fullchain = $matches[0][0]."\n";
-							for($i=1;$i<count($matches[0]);$i++)
+							$fullchain = $matches[0][0] . "\n";
+							for ($i = 1; $i < count($matches[0]); $i++)
 							{
-								$fullchain .= $matches[0][$i]."\n";
+								$fullchain .= $matches[0][$i] . "\n";
 							}
 							file_put_contents(trim($this->certificateKeys['fullchain_certificate']), $fullchain);
 						}
-						if($this->log instanceof \Psr\Log\LoggerInterface) 
+						if ($this->log instanceof \Psr\Log\LoggerInterface) 
 						{
 							$this->log->info('Certificate for \'' . $this->basename . '\' saved');
 						}
-						elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
+						elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
 						return true;
 					}
 					else
 					{
-						if($this->log instanceof \Psr\Log\LoggerInterface) 
+						if ($this->log instanceof \Psr\Log\LoggerInterface) 
 						{
 							$this->log->info('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.');
 						}
-						elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+						elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
 					}
 				}
 				else
 				{
-					if($this->log instanceof \Psr\Log\LoggerInterface) 
+					if ($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+					elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
 				}
 			}
 			else
 			{
-				if($this->log instanceof \Psr\Log\LoggerInterface) 
+				if ($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Order for \'' . $this->basename . '\' not valid. Cannot find certificate URL.');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot find certificate URL.', 'function getCertificate');
+				elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot find certificate URL.', 'function getCertificate');
 			}
 		}
 		else
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
 		}
 		return false;
 	}
@@ -723,13 +723,13 @@ 
      */
 	public function revokeCertificate($reason = 0)
 	{
-		if($this->status == 'valid' || $this->status == 'ready')
+		if ($this->status == 'valid' || $this->status == 'ready')
 		{
 			if (isset($this->certificateKeys['certificate'])) $certFile = $this->certificateKeys['certificate'];
 			elseif (isset($this->certificateKeys['fullchain_certificate']))  $certFile = $this->certificateKeys['fullchain_certificate'];
 			else throw LEOrderException::InvalidConfigurationException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] required');
 
-			if(file_exists($certFile) && file_exists($this->certificateKeys['private_key']))
+			if (file_exists($certFile) && file_exists($this->certificateKeys['private_key']))
 			{
 				$certificate = file_get_contents($this->certificateKeys['certificate']);
 				preg_match('~-----BEGIN\sCERTIFICATE-----(.*)-----END\sCERTIFICATE-----~s', $certificate, $matches);
@@ -737,40 +737,40 @@ 
 
 				$sign = $this->connector->signRequestJWK(array('certificate' => $certificate, 'reason' => $reason), $this->connector->revokeCert, $this->certificateKeys['private_key']);
 				$post = $this->connector->post($this->connector->revokeCert, $sign);
-				if($post['status'] === 200)
+				if ($post['status'] === 200)
 				{
-					if($this->log instanceof \Psr\Log\LoggerInterface) 
+					if ($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Certificate for order \'' . $this->basename . '\' revoked.');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
+					elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
 					return true;
 				}
 				else
 				{
-					if($this->log instanceof \Psr\Log\LoggerInterface) 
+					if ($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Certificate for order \'' . $this->basename . '\' cannot be revoked.');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
+					elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
 				}
 			}
 			else
 			{
-				if($this->log instanceof \Psr\Log\LoggerInterface) 
+				if ($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
+				elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
 			}
 		}
 		else
 		{
-			if($this->log instanceof \Psr\Log\LoggerInterface) 
+			if ($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
+			elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
 		}
 		return false;
 	}

Braces +122 added lines, -90 removed lines

@@ -83,13 +83,11 @@ 
 		{
 			$this->keyType = 'rsa';
 			$this->keySize = 4096;
-		}
-		elseif ($keyType == 'ec')
+		} elseif ($keyType == 'ec')
 		{
 			$this->keyType = 'ec';
 			$this->keySize = 256;
-		}
-		else
+		} else
 		{
 			preg_match_all('/^(rsa|ec)\-([0-9]{3,4})$/', $keyType, $keyTypeParts, PREG_SET_ORDER, 0);
 
@@ -97,8 +95,9 @@ 
 			{
 				$this->keyType = $keyTypeParts[0][1];
 				$this->keySize = intval($keyTypeParts[0][2]);
+			} else {
+				throw LEOrderException::InvalidKeyTypeException($keyType);
 			}
-			else throw LEOrderException::InvalidKeyTypeException($keyType);
 		}
 		
 		if(preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notBefore) == false OR preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notAfter) == false)
@@ -128,63 +127,71 @@ 
 					{
 						foreach ($this->certificateKeys as $file)
 						{
-							if (is_file($file)) rename($file, $file.'.old');
+							if (is_file($file)) {
+								rename($file, $file.'.old');
+							}
 						}
 						if($this->log instanceof \Psr\Log\LoggerInterface) 
 						{
 							$this->log->info('Domains do not match order data. Renaming current files and creating new order.');
+						} elseif($this->log >= LEClient::LOG_STATUS) {
+							LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
 						}
-						elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
 						$this->createOrder($domains, $notBefore, $notAfter, $keyType);
-					}
-					else
+					} else
 					{
 						$this->status = $post['body']['status'];
 						$this->expires = $post['body']['expires'];
 						$this->identifiers = $post['body']['identifiers'];
 						$this->authorizationURLs = $post['body']['authorizations'];
 						$this->finalizeURL = $post['body']['finalize'];
-						if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+						if(array_key_exists('certificate', $post['body'])) {
+							$this->certificateURL = $post['body']['certificate'];
+						}
 						$this->updateAuthorizations();
 					}
-				}
-				catch (\Exception $e)
+				} catch (\Exception $e)
 				{
 					foreach ($this->certificateKeys as $file)
 					{
-						if (is_file($file)) unlink($file);
+						if (is_file($file)) {
+							unlink($file);
+						}
 					}
 					if($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.');
+					} elseif($this->log >= LEClient::LOG_STATUS) {
+						LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 					$this->createOrder($domains, $notBefore, $notAfter);
 				}
-			}
-			else
+			} else
 			{
 
 				foreach ($this->certificateKeys as $file)
 				{
-					if (is_file($file)) unlink($file);
+					if (is_file($file)) {
+						unlink($file);
+					}
 				}
 				if($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.');
+				} elseif($this->log >= LEClient::LOG_STATUS) {
+					LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 
 				$this->createOrder($domains, $notBefore, $notAfter);
 			}
-		}
-		else
+		} else
 		{
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('No order found for \'' . $this->basename . '\'. Creating new order.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
 			$this->createOrder($domains, $notBefore, $notAfter);
 		}
 	}
@@ -201,7 +208,9 @@ 
 		$dns = array();
 		foreach($domains as $domain)
 		{
-			if(preg_match_all('~(\*\.)~', $domain) > 1) throw LEOrderException::InvalidArgumentException('Cannot create orders with multiple wildcards in one domain.');
+			if(preg_match_all('~(\*\.)~', $domain) > 1) {
+				throw LEOrderException::InvalidArgumentException('Cannot create orders with multiple wildcards in one domain.');
+			}
 			$dns[] = array('type' => 'dns', 'value' => $domain);
 		}
 		$payload = array("identifiers" => $dns, 'notBefore' => $notBefore, 'notAfter' => $notAfter);
@@ -217,12 +226,10 @@ 
 				if ($this->keyType == "rsa")
 				{
 					LEFunctions::RSAgenerateKeys(null, $this->certificateKeys['private_key'], $this->certificateKeys['public_key'], $this->keySize);
-				}
-				elseif ($this->keyType == "ec")
+				} elseif ($this->keyType == "ec")
 				{
 					LEFunctions::ECgenerateKeys(null, $this->certificateKeys['private_key'], $this->certificateKeys['public_key'], $this->keySize);
-				}
-				else
+				} else
 				{
 					throw LEOrderException::InvalidKeyTypeException($this->keyType);
 				}
@@ -232,21 +239,22 @@ 
 				$this->identifiers = $post['body']['identifiers'];
 				$this->authorizationURLs = $post['body']['authorizations'];
 				$this->finalizeURL = $post['body']['finalize'];
-				if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+				if(array_key_exists('certificate', $post['body'])) {
+					$this->certificateURL = $post['body']['certificate'];
+				}
 				$this->updateAuthorizations();
 
 				if($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Created order for \'' . $this->basename . '\'.');
+				} elseif($this->log >= LEClient::LOG_STATUS) {
+					LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
-			}
-			else
+			} else
 			{
 				throw LEOrderException::CreateFailedException('New-order returned invalid response.');
 			}
-		}
-		else
+		} else
 		{
 			throw LEOrderException::CreateFailedException('Creating new order failed.');
 		}
@@ -266,16 +274,18 @@ 
 			$this->identifiers = $post['body']['identifiers'];
 			$this->authorizationURLs = $post['body']['authorizations'];
 			$this->finalizeURL = $post['body']['finalize'];
-			if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+			if(array_key_exists('certificate', $post['body'])) {
+				$this->certificateURL = $post['body']['certificate'];
+			}
 			$this->updateAuthorizations();
-		}
-		else
+		} else
 		{
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Cannot update data for order \'' . $this->basename . '\'.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
 		}
 	}
 
@@ -290,7 +300,9 @@ 
 			if (filter_var($authURL, FILTER_VALIDATE_URL))
 			{
 				$auth = new LEAuthorization($this->connector, $this->log, $authURL);
-				if($auth != false) $this->authorizations[] = $auth;
+				if($auth != false) {
+					$this->authorizations[] = $auth;
+				}
 			}
 		}
 	}
@@ -306,7 +318,9 @@ 
 		{
 			foreach($this->authorizations as $auth)
 			{
-				if($auth->status != 'valid') return false;
+				if($auth->status != 'valid') {
+					return false;
+				}
 			}
 			return true;
 		}
@@ -411,8 +425,9 @@ 
 											if($this->log instanceof \Psr\Log\LoggerInterface) 
 											{
 												$this->log->info('HTTP challenge for \'' . $identifier . '\' valid.');
+											} elseif($this->log >= LEClient::LOG_STATUS) {
+												LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
 											}
-											elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
 										}
 										while($auth->status == 'pending')
 										{
@@ -421,14 +436,14 @@ 
 										}
 										return true;
 									}
-								}
-								else
+								} else
 								{
 									if($this->log instanceof \Psr\Log\LoggerInterface) 
 									{
 										$this->log->info('HTTP challenge for \'' . $identifier . '\' tested locally, found invalid.');
+									} elseif($this->log >= LEClient::LOG_STATUS) {
+										LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested locally, found invalid.', 'function verifyPendingOrderAuthorization');
 									}
-									elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested locally, found invalid.', 'function verifyPendingOrderAuthorization');
 								}
 								break;
 							case LEOrder::CHALLENGE_TYPE_DNS:
@@ -444,8 +459,9 @@ 
 											if($this->log instanceof \Psr\Log\LoggerInterface) 
 											{
 												$this->log->info('DNS challenge for \'' . $identifier . '\' valid.');
+											} elseif($this->log >= LEClient::LOG_STATUS) {
+												LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
 											}
-											elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
 										}
 										while($auth->status == 'pending')
 										{
@@ -454,14 +470,14 @@ 
 										}
 										return true;
 									}
-								}
-								else
+								} else
 								{
 									if($this->log instanceof \Psr\Log\LoggerInterface) 
 									{
 										$this->log->info('DNS challenge for \'' . $identifier . '\' tested locally, found invalid.');
+									} elseif($this->log >= LEClient::LOG_STATUS) {
+										LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested locally, found invalid.', 'function verifyPendingOrderAuthorization');
 									}
-									elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested locally, found invalid.', 'function verifyPendingOrderAuthorization');
 								}
 								break;
 						}
@@ -492,8 +508,9 @@ 
 					if($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Authorization for \'' . $identifier . '\' deactivated.');
+					} elseif($this->log >= LEClient::LOG_STATUS) {
+						LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
 					$this->updateAuthorizations();
 					return true;
 				}
@@ -502,8 +519,9 @@ 
 		if($this->log instanceof \Psr\Log\LoggerInterface) 
 		{
 			$this->log->info('No authorization found for \'' . $identifier . '\', cannot deactivate.');
+		} elseif($this->log >= LEClient::LOG_STATUS) {
+			LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
 		}
-		elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
 		return false;
 	}
 
@@ -519,12 +537,10 @@ 
 		if(in_array($this->basename, $domains))
 		{
 			$CN = $this->basename;
-		}
-		elseif(in_array('*.' . $this->basename, $domains))
+		} elseif(in_array('*.' . $this->basename, $domains))
 		{
 			$CN = '*.' . $this->basename;
-		}
-		else
+		} else
 		{
 			$CN = $domains[0];
 		}
@@ -575,8 +591,12 @@ 
 		{
 			if($this->allAuthorizationsValid())
 			{
-				if(empty($csr)) $csr = $this->generateCSR();
-				if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) $csr = $matches[1];
+				if(empty($csr)) {
+					$csr = $this->generateCSR();
+				}
+				if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) {
+					$csr = $matches[1];
+				}
 				$csr = trim(LEFunctions::Base64UrlSafeEncode(base64_decode($csr)));
 				$sign = $this->connector->signRequestKid(array('csr' => $csr), $this->connector->accountURL, $this->finalizeURL);
 				$post = $this->connector->post($this->finalizeURL, $sign);
@@ -587,32 +607,35 @@ 
 					$this->identifiers = $post['body']['identifiers'];
 					$this->authorizationURLs = $post['body']['authorizations'];
 					$this->finalizeURL = $post['body']['finalize'];
-					if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+					if(array_key_exists('certificate', $post['body'])) {
+						$this->certificateURL = $post['body']['certificate'];
+					}
 					$this->updateAuthorizations();
 					if($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Order for \'' . $this->basename . '\' finalized.');
+					} elseif($this->log >= LEClient::LOG_STATUS) {
+						LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
 					return true;
 				}
-			}
-			else
+			} else
 			{
 				if($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.');
+				} elseif($this->log >= LEClient::LOG_STATUS) {
+					LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
 			}
-		}
-		else
+		} else
 		{
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
 		}
 		return false;
 	}
@@ -641,8 +664,9 @@ 
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
 			sleep(5);
 			$this->updateOrderData();
 			$polling++;
@@ -657,7 +681,9 @@ 
 				{
 					if(preg_match_all('~(-----BEGIN\sCERTIFICATE-----[\s\S]+?-----END\sCERTIFICATE-----)~i', $post['body'], $matches))
 					{
-						if (isset($this->certificateKeys['certificate'])) file_put_contents($this->certificateKeys['certificate'],  $matches[0][0]);
+						if (isset($this->certificateKeys['certificate'])) {
+							file_put_contents($this->certificateKeys['certificate'],  $matches[0][0]);
+						}
 
 						if(count($matches[0]) > 1 && isset($this->certificateKeys['fullchain_certificate']))
 						{
@@ -671,44 +697,45 @@ 
 						if($this->log instanceof \Psr\Log\LoggerInterface) 
 						{
 							$this->log->info('Certificate for \'' . $this->basename . '\' saved');
+						} elseif($this->log >= LEClient::LOG_STATUS) {
+							LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
 						}
-						elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
 						return true;
-					}
-					else
+					} else
 					{
 						if($this->log instanceof \Psr\Log\LoggerInterface) 
 						{
 							$this->log->info('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.');
+						} elseif($this->log >= LEClient::LOG_STATUS) {
+							LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
 						}
-						elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
 					}
-				}
-				else
+				} else
 				{
 					if($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.');
+					} elseif($this->log >= LEClient::LOG_STATUS) {
+						LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
 				}
-			}
-			else
+			} else
 			{
 				if($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Order for \'' . $this->basename . '\' not valid. Cannot find certificate URL.');
+				} elseif($this->log >= LEClient::LOG_STATUS) {
+					LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot find certificate URL.', 'function getCertificate');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot find certificate URL.', 'function getCertificate');
 			}
-		}
-		else
+		} else
 		{
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
 		}
 		return false;
 	}
@@ -725,9 +752,13 @@ 
 	{
 		if($this->status == 'valid' || $this->status == 'ready')
 		{
-			if (isset($this->certificateKeys['certificate'])) $certFile = $this->certificateKeys['certificate'];
-			elseif (isset($this->certificateKeys['fullchain_certificate']))  $certFile = $this->certificateKeys['fullchain_certificate'];
-			else throw LEOrderException::InvalidConfigurationException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] required');
+			if (isset($this->certificateKeys['certificate'])) {
+				$certFile = $this->certificateKeys['certificate'];
+			} elseif (isset($this->certificateKeys['fullchain_certificate'])) {
+				$certFile = $this->certificateKeys['fullchain_certificate'];
+			} else {
+				throw LEOrderException::InvalidConfigurationException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] required');
+			}
 
 			if(file_exists($certFile) && file_exists($this->certificateKeys['private_key']))
 			{
@@ -742,35 +773,36 @@ 
 					if($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Certificate for order \'' . $this->basename . '\' revoked.');
+					} elseif($this->log >= LEClient::LOG_STATUS) {
+						LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
 					return true;
-				}
-				else
+				} else
 				{
 					if($this->log instanceof \Psr\Log\LoggerInterface) 
 					{
 						$this->log->info('Certificate for order \'' . $this->basename . '\' cannot be revoked.');
+					} elseif($this->log >= LEClient::LOG_STATUS) {
+						LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
 					}
-					elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
 				}
-			}
-			else
+			} else
 			{
 				if($this->log instanceof \Psr\Log\LoggerInterface) 
 				{
 					$this->log->info('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.');
+				} elseif($this->log >= LEClient::LOG_STATUS) {
+					LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
 				}
-				elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
 			}
-		}
-		else
+		} else
 		{
 			if($this->log instanceof \Psr\Log\LoggerInterface) 
 			{
 				$this->log->info('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.');
+			} elseif($this->log >= LEClient::LOG_STATUS) {
+				LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
 			}
-			elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
 		}
 		return false;
 	}

src/LEClient.php

Indentation +25 added lines, -25 removed lines

@@ -54,17 +54,17 @@ 
 	const LOG_STATUS = 1;	// Logs only messages and faults.
 	const LOG_DEBUG = 2;	// Logs messages, faults and raw responses from HTTP requests.
 
-    /**
-     * Initiates the LetsEncrypt main client.
-     *
-     * @param array		$email	 			The array of strings containing e-mail addresses. Only used in this function when creating a new account.
-     * @param boolean	$acmeURL			ACME URL, can be string or one of predefined values: LE_STAGING or LE_PRODUCTION. Defaults to LE_STAGING.
-     * @param int 		$log				The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted. Defaults to LOG_OFF. (optional)
-     * @param string 	$certificateKeys 	The main directory in which all keys (and certificates), including account keys, are stored. Defaults to 'keys/'. (optional)
-     * @param array 	$certificateKeys 	Optional array containing location of all certificate files. Required paths are public_key, private_key, order and certificate/fullchain_certificate (you can use both or only one of them)
-     * @param string 	$accountKeys 		The directory in which the account keys are stored. Is a subdir inside $certificateKeys. Defaults to '__account/'.(optional)
-     * @param array 	$accountKeys 		Optional array containing location of account private and public keys. Required paths are private_key, public_key.
-     */
+	/**
+	 * Initiates the LetsEncrypt main client.
+	 *
+	 * @param array		$email	 			The array of strings containing e-mail addresses. Only used in this function when creating a new account.
+	 * @param boolean	$acmeURL			ACME URL, can be string or one of predefined values: LE_STAGING or LE_PRODUCTION. Defaults to LE_STAGING.
+	 * @param int 		$log				The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted. Defaults to LOG_OFF. (optional)
+	 * @param string 	$certificateKeys 	The main directory in which all keys (and certificates), including account keys, are stored. Defaults to 'keys/'. (optional)
+	 * @param array 	$certificateKeys 	Optional array containing location of all certificate files. Required paths are public_key, private_key, order and certificate/fullchain_certificate (you can use both or only one of them)
+	 * @param string 	$accountKeys 		The directory in which the account keys are stored. Is a subdir inside $certificateKeys. Defaults to '__account/'.(optional)
+	 * @param array 	$accountKeys 		Optional array containing location of account private and public keys. Required paths are private_key, public_key.
+	 */
 	public function __construct($email, $acmeURL = LEClient::LE_PRODUCTION, $log = LEClient::LOG_OFF, $certificateKeys = 'keys/', $accountKeys = '__account/')
 	{
 		$this->log = $log;
@@ -163,27 +163,27 @@ 
 	}
 
 
-    /**
-     * Returns the LetsEncrypt account used in the current client.
+	/**
+	 * Returns the LetsEncrypt account used in the current client.
 	 *
 	 * @return LEAccount	The LetsEncrypt Account instance used by the client.
-     */
+	 */
 	public function getAccount()
 	{
 		return $this->account;
 	}
 
-    /**
-     * Returns a LetsEncrypt order. If an order exists, this one is returned. If not, a new order is created and returned.
-     *
-     * @param string	$basename	The base name for the order. Preferable the top domain (example.org). Will be the directory in which the keys are stored. Used for the CommonName in the certificate as well.
-     * @param array 	$domains 	The array of strings containing the domain names on the certificate.
-     * @param string 	$keyType 	Type of the key we want to use for certificate. Can be provided in ALGO-SIZE format (ex. rsa-4096 or ec-256) or simple "rsa" and "ec" (using default sizes)
-     * @param string 	$notBefore	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid. Defaults to the moment the order is finalized. (optional)
-     * @param string 	$notAfter  	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid. Defaults to 90 days past the moment the order is finalized. (optional)
-     *
-     * @return LEOrder	The LetsEncrypt Order instance which is either retrieved or created.
-     */
+	/**
+	 * Returns a LetsEncrypt order. If an order exists, this one is returned. If not, a new order is created and returned.
+	 *
+	 * @param string	$basename	The base name for the order. Preferable the top domain (example.org). Will be the directory in which the keys are stored. Used for the CommonName in the certificate as well.
+	 * @param array 	$domains 	The array of strings containing the domain names on the certificate.
+	 * @param string 	$keyType 	Type of the key we want to use for certificate. Can be provided in ALGO-SIZE format (ex. rsa-4096 or ec-256) or simple "rsa" and "ec" (using default sizes)
+	 * @param string 	$notBefore	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid. Defaults to the moment the order is finalized. (optional)
+	 * @param string 	$notAfter  	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid. Defaults to 90 days past the moment the order is finalized. (optional)
+	 *
+	 * @return LEOrder	The LetsEncrypt Order instance which is either retrieved or created.
+	 */
 	public function getOrCreateOrder($basename, $domains, $keyType = 'rsa-4096', $notBefore = '', $notAfter = '')
 	{
 		return new LEOrder($this->connector, $this->log, $this->certificateKeys, $basename, $domains, $keyType, $notBefore, $notAfter);

Spacing +17 added lines, -17 removed lines

@@ -50,9 +50,9 @@ 
 
 	private $log;
 
-	const LOG_OFF = 0;		// Logs no messages or faults, except Runtime Exceptions.
-	const LOG_STATUS = 1;	// Logs only messages and faults.
-	const LOG_DEBUG = 2;	// Logs messages, faults and raw responses from HTTP requests.
+	const LOG_OFF = 0; // Logs no messages or faults, except Runtime Exceptions.
+	const LOG_STATUS = 1; // Logs only messages and faults.
+	const LOG_DEBUG = 2; // Logs messages, faults and raw responses from HTTP requests.
 
     /**
      * Initiates the LetsEncrypt main client.
@@ -87,26 +87,26 @@ 
 		{
 			$certificateKeysDir = $certificateKeys;
 
-			if(!file_exists($certificateKeys))
+			if (!file_exists($certificateKeys))
 			{
 				mkdir($certificateKeys, 0755, true);
 				LEFunctions::createhtaccess($certificateKeys);
 			}
 
 			$this->certificateKeys = array(
-				"public_key" => $certificateKeys.'/public.pem',
-				"private_key" => $certificateKeys.'/private.pem',
-				"certificate" => $certificateKeys.'/certificate.crt',
-				"fullchain_certificate" => $certificateKeys.'/fullchain.crt',
-				"order" => $certificateKeys.'/order'
+				"public_key" => $certificateKeys . '/public.pem',
+				"private_key" => $certificateKeys . '/private.pem',
+				"certificate" => $certificateKeys . '/certificate.crt',
+				"fullchain_certificate" => $certificateKeys . '/fullchain.crt',
+				"order" => $certificateKeys . '/order'
 			);
 		}
 		elseif (is_array($certificateKeys))
 		{
 			if (!isset($certificateKeys['certificate']) && !isset($certificateKeys['fullchain_certificate'])) throw LEClientException::InvalidArgumentException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] file path must be set.');
 			if (!isset($certificateKeys['private_key'])) throw LEClientException::InvalidArgumentException('certificateKeys[private_key] file path must be set.');
-			if (!isset($certificateKeys['order'])) $certificateKeys['order'] = dirname($certificateKeys['private_key']).'/order';
-			if (!isset($certificateKeys['public_key'])) $certificateKeys['public_key'] = dirname($certificateKeys['private_key']).'/public.pem';
+			if (!isset($certificateKeys['order'])) $certificateKeys['order'] = dirname($certificateKeys['private_key']) . '/order';
+			if (!isset($certificateKeys['public_key'])) $certificateKeys['public_key'] = dirname($certificateKeys['private_key']) . '/public.pem';
 
 			foreach ($certificateKeys as $param => $file) {
 				$parentDir = dirname($file);
@@ -122,17 +122,17 @@ 
 
 		if (is_string($accountKeys))
 		{
-			$accountKeys = $certificateKeysDir.'/'.$accountKeys;
+			$accountKeys = $certificateKeysDir . '/' . $accountKeys;
 
-			if(!file_exists($accountKeys))
+			if (!file_exists($accountKeys))
 			{
 				mkdir($accountKeys, 0755, true);
 				LEFunctions::createhtaccess($accountKeys);
 			}
 
 			$this->accountKeys = array(
-				"private_key" => $accountKeys.'/private.pem',
-				"public_key" => $accountKeys.'/public.pem'
+				"private_key" => $accountKeys . '/private.pem',
+				"public_key" => $accountKeys . '/public.pem'
 			);
 		}
 		elseif (is_array($accountKeys))
@@ -155,11 +155,11 @@ 
 		$this->connector = new LEConnector($this->log, $this->baseURL, $this->accountKeys);
 		$this->account = new LEAccount($this->connector, $this->log, $email, $this->accountKeys);
 		
-		if($this->log instanceof \Psr\Log\LoggerInterface) 
+		if ($this->log instanceof \Psr\Log\LoggerInterface) 
 		{
 			$this->log->info('LEClient finished constructing');
 		}
-		elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
+		elseif ($this->log >= LEClient::LOG_STATUS) LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
 	}
 
 

Braces +43 added lines, -24 removed lines

@@ -71,17 +71,23 @@ 
 
 		if (is_bool($acmeURL))
 		{
-			if ($acmeURL === true) $this->baseURL = LEClient::LE_STAGING;
-			elseif ($acmeURL === false) $this->baseURL = LEClient::LE_PRODUCTION;
-		}
-		elseif (is_string($acmeURL))
+			if ($acmeURL === true) {
+				$this->baseURL = LEClient::LE_STAGING;
+			} elseif ($acmeURL === false) {
+				$this->baseURL = LEClient::LE_PRODUCTION;
+			}
+		} elseif (is_string($acmeURL))
 		{
 			$this->baseURL = $acmeURL;
+		} else {
+			throw LEClientException::InvalidArgumentException('acmeURL must be set to string or bool (legacy).');
 		}
-		else throw LEClientException::InvalidArgumentException('acmeURL must be set to string or bool (legacy).');
 
-		if (is_array($certificateKeys) && is_string($accountKeys)) throw LEClientException::InvalidArgumentException('When certificateKeys is array, accountKeys must be array too.');
-		elseif (is_array($accountKeys) && is_string($certificateKeys)) throw LEClientException::InvalidArgumentException('When accountKeys is array, certificateKeys must be array too.');
+		if (is_array($certificateKeys) && is_string($accountKeys)) {
+			throw LEClientException::InvalidArgumentException('When certificateKeys is array, accountKeys must be array too.');
+		} elseif (is_array($accountKeys) && is_string($certificateKeys)) {
+			throw LEClientException::InvalidArgumentException('When accountKeys is array, certificateKeys must be array too.');
+		}
 
 		if (is_string($certificateKeys))
 		{
@@ -100,22 +106,30 @@ 
 				"fullchain_certificate" => $certificateKeys.'/fullchain.crt',
 				"order" => $certificateKeys.'/order'
 			);
-		}
-		elseif (is_array($certificateKeys))
+		} elseif (is_array($certificateKeys))
 		{
-			if (!isset($certificateKeys['certificate']) && !isset($certificateKeys['fullchain_certificate'])) throw LEClientException::InvalidArgumentException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] file path must be set.');
-			if (!isset($certificateKeys['private_key'])) throw LEClientException::InvalidArgumentException('certificateKeys[private_key] file path must be set.');
-			if (!isset($certificateKeys['order'])) $certificateKeys['order'] = dirname($certificateKeys['private_key']).'/order';
-			if (!isset($certificateKeys['public_key'])) $certificateKeys['public_key'] = dirname($certificateKeys['private_key']).'/public.pem';
+			if (!isset($certificateKeys['certificate']) && !isset($certificateKeys['fullchain_certificate'])) {
+				throw LEClientException::InvalidArgumentException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] file path must be set.');
+			}
+			if (!isset($certificateKeys['private_key'])) {
+				throw LEClientException::InvalidArgumentException('certificateKeys[private_key] file path must be set.');
+			}
+			if (!isset($certificateKeys['order'])) {
+				$certificateKeys['order'] = dirname($certificateKeys['private_key']).'/order';
+			}
+			if (!isset($certificateKeys['public_key'])) {
+				$certificateKeys['public_key'] = dirname($certificateKeys['private_key']).'/public.pem';
+			}
 
 			foreach ($certificateKeys as $param => $file) {
 				$parentDir = dirname($file);
-				if (!is_dir($parentDir)) throw LEClientException::InvalidDirectoryException($parentDir);
+				if (!is_dir($parentDir)) {
+					throw LEClientException::InvalidDirectoryException($parentDir);
+				}
 			}
 
 			$this->certificateKeys = $certificateKeys;
-		}
-		else
+		} else
 		{
 			throw LEClientException::InvalidArgumentException('certificateKeys must be string or array.');
 		}
@@ -134,20 +148,24 @@ 
 				"private_key" => $accountKeys.'/private.pem',
 				"public_key" => $accountKeys.'/public.pem'
 			);
-		}
-		elseif (is_array($accountKeys))
+		} elseif (is_array($accountKeys))
 		{
-			if (!isset($accountKeys['private_key'])) throw LEClientException::InvalidArgumentException('accountKeys[private_key] file path must be set.');
-			if (!isset($accountKeys['public_key'])) throw LEClientException::InvalidArgumentException('accountKeys[public_key] file path must be set.');
+			if (!isset($accountKeys['private_key'])) {
+				throw LEClientException::InvalidArgumentException('accountKeys[private_key] file path must be set.');
+			}
+			if (!isset($accountKeys['public_key'])) {
+				throw LEClientException::InvalidArgumentException('accountKeys[public_key] file path must be set.');
+			}
 
 			foreach ($accountKeys as $param => $file) {
 				$parentDir = dirname($file);
-				if (!is_dir($parentDir)) throw LEClientException::InvalidDirectoryException($parentDir);
+				if (!is_dir($parentDir)) {
+					throw LEClientException::InvalidDirectoryException($parentDir);
+				}
 			}
 
 			$this->accountKeys = $accountKeys;
-		}
-		else
+		} else
 		{
 			throw LEClientException::InvalidArgumentException('accountKeys must be string or array.');
 		}
@@ -158,8 +176,9 @@ 
 		if($this->log instanceof \Psr\Log\LoggerInterface) 
 		{
 			$this->log->info('LEClient finished constructing');
+		} elseif($this->log >= LEClient::LOG_STATUS) {
+			LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
 		}
-		elseif($this->log >= LEClient::LOG_STATUS) LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
 	}
 
 

examples/dns_init.php

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 // Sets the maximum execution time to two minutes, to be sure.
 ini_set('max_execution_time', 120);
 // Including the autoloader.
-include __DIR__.'/../vendor/autoload.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 // Importing the classes.
 use LEClient\LEClient;
@@ -20,14 +20,14 @@ 
 // Initiating the order instance. The keys and certificate will be stored in /example.org/ (argument 1) and the domains in the array (argument 2) will be on the certificate.
 $order = $client->getOrCreateOrder($basename, $domains);
 // Check whether there are any authorizations pending. If that is the case, try to verify the pending authorizations.
-if(!$order->allAuthorizationsValid())
+if (!$order->allAuthorizationsValid())
 {
 	// Get the DNS challenges from the pending authorizations.
 	$pending = $order->getPendingAuthorizations(LEOrder::CHALLENGE_TYPE_DNS);
 	// Walk the list of pending authorization DNS challenges.
-	if(!empty($pending))
+	if (!empty($pending))
 	{
-		foreach($pending as $challenge)
+		foreach ($pending as $challenge)
 		{
 			// For the purpose of this example, a fictitious functions creates or updates the ACME challenge DNS record for this domain. 
 			setDNSRecord($challenge['identifier'], $challenge['DNSDigest']);

examples/http.php

Spacing +8 added lines, -8 removed lines

@@ -2,7 +2,7 @@ 
 // Sets the maximum execution time to two minutes, to be sure.
 ini_set('max_execution_time', 120);
 // Including the autoloader.
-include __DIR__.'/../vendor/autoload.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 // Importing the classes.
 use LEClient\LEClient;
@@ -20,19 +20,19 @@ 
 // Initiating the order instance. The keys and certificate will be stored in /example.org/ (argument 1) and the domains in the array (argument 2) will be on the certificate.
 $order = $client->getOrCreateOrder($basename, $domains);
 // Check whether there are any authorizations pending. If that is the case, try to verify the pending authorizations.
-if(!$order->allAuthorizationsValid())
+if (!$order->allAuthorizationsValid())
 {
 	// Get the HTTP challenges from the pending authorizations.
 	$pending = $order->getPendingAuthorizations(LEOrder::CHALLENGE_TYPE_HTTP);
 	// Walk the list of pending authorization HTTP challenges.
-	if(!empty($pending))
+	if (!empty($pending))
 	{
-		foreach($pending as $challenge)
+		foreach ($pending as $challenge)
 		{
 			// Define the folder in which to store the challenge. For the purpose of this example, a fictitious path is set.
 			$folder = '/path/to/' . $challenge['identifier'] . '/.well-known/acme-challenge/';
 			// Check if that directory yet exists. If not, create it.
-			if(!file_exists($folder)) mkdir($folder, 0777, true);
+			if (!file_exists($folder)) mkdir($folder, 0777, true);
 			// Store the challenge file for this domain.
 			file_put_contents($folder . $challenge['filename'], $challenge['content']);
 			// Let LetsEncrypt verify this challenge.
@@ -41,11 +41,11 @@ 
 	}
 }
 // Check once more whether all authorizations are valid before we can finalize the order.
-if($order->allAuthorizationsValid())
+if ($order->allAuthorizationsValid())
 {
 	// Finalize the order first, if that is not yet done.
-	if(!$order->isFinalized()) $order->finalizeOrder();
+	if (!$order->isFinalized()) $order->finalizeOrder();
 	// Check whether the order has been finalized before we can get the certificate. If finalized, get the certificate.
-	if($order->isFinalized()) $order->getCertificate();
+	if ($order->isFinalized()) $order->getCertificate();
 }
 ?>
\ No newline at end of file

Braces +10 added lines, -4 removed lines

@@ -28,7 +28,9 @@ 
 			// Define the folder in which to store the challenge. For the purpose of this example, a fictitious path is set.
 			$folder = '/path/to/' . $challenge['identifier'] . '/.well-known/acme-challenge/';
 			// Check if that directory yet exists. If not, create it.
-			if(!file_exists($folder)) mkdir($folder, 0777, true);
+			if(!file_exists($folder)) {
+				mkdir($folder, 0777, true);
+			}
 			// Store the challenge file for this domain.
 			file_put_contents($folder . $challenge['filename'], $challenge['content']);
 			// Let LetsEncrypt verify this challenge.
@@ -40,8 +42,12 @@ 
 if($order->allAuthorizationsValid())
 {
 	// Finalize the order first, if that is not yet done.
-	if(!$order->isFinalized()) $order->finalizeOrder();
+	if(!$order->isFinalized()) {
+		$order->finalizeOrder();
+	}
 	// Check whether the order has been finalized before we can get the certificate. If finalized, get the certificate.
-	if($order->isFinalized()) $order->getCertificate();
-}
+	if($order->isFinalized()) {
+		$order->getCertificate();
+	}
+	}
 ?>
\ No newline at end of file

examples/dns_finish.php

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 // Sets the maximum execution time to two minutes, to be sure.
 ini_set('max_execution_time', 120);
 // Including the autoloader.
-include __DIR__.'/../vendor/autoload.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 // Importing the classes.
 use LEClient\LEClient;
@@ -20,14 +20,14 @@ 
 // Initiating the order instance. The keys and certificate will be stored in /example.org/ (argument 1) and the domains in the array (argument 2) will be on the certificate.
 $order = $client->getOrCreateOrder($basename, $domains);
 // Check whether there are any authorizations pending. If that is the case, try to verify the pending authorizations.
-if(!$order->allAuthorizationsValid())
+if (!$order->allAuthorizationsValid())
 {
 	// Get the DNS challenges from the pending authorizations.
 	$pending = $order->getPendingAuthorizations(LEOrder::CHALLENGE_TYPE_DNS);
 	// Walk the list of pending authorization DNS challenges.
-	if(!empty($pending))
+	if (!empty($pending))
 	{
-		foreach($pending as $challenge)
+		foreach ($pending as $challenge)
 		{
 			// Let LetsEncrypt verify this challenge, which should have been fulfilled in exampleDNSStart.php.
 			$order->verifyPendingOrderAuthorization($challenge['identifier'], LEOrder::CHALLENGE_TYPE_DNS);
@@ -35,11 +35,11 @@ 
 	}
 }
 // Check once more whether all authorizations are valid before we can finalize the order.
-if($order->allAuthorizationsValid())
+if ($order->allAuthorizationsValid())
 {
 	// Finalize the order first, if that is not yet done.
-	if(!$order->isFinalized()) $order->finalizeOrder();
+	if (!$order->isFinalized()) $order->finalizeOrder();
 	// Check whether the order has been finalized before we can get the certificate. If finalized, get the certificate.
-	if($order->isFinalized()) $order->getCertificate();
+	if ($order->isFinalized()) $order->getCertificate();
 }
 ?>
\ No newline at end of file

Braces +7 added lines, -3 removed lines

@@ -34,8 +34,12 @@
 if($order->allAuthorizationsValid())
 {
 	// Finalize the order first, if that is not yet done.
-	if(!$order->isFinalized()) $order->finalizeOrder();
+	if(!$order->isFinalized()) {
+		$order->finalizeOrder();
+	}
 	// Check whether the order has been finalized before we can get the certificate. If finalized, get the certificate.
-	if($order->isFinalized()) $order->getCertificate();
-}
+	if($order->isFinalized()) {
+		$order->getCertificate();
+	}
+	}
 ?>
\ No newline at end of file