Zwartpet / php-certificate-toolbox

examples/exampleDNSInit.php

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
             }
         }
     }
-}
-catch (\Exception $e) {
+} catch (\Exception $e) {
     echo $e->getMessage()."\n";
     echo $e->getTraceAsString()."\n";
 

examples/exampleDNSFinish.php

Braces +6 added lines, -2 removed lines

@@ -44,9 +44,13 @@
 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();
+	}
 
 	//finally, here's how we revoke
     //echo "REVOKING...\n";

examples/exampleHTTP.php

Braces +10 added lines, -4 removed lines

@@ -35,7 +35,9 @@ 
             // 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.
@@ -47,10 +49,14 @@ 
 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();
+	}
+	}
 
 echo "\nDiagnostic logs\n";
 $logger->dumpConsole();
\ No newline at end of file

src/LEConnector.php

Braces +19 added lines, -8 removed lines

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

src/LEAccount.php

Braces +22 added lines, -17 removed lines

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

src/LEAuthorization.php

Braces +9 added lines, -7 removed lines

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

src/LEFunctions.php

Braces +16 added lines, -9 removed lines

@@ -50,7 +50,9 @@ 
      */
 	public static function RSAGenerateKeys($directory, $privateKeyFile = 'private.pem', $publicKeyFile = 'public.pem', $keySize = 4096)
 	{
-		if ($keySize < 2048 || $keySize > 4096) throw LEFunctionsException::InvalidArgumentException('RSA key size must be between 2048 and 4096.');
+		if ($keySize < 2048 || $keySize > 4096) {
+			throw LEFunctionsException::InvalidArgumentException('RSA key size must be between 2048 and 4096.');
+		}
 
 		$res = openssl_pkey_new(array(
 			"private_key_type" => OPENSSL_KEYTYPE_RSA,
@@ -97,7 +99,9 @@ 
      */
 	public static function ECGenerateKeys($directory, $privateKeyFile = 'private.pem', $publicKeyFile = 'public.pem', $keySize = 256)
 	{
-		if (version_compare(PHP_VERSION, '7.1.0') == -1) throw LEFunctionsException::PHPVersionException();
+		if (version_compare(PHP_VERSION, '7.1.0') == -1) {
+			throw LEFunctionsException::PHPVersionException();
+		}
 
 		if ($keySize == 256)
 		{
@@ -105,18 +109,20 @@ 
 					"private_key_type" => OPENSSL_KEYTYPE_EC,
 					"curve_name" => "prime256v1",
 			));
-		}
-		elseif ($keySize == 384)
+		} elseif ($keySize == 384)
 		{
 			$res = openssl_pkey_new(array(
 					"private_key_type" => OPENSSL_KEYTYPE_EC,
 					"curve_name" => "secp384r1",
 			));
+		} else {
+			throw LEFunctionsException::InvalidArgumentException('EC key size must be 256 or 384.');
 		}
-		else throw LEFunctionsException::InvalidArgumentException('EC key size must be 256 or 384.');
 
 
-		if(!openssl_pkey_export($res, $privateKey)) throw LEFunctionsException::GenerateKeypairException('EC keypair export failed!');
+		if(!openssl_pkey_export($res, $privateKey)) {
+			throw LEFunctionsException::GenerateKeypairException('EC keypair export failed!');
+		}
 
 		$details = openssl_pkey_get_details($res);
 
@@ -181,8 +187,7 @@ 
 			echo '[' . date('d-m-Y H:i:s') . '] ' . $function . ":\n";
 			print_r($data);
 			echo "\n\n";
-		}
-		else
+		} else
 		{
 			echo '<b>' . date('d-m-Y H:i:s') . ', ' . $function . ':</b><br>';
 			print_r($data);
@@ -235,7 +240,9 @@ 
 			{
 				if($answer->type === 16)
 				{
-					if($answer->data === ('"' . $DNSDigest . '"')) return true;
+					if($answer->data === ('"' . $DNSDigest . '"')) {
+						return true;
+					}
 				}
 			}
 		}

src/LEOrder.php

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

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