Zwartpet / php-certificate-toolbox

exampleHTTP.php

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

LEClient/LEClient.php

Braces +44 added lines, -24 removed lines

@@ -78,17 +78,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 new \RuntimeException('acmeURL must be set to string or bool (legacy)');
 		}
-		else throw new \RuntimeException('acmeURL must be set to string or bool (legacy)');
 
-		if (is_array($certificateKeys) && is_string($accountKeys)) throw new \RuntimeException('when certificateKeys is array, accountKeys must be array also');
-		elseif (is_array($accountKeys) && is_string($certificateKeys)) throw new \RuntimeException('when accountKeys is array, certificateKeys must be array also');
+		if (is_array($certificateKeys) && is_string($accountKeys)) {
+			throw new \RuntimeException('when certificateKeys is array, accountKeys must be array also');
+		} elseif (is_array($accountKeys) && is_string($certificateKeys)) {
+			throw new \RuntimeException('when accountKeys is array, certificateKeys must be array also');
+		}
 
 		if (is_string($certificateKeys))
 		{
@@ -109,24 +115,32 @@ 
 				"order" => $certificateKeys.'/order'
 			);
 
-		}
-		elseif (is_array($certificateKeys))
+		} elseif (is_array($certificateKeys))
 		{
 
-			if (!isset($certificateKeys['certificate']) && !isset($certificateKeys['fullchain_certificate'])) throw new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] file path must be set');
-			if (!isset($certificateKeys['private_key'])) throw new \RuntimeException('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 new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] file path must be set');
+			}
+			if (!isset($certificateKeys['private_key'])) {
+				throw new \RuntimeException('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 new \RuntimeException($parentDir.' directory not found');
+				if (!is_dir($parentDir)) {
+					throw new \RuntimeException($parentDir.' directory not found');
+				}
 			}
 
 			$this->certificateKeys = $certificateKeys;
 
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('certificateKeys must be string or array');
 		}
@@ -146,20 +160,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 new \RuntimeException('accountKeys[private_key] file path must be set');
-			if (!isset($accountKeys['public_key'])) throw new \RuntimeException('accountKeys[public_key] file path must be set');
+			if (!isset($accountKeys['private_key'])) {
+				throw new \RuntimeException('accountKeys[private_key] file path must be set');
+			}
+			if (!isset($accountKeys['public_key'])) {
+				throw new \RuntimeException('accountKeys[public_key] file path must be set');
+			}
 
 			foreach ($accountKeys as $param => $file) {
 				$parentDir = dirname($file);
-				if (!is_dir($parentDir)) throw new \RuntimeException($parentDir.' directory not found');
+				if (!is_dir($parentDir)) {
+					throw new \RuntimeException($parentDir.' directory not found');
+				}
 			}
 
 			$this->accountKeys = $accountKeys;
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('accountKeys must be string or array');
 		}
@@ -167,7 +185,9 @@ 
 
 		$this->connector = new LEConnector($this->log, $this->baseURL, $this->accountKeys);
 		$this->account = new LEAccount($this->connector, $this->log, $email, $this->accountKeys);
-		if($this->log) LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
+		if($this->log) {
+			LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
+		}
 	}
 
 

LEClient/src/LEOrder.php

Braces +144 added lines, -89 removed lines

@@ -80,13 +80,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);
 
@@ -94,8 +92,9 @@ 
 			{
 				$this->keyType = $keyTypeParts[0][1];
 				$this->keySize = intval($keyTypeParts[0][2]);
+			} else {
+				throw new \RuntimeException('Key type \'' . $keyType . '\' not supported.');
 			}
-			else throw new \RuntimeException('Key type \'' . $keyType . '\' not supported.');
 		}
 
 		$this->certificateKeys = $certificateKeys;
@@ -114,47 +113,59 @@ 
 					{
 						foreach ($this->certificateKeys as $file)
 						{
-							if (is_file($file)) rename($file, $file.'.old');
+							if (is_file($file)) {
+								rename($file, $file.'.old');
+							}
+						}
+						if($this->log >= LECLient::LOG_STATUS) {
+							LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
 						}
-						if($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 = $get['body']['status'];
 						$this->expires = $get['body']['expires'];
 						$this->identifiers = $get['body']['identifiers'];
 						$this->authorizationURLs = $get['body']['authorizations'];
 						$this->finalizeURL = $get['body']['finalize'];
-						if(array_key_exists('certificate', $get['body'])) $this->certificateURL = $get['body']['certificate'];
+						if(array_key_exists('certificate', $get['body'])) {
+							$this->certificateURL = $get['body']['certificate'];
+						}
 						$this->updateAuthorizations();
 					}
-				}
-				else
+				} else
 				{
 					foreach ($this->certificateKeys as $file)
 					{
-						if (is_file($file)) unlink($file);
+						if (is_file($file)) {
+							unlink($file);
+						}
+					}
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 					}
-					if($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 >= LECLient::LOG_STATUS) {
+					LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 				}
-				if($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 >= LECLient::LOG_STATUS) LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
+			}
 			$this->createOrder($domains, $notBefore, $notAfter);
 		}
 	}
@@ -174,7 +185,9 @@ 
 			$dns = array();
 			foreach($domains as $domain)
 			{
-				if(preg_match_all('~(\*\.)~', $domain) > 1) throw new \RuntimeException('Cannot create orders with multiple wildcards in one domain.');
+				if(preg_match_all('~(\*\.)~', $domain) > 1) {
+					throw new \RuntimeException('Cannot create orders with multiple wildcards in one domain.');
+				}
 				$dns[] = array('type' => 'dns', 'value' => $domain);
 			}
 			$payload = array("identifiers" => $dns, 'notBefore' => $notBefore, 'notAfter' => $notAfter);
@@ -190,12 +203,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 new \RuntimeException('Key type \'' . $this->keyType . '\' not supported.');
 					}
@@ -205,22 +216,23 @@ 
 					$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 >= LECLient::LOG_STATUS) LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
-				}
-				else
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
+					}
+				} else
 				{
 					throw new \RuntimeException('New-order returned invalid response.');
 				}
-			}
-			else
+			} else
 			{
 				throw new \RuntimeException('Creating new order failed.');
 			}
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('notBefore and notAfter fields must be empty or be a string similar to 0000-00-00T00:00:00Z');
 		}
@@ -239,12 +251,15 @@ 
 			$this->identifiers = $get['body']['identifiers'];
 			$this->authorizationURLs = $get['body']['authorizations'];
 			$this->finalizeURL = $get['body']['finalize'];
-			if(array_key_exists('certificate', $get['body'])) $this->certificateURL = $get['body']['certificate'];
+			if(array_key_exists('certificate', $get['body'])) {
+				$this->certificateURL = $get['body']['certificate'];
+			}
 			$this->updateAuthorizations();
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
+			}
 		}
 	}
 
@@ -259,7 +274,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;
+				}
 			}
 		}
 	}
@@ -275,7 +292,9 @@ 
 		{
 			foreach($this->authorizations as $auth)
 			{
-				if($auth->status != 'valid') return false;
+				if($auth->status != 'valid') {
+					return false;
+				}
 			}
 			return true;
 		}
@@ -374,7 +393,9 @@ 
 									$post = $this->connector->post($challenge['url'], $sign);
 									if(strpos($post['header'], "200 OK") !== false)
 									{
-										if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										if($this->log >= LECLient::LOG_STATUS) {
+											LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										}
 										while($auth->status == 'pending')
 										{
 											sleep(1);
@@ -382,10 +403,11 @@ 
 										}
 										return true;
 									}
-								}
-								else
+								} else
 								{
-									if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									if($this->log >= LECLient::LOG_STATUS) {
+										LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									}
 								}
 								break;
 							case LEOrder::CHALLENGE_TYPE_DNS:
@@ -396,7 +418,9 @@ 
 									$post = $this->connector->post($challenge['url'], $sign);
 									if(strpos($post['header'], "200 OK") !== false)
 									{
-										if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										if($this->log >= LECLient::LOG_STATUS) {
+											LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										}
 										while($auth->status == 'pending')
 										{
 											sleep(1);
@@ -404,10 +428,11 @@ 
 										}
 										return true;
 									}
-								}
-								else
+								} else
 								{
-									if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									if($this->log >= LECLient::LOG_STATUS) {
+										LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									}
 								}
 								break;
 						}
@@ -435,13 +460,17 @@ 
 				$post = $this->connector->post($auth->authorizationURL, $sign);
 				if(strpos($post['header'], "200 OK") !== false)
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
+					}
 					$this->updateAuthorizations();
 					return true;
 				}
 			}
 		}
-		if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
+		if($this->log >= LECLient::LOG_STATUS) {
+			LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
+		}
 		return false;
 	}
 
@@ -457,12 +486,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];
 		}
@@ -512,8 +539,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);
@@ -524,20 +555,26 @@ 
 					$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 >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
+					}
 					return true;
 				}
-			}
-			else
+			} else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
+				if($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 >= LECLient::LOG_STATUS) LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
+			}
 		}
 		return false;
 	}
@@ -563,7 +600,9 @@ 
 		$polling = 0;
 		while($this->status == 'processing' && $polling < 4)
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
+			}
 			sleep(5);
 			$this->updateOrderData();
 			$polling++;
@@ -575,7 +614,9 @@ 
 			{
 				if(preg_match_all('~(-----BEGIN\sCERTIFICATE-----[\s\S]+?-----END\sCERTIFICATE-----)~i', $get['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']))
 					{
@@ -587,22 +628,27 @@ 
 						}
 						file_put_contents(trim($this->certificateKeys['fullchain_certificate']), $fullchain);
 					}
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
+					}
 					return true;
-				}
-				else
+				} else
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+					}
 				}
-			}
-			else
+			} else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+				if($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 >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
+			}
 		}
 		return false;
 	}
@@ -619,9 +665,13 @@ 
 	{
 		if($this->status == 'valid')
 		{
-			if (isset($this->certificateKeys['certificate'])) $certFile = $this->certificateKeys['certificate'];
-			elseif (isset($this->certificateKeys['fullchain_certificate']))  $certFile = $this->certificateKeys['fullchain_certificate'];
-			else throw new \RuntimeException('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 new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] required');
+			}
 
 			if(file_exists($certFile) && file_exists($this->certificateKeys['private_key']))
 			{
@@ -633,22 +683,27 @@ 
 				$post = $this->connector->post($this->connector->revokeCert, $sign);
 				if(strpos($post['header'], "200 OK") !== false)
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
+					}
 					return true;
-				}
-				else
+				} else
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
+					}
 				}
-			}
-			else
+			} else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
+				if($this->log >= LECLient::LOG_STATUS) {
+					LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
+				}
 			}
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
+			}
 		}
 		return false;
 	}

LEClient/src/LEAccount.php

Braces +26 added lines, -17 removed lines

@@ -65,15 +65,18 @@ 
 
 		if(!file_exists($this->accountKeys['private_key']) OR !file_exists($this->accountKeys['public_key']))
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
+			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 new \RuntimeException('Account not found or deactivated.');
+		if($this->connector->accountURL == false) {
+			throw new \RuntimeException('Account not found or deactivated.');
+		}
 		$this->getLEAccountData();
 	}
 
@@ -92,7 +95,9 @@ 
 		$post = $this->connector->post($this->connector->newAccount, $sign);
 		if(strpos($post['header'], "201 Created") !== false)
 		{
-			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;
 	}
@@ -109,7 +114,9 @@ 
 
 		if(strpos($post['header'], "200 OK") !== false)
 		{
-			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;
 	}
@@ -130,8 +137,7 @@ 
 			$this->initialIp = $post['body']['initialIp'];
 			$this->createdAt = $post['body']['createdAt'];
 			$this->status = $post['body']['status'];
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('Account data cannot be found.');
 		}
@@ -159,10 +165,11 @@ 
 			$this->initialIp = $post['body']['initialIp'];
 			$this->createdAt = $post['body']['createdAt'];
 			$this->status = $post['body']['status'];
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account data updated.', 'function updateAccount');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Account data updated.', 'function updateAccount');
+			}
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -195,10 +202,11 @@ 
 			rename($this->accountKeys['private_key'].'.new', $this->accountKeys['private_key']);
 			rename($this->accountKeys['public_key'].'.new', $this->accountKeys['public_key']);
 
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account keys changed.', 'function changeAccountKey');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Account keys changed.', 'function changeAccountKey');
+			}
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -216,9 +224,10 @@ 
 		if(strpos($post['header'], "200 OK") !== false)
 		{
 			$this->connector->accountDeactivated = true;
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account deactivated.', 'function deactivateAccount');
-		}
-		else
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Account deactivated.', 'function deactivateAccount');
+			}
+		} else
 		{
 			return false;
 		}

LEClient/src/LEFunctions.php

Braces +19 added lines, -10 removed lines

@@ -47,14 +47,18 @@ 
 	public static function RSAGenerateKeys($directory, $privateKeyFile = 'private.pem', $publicKeyFile = 'public.pem', $keySize = 4096)
 	{
 
-		if ($keySize < 2048 || $keySize > 4096)  throw new \RuntimeException("RSA key size must be between 2048 and 4096");
+		if ($keySize < 2048 || $keySize > 4096) {
+			throw new \RuntimeException("RSA key size must be between 2048 and 4096");
+		}
 
 		$res = openssl_pkey_new(array(
 			"private_key_type" => OPENSSL_KEYTYPE_RSA,
 			"private_key_bits" => intval($keySize),
 		));
 
-		if(!openssl_pkey_export($res, $privateKey)) throw new \RuntimeException("RSA keypair export failed!");
+		if(!openssl_pkey_export($res, $privateKey)) {
+			throw new \RuntimeException("RSA keypair export failed!");
+		}
 
 		$details = openssl_pkey_get_details($res);
 
@@ -82,7 +86,9 @@ 
      */
 	public static function ECGenerateKeys($directory, $privateKeyFile = 'private.pem', $publicKeyFile = 'public.pem', $keySize = 256)
 	{
-		if (version_compare(PHP_VERSION, '7.1.0') == -1) throw new \RuntimeException("PHP 7.1+ required for EC keys");
+		if (version_compare(PHP_VERSION, '7.1.0') == -1) {
+			throw new \RuntimeException("PHP 7.1+ required for EC keys");
+		}
 
 
 		if ($keySize == 256)
@@ -91,18 +97,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 new \RuntimeException("EC key size must be 256 or 384");
 		}
-		else throw new \RuntimeException("EC key size must be 256 or 384");
 
 
-		if(!openssl_pkey_export($res, $privateKey)) throw new \RuntimeException("EC keypair export failed!");
+		if(!openssl_pkey_export($res, $privateKey)) {
+			throw new \RuntimeException("EC keypair export failed!");
+		}
 
 		$details = openssl_pkey_get_details($res);
 
@@ -167,8 +175,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);
@@ -212,7 +219,9 @@ 
 		$records = dns_get_record($DNS, DNS_TXT);
 		foreach($records as $record)
 		{
-			if($record['host'] == $DNS && $record['type'] == 'TXT' && $record['txt'] == $DNSDigest) return true;
+			if($record['host'] == $DNS && $record['type'] == 'TXT' && $record['txt'] == $DNSDigest) {
+				return true;
+			}
 		}
 		return false;
 	}

LEClient/src/LEConnector.php

Braces +20 added lines, -8 removed lines

@@ -86,7 +86,9 @@ 
      */
 	private function getNewNonce()
 	{
-		if(strpos($this->head($this->newNonce)['header'], "204 No Content") == false) throw new \RuntimeException('No new nonce.');
+		if(strpos($this->head($this->newNonce)['header'], "204 No Content") == false) {
+			throw new \RuntimeException('No new nonce.');
+		}
 	}
 
     /**
@@ -100,7 +102,9 @@ 
      */
 	private function request($method, $URL, $data = null)
 	{
-		if($this->accountDeactivated) throw new \RuntimeException('The account was deactivated. No further requests can be made.');
+		if($this->accountDeactivated) {
+			throw new \RuntimeException('The account was deactivated. No further requests can be made.');
+		}
 
 		$headers = array('Accept: application/json', 'Content-Type: application/json');
 		$requestURL = preg_match('~^http~', $URL) ? $URL : $this->baseURL . $URL;
@@ -137,7 +141,9 @@ 
         $body = substr($response, $header_size);
 		$jsonbody = json_decode($body, true);
 		$jsonresponse = array('request' => $method . ' ' . $requestURL, 'header' => $header, 'body' => $jsonbody === null ? $body : $jsonbody);
-		if($this->log >= LECLient::LOG_DEBUG) LEFunctions::log($jsonresponse);
+		if($this->log >= LECLient::LOG_DEBUG) {
+			LEFunctions::log($jsonresponse);
+		}
 
 		if(	(($method == 'POST' OR $method == 'GET') AND strpos($header, "200 OK") === false AND strpos($header, "201 Created") === false) OR
 			($method == 'HEAD' AND strpos($header, "204 No Content") === false))
@@ -148,10 +154,12 @@ 
 		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.
 		}
 
         return $jsonresponse;
@@ -205,7 +213,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);
 
@@ -247,7 +257,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);
 

LEClient/src/LEAuthorization.php

Braces +11 added lines, -7 removed lines

@@ -66,10 +66,11 @@ 
 			$this->status = $get['body']['status'];
 			$this->expires = $get['body']['expires'];
 			$this->challenges = $get['body']['challenges'];
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
+			}
 		}
 	}
 	
@@ -86,10 +87,11 @@ 
 			$this->status = $get['body']['status'];
 			$this->expires = $get['body']['expires'];
 			$this->challenges = $get['body']['challenges'];
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function updateData');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function updateData');
+			}
 		}
 	}
 	
@@ -105,7 +107,9 @@ 
 	{
 		foreach($this->challenges as $challenge)
 		{
-			if($challenge['type'] == $type) return $challenge;
+			if($challenge['type'] == $type) {
+				return $challenge;
+			}
 		}
 		throw new \RuntimeException('No challenge found for type \'' . $type . '\' and identifier \'' . $this->identifier['value'] . '\'.');
 	}

exampleDNSFinish.php

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