Zwartpet / php-certificate-toolbox

src/LEOrder.php

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;
 	}

src/LEClient.php

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');
 	}
 
 

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

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