fbett / le-acme2-php

src/LE_ACME2/AbstractKeyValuable.php

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
 
     public static function setCommonKeyDirectoryPath(string $directoryPath) {
 
-        if(!file_exists($directoryPath)) {
+        if (!file_exists($directoryPath)) {
             throw new \RuntimeException('Common Key Directory Path does not exist');
         }
 
@@ -28,7 +28,7 @@ 
 
     protected function _getKeyDirectoryPath(string $appendix = '') : string {
         
-        if(self::$_directoryPath === null) {
+        if (self::$_directoryPath === null) {
             throw new \RuntimeException('Common Key Directory Path is not set');
         }
 
@@ -42,12 +42,12 @@ 
 
     protected function _initKeyDirectory(string $keyType = self::KEY_TYPE_RSA, bool $ignoreIfKeysExist = false) {
 
-        if(!file_exists($this->getKeyDirectoryPath())) {
+        if (!file_exists($this->getKeyDirectoryPath())) {
 
             mkdir($this->getKeyDirectoryPath());
         }
 
-        if(!$ignoreIfKeysExist && (
+        if (!$ignoreIfKeysExist && (
                 file_exists($this->getKeyDirectoryPath() . 'private.pem') ||
                 file_exists($this->getKeyDirectoryPath() . 'public.pem')
             )
@@ -59,14 +59,14 @@ 
             );
         }
 
-        if($keyType == self::KEY_TYPE_RSA) {
+        if ($keyType == self::KEY_TYPE_RSA) {
 
             Utilities\KeyGenerator::RSA(
                 $this->getKeyDirectoryPath(),
                 'private.pem',
                 'public.pem'
             );
-        } else if($keyType == self::KEY_TYPE_EC) {
+        } else if ($keyType == self::KEY_TYPE_EC) {
 
             Utilities\KeyGenerator::EC(
                 $this->getKeyDirectoryPath(),
@@ -81,11 +81,11 @@ 
 
     protected function _clearKeyDirectory() {
 
-        if(file_exists($this->getKeyDirectoryPath() . 'private.pem')) {
+        if (file_exists($this->getKeyDirectoryPath() . 'private.pem')) {
             unlink($this->getKeyDirectoryPath() . 'private.pem');
         }
 
-        if(file_exists($this->getKeyDirectoryPath() . 'public.pem')) {
+        if (file_exists($this->getKeyDirectoryPath() . 'public.pem')) {
             unlink($this->getKeyDirectoryPath() . 'public.pem');
         }
     }

src/LE_ACME2/Exception/OpenSSLException.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
     public function __construct(string $function) {
 
         $errors = [];
-        while(($error = openssl_error_string()) !== false) {
+        while (($error = openssl_error_string()) !== false) {
             $errors[] = $error;
         }
 

src/LE_ACME2/Exception/InvalidResponse.php

Spacing +4 added lines, -4 removed lines

@@ -18,15 +18,15 @@ 
         $this->_rawResponse = $rawResponse;
         $this->_responseStatus = $responseStatus;
 
-        if($responseStatus === '') {
+        if ($responseStatus === '') {
             $responseStatus = 'Unknown response status';
         }
 
-        if(isset($this->_rawResponse->body['type'])) {
+        if (isset($this->_rawResponse->body['type'])) {
             $responseStatus = $this->_responseStatusType = $this->_rawResponse->body['type'];
         }
 
-        if(isset($this->_rawResponse->body['detail'])) {
+        if (isset($this->_rawResponse->body['detail'])) {
             $responseStatus .= ' - ' . $this->_rawResponse->body['detail'];
         }
 
@@ -47,7 +47,7 @@ 
 
     public function getResponseStatusDetail() : ?string {
 
-        if(isset($this->_rawResponse->body['detail'])) {
+        if (isset($this->_rawResponse->body['detail'])) {
             return $this->_rawResponse->body['detail'];
         }
         return null;

src/LE_ACME2/Request/Account/AbstractLocation.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     protected function _getRawResponse() : Connector\RawResponse {
 
         $payload = $this->_getPayload();
-        if(count($payload) == 0) {
+        if (count($payload) == 0) {
             $payload['rand-' . rand(100000, 1000000)] = 1;
         }
 

src/LE_ACME2/Request/GetDirectory.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
         $result = $connector->request(
             Connector::METHOD_GET,
-             $connector->getBaseURL() . '/directory'
+                $connector->getBaseURL() . '/directory'
         );
         return new Response\GetDirectory($result);
     }

src/LE_ACME2/Request/Order/Finalize.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
         $csr = Utilities\Certificate::generateCSR($this->_order);
 
-        if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches))
+        if (preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches))
             $csr = $matches[1];
 
         $csr = trim(Utilities\Base64::UrlSafeEncode(base64_decode($csr)));

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
 
         $csr = Utilities\Certificate::generateCSR($this->_order);
 
-        if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches))
-            $csr = $matches[1];
+        if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) {
+                    $csr = $matches[1];
+        }
 
         $csr = trim(Utilities\Base64::UrlSafeEncode(base64_decode($csr)));
 

src/LE_ACME2/Request/Order/Create.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     public function getResponse() : Response\AbstractResponse {
 
         $identifiers = [];
-        foreach($this->_order->getSubjects() as $subject) {
+        foreach ($this->_order->getSubjects() as $subject) {
 
             $identifiers[] = [
                 'type' => 'dns',

src/LE_ACME2/Request/Order/GetCertificate.php

Spacing +2 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
         $this->_order = $order;
         $this->_orderResponse = $orderResponse;
 
-        if($alternativeUrl !== null) {
+        if ($alternativeUrl !== null) {
             $this->_alternativeUrl = $alternativeUrl;
         }
     }
@@ -37,8 +37,7 @@ 
     public function getResponse() : Response\AbstractResponse {
 
         $url = $this->_alternativeUrl === null ?
-            $this->_orderResponse->getCertificate() :
-            $this->_alternativeUrl;
+            $this->_orderResponse->getCertificate() : $this->_alternativeUrl;
 
         $kid = Utilities\RequestSigner::KID(
             null,

src/LE_ACME2/Account.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
 
         Utilities\Logger::getInstance()->add(
             Utilities\Logger::LEVEL_INFO,
-            get_class() . '::' . __FUNCTION__ .  ' email: "' . $email . '"'
+            get_class() . '::' . __FUNCTION__ . ' email: "' . $email . '"'
         );
 
         $account = new self($email);
@@ -58,7 +58,7 @@ 
 
             return $account;
 
-        } catch(Exception\AbstractException $e) {
+        } catch (Exception\AbstractException $e) {
 
             $account->_clearKeyDirectory();
             throw $e;
@@ -78,12 +78,12 @@ 
 
         Utilities\Logger::getInstance()->add(
             Utilities\Logger::LEVEL_INFO,
-            get_class() . '::' . __FUNCTION__ .  ' email: "' . $email . '"'
+            get_class() . '::' . __FUNCTION__ . ' email: "' . $email . '"'
         );
 
         $account = new self($email);
 
-        if(!self::exists($email))
+        if (!self::exists($email))
             throw new \RuntimeException('Keys not found - does this account exist?');
 
         return $account;
@@ -116,12 +116,12 @@ 
 
             $this->_setEmail($email);
 
-            if($previousKeyDirectoryPath != $this->getKeyDirectoryPath())
+            if ($previousKeyDirectoryPath != $this->getKeyDirectoryPath())
                 rename($previousKeyDirectoryPath, $this->getKeyDirectoryPath());
 
             return true;
 
-        } catch(Exception\InvalidResponse $e) {
+        } catch (Exception\InvalidResponse $e) {
             return false;
         }
     }
@@ -144,7 +144,7 @@ 
             rename($this->getKeyDirectoryPath() . 'public-replacement.pem', $this->getKeyDirectoryPath() . 'public.pem');
             return true;
 
-        } catch(Exception\InvalidResponse $e) {
+        } catch (Exception\InvalidResponse $e) {
 
             return false;
         }
@@ -163,7 +163,7 @@ 
 
             return true;
 
-        } catch(Exception\InvalidResponse $e) {
+        } catch (Exception\InvalidResponse $e) {
             return false;
         }
     }

Braces +6 added lines, -4 removed lines

@@ -83,8 +83,9 @@ 
 
         $account = new self($email);
 
-        if(!self::exists($email))
-            throw new \RuntimeException('Keys not found - does this account exist?');
+        if(!self::exists($email)) {
+                    throw new \RuntimeException('Keys not found - does this account exist?');
+        }
 
         return $account;
     }
@@ -116,8 +117,9 @@ 
 
             $this->_setEmail($email);
 
-            if($previousKeyDirectoryPath != $this->getKeyDirectoryPath())
-                rename($previousKeyDirectoryPath, $this->getKeyDirectoryPath());
+            if($previousKeyDirectoryPath != $this->getKeyDirectoryPath()) {
+                            rename($previousKeyDirectoryPath, $this->getKeyDirectoryPath());
+            }
 
             return true;