fbett / le-acme2-php

src/LE_ACME2/Response/Authorization/Get.php

Spacing +10 added lines, -10 removed lines

@@ -32,24 +32,24 @@
      */
     public function getChallenge(string $type) : ?Struct\Challenge {
 
-        foreach($this->getChallenges() as $challenge) {
+        foreach ($this->getChallenges() as $challenge) {
 
-            if($type == $challenge['type']) {
+            if ($type == $challenge['type']) {
 
                 $error = null;
-                if(isset($challenge[ 'error' ]) && $challenge[ 'error' ] != "") {
+                if (isset($challenge['error']) && $challenge['error'] != "") {
                     $error = new Struct\ChallengeError(
-                        $challenge[ 'error' ][ 'type' ],
-                        $challenge[ 'error' ][ 'detail' ],
-                        $challenge[ 'error' ][ 'status' ],
+                        $challenge['error']['type'],
+                        $challenge['error']['detail'],
+                        $challenge['error']['status'],
                     );
                 }
 
                 return new Struct\Challenge(
-                    $challenge[ 'type' ],
-                    $challenge[ 'status' ],
-                    $challenge[ 'url' ],
-                    $challenge[ 'token' ],
+                    $challenge['type'],
+                    $challenge['status'],
+                    $challenge['url'],
+                    $challenge['token'],
                     $error,
                 );
             }

src/LE_ACME2/Response/Authorization/AbstractAuthorization.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      */
     protected function _isValid() : bool {
 
-        if($this->_preg_match_headerLine('/^HTTP\/.* 404/i') !== null) {
+        if ($this->_preg_match_headerLine('/^HTTP\/.* 404/i') !== null) {
             throw new Exception\ExpiredAuthorization();
         }
 

src/LE_ACME2/Response/AbstractResponse.php

Spacing +5 added lines, -5 removed lines

@@ -23,10 +23,10 @@ 
 
         $this->_raw = $raw;
 
-        if($this->_isRateLimitReached()) {
+        if ($this->_isRateLimitReached()) {
 
             $detail = "";
-            if(isset($raw->body['type']) && $raw->body['type'] == 'urn:ietf:params:acme:error:rateLimited') {
+            if (isset($raw->body['type']) && $raw->body['type'] == 'urn:ietf:params:acme:error:rateLimited') {
                 $detail = $raw->body['detail'];
             }
 
@@ -34,7 +34,7 @@ 
         }
 
         $result = $this->_isValid();
-        if(!$result) {
+        if (!$result) {
 
             $responseStatus = $this->_preg_match_headerLine('/^HTTP\/.* [0-9]{3,} /i');
             throw new Exception\InvalidResponse(
@@ -46,9 +46,9 @@ 
 
     protected function _preg_match_headerLine(string $pattern) : ?array {
 
-        foreach($this->_raw->header as $line) {
+        foreach ($this->_raw->header as $line) {
 
-            if(preg_match($pattern, $line, $matches) === 1)
+            if (preg_match($pattern, $line, $matches) === 1)
                 return $matches;
         }
         return null;

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
 
         foreach($this->_raw->header as $line) {
 
-            if(preg_match($pattern, $line, $matches) === 1)
-                return $matches;
+            if(preg_match($pattern, $line, $matches) === 1) {
+                            return $matches;
+            }
         }
         return null;
     }

src/LE_ACME2/Utilities/RequestSigner.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
         $payload64 = Base64::UrlSafeEncode(str_replace('\\/', '/', json_encode($payload)));
         $protected64 = Base64::UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+        openssl_sign($protected64 . '.' . $payload64, $signed, $privateKey, "SHA256");
         $signed64 = Base64::UrlSafeEncode($signed);
 
         $data = array(
@@ -98,7 +98,7 @@ 
         $payload64 = Base64::UrlSafeEncode($payload);
         $protected64 = Base64::UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+        openssl_sign($protected64 . '.' . $payload64, $signed, $privateKey, "SHA256");
         $signed64 = Base64::UrlSafeEncode($signed);
 
         $data = [

src/LE_ACME2/Utilities/Certificate.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
             "commonName" => $order->getSubjects()[0]
         ];
 
-        $san = implode(",", array_map(function ($dns) {
+        $san = implode(",", array_map(function($dns) {
 
                 return "DNS:" . $dns;
             }, $order->getSubjects())
@@ -50,7 +50,7 @@ 
 			subjectAltName = ' . $san . '
 			keyUsage = nonRepudiation, digitalSignature, keyEncipherment';
 
-        if(self::$_featureOCSPMustStapleEnabled) {
+        if (self::$_featureOCSPMustStapleEnabled) {
             $config .= PHP_EOL . 'tlsfeature=status_request';
         }
 
@@ -60,7 +60,7 @@ 
             file_get_contents($order->getKeyDirectoryPath() . 'private.pem')
         );
 
-        if($privateKey === false) {
+        if ($privateKey === false) {
             throw new OpenSSLException('openssl_pkey_get_private');
         }
 
@@ -73,11 +73,11 @@ 
             ]
         );
 
-        if($csr === false) {
+        if ($csr === false) {
             throw new OpenSSLException('openssl_csr_new');
         }
 
-        if(!openssl_csr_export($csr, $csr)) {
+        if (!openssl_csr_export($csr, $csr)) {
             throw new OpenSSLException('openssl_csr_export');
         }
 

src/LE_ACME2/Utilities/ChallengeHTTP.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
         $response = curl_exec($handle);
 
-        if(curl_errno($handle)) {
+        if (curl_errno($handle)) {
 
             throw new Exception\HTTPAuthorizationInvalid(
                 'Error while testing HTTP challenge for "' . $domain . '"": ' .
@@ -31,7 +31,7 @@ 
         }
 
         $statusCode = curl_getinfo($handle, CURLINFO_HTTP_CODE);
-        if(substr($statusCode, 0, 1) != 2) {
+        if (substr($statusCode, 0, 1) != 2) {
             throw new Exception\HTTPAuthorizationInvalid(
                 'Error while testing HTTP challenge for "' . $domain . '"": ' .
                 $domain . '/.well-known/acme-challenge/' . $token .
@@ -39,7 +39,7 @@ 
             );
         }
 
-        if($response === false) {
+        if ($response === false) {
             throw new Exception\HTTPAuthorizationInvalid(
                 'HTTP challenge for "' . $domain . '"": ' .
                 $domain . '/.well-known/acme-challenge/' . $token .

src/LE_ACME2/Utilities/Logger.php

Spacing +8 added lines, -8 removed lines

@@ -37,16 +37,16 @@ 
      */
     public function add(int $level, string $message, array $data = array()) {
 
-        if($level > $this->_desiredLevel)
+        if ($level > $this->_desiredLevel)
             return;
 
-        if($this->_psrLogger) {
+        if ($this->_psrLogger) {
 
-            if($level == self::LEVEL_INFO) {
+            if ($level == self::LEVEL_INFO) {
                 $this->_psrLogger->info($message, $data);
                 return;
             }
-            if($level == self::LEVEL_DEBUG) {
+            if ($level == self::LEVEL_DEBUG) {
                 $this->_psrLogger->debug($message, $data);
                 return;
             }
@@ -59,12 +59,12 @@ 
 
         $output = '<b>' . date('d-m-Y H:i:s') . ': ' . $message . '</b><br>' . "\n";
 
-        if($this->_desiredLevel == self::LEVEL_DEBUG) {
+        if ($this->_desiredLevel == self::LEVEL_DEBUG) {
 
             $step = 0;
             foreach ($trace as $traceItem) {
 
-                if(!isset($traceItem['class']) || !isset($traceItem['function'])) {
+                if (!isset($traceItem['class']) || !isset($traceItem['function'])) {
                     continue;
                 }
 
@@ -73,12 +73,12 @@ 
             }
 
             if ((is_array($data) && count($data) > 0) || !is_array($data))
-                $output .= "\n" .'<br/>Data:<br/>' . "\n" . '<pre>' . var_export($data, true) . '</pre>';
+                $output .= "\n" . '<br/>Data:<br/>' . "\n" . '<pre>' . var_export($data, true) . '</pre>';
 
             $output .= '<br><br>' . "\n\n";
         }
 
-        if(PHP_SAPI == 'cli') {
+        if (PHP_SAPI == 'cli') {
 
             $output = strip_tags($output);
         }

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
      */
     public function add(int $level, string $message, array $data = array()) {
 
-        if($level > $this->_desiredLevel)
-            return;
+        if($level > $this->_desiredLevel) {
+                    return;
+        }
 
         if($this->_psrLogger) {
 
@@ -72,8 +73,9 @@ 
                 $step++;
             }
 
-            if ((is_array($data) && count($data) > 0) || !is_array($data))
-                $output .= "\n" .'<br/>Data:<br/>' . "\n" . '<pre>' . var_export($data, true) . '</pre>';
+            if ((is_array($data) && count($data) > 0) || !is_array($data)) {
+                            $output .= "\n" .'<br/>Data:<br/>' . "\n" . '<pre>' . var_export($data, true) . '</pre>';
+            }
 
             $output .= '<br><br>' . "\n\n";
         }

src/LE_ACME2/Utilities/KeyGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
             "private_key_bits" => 4096,
         ]);
 
-        if(!openssl_pkey_export($res, $privateKey))
+        if (!openssl_pkey_export($res, $privateKey))
             throw new \RuntimeException("RSA keypair export failed!");
 
         $details = openssl_pkey_get_details($res);
@@ -26,7 +26,7 @@ 
         file_put_contents($directory . $privateKeyFile, $privateKey);
         file_put_contents($directory . $publicKeyFile, $details['key']);
 
-        if(PHP_MAJOR_VERSION < 8) {
+        if (PHP_MAJOR_VERSION < 8) {
             // deprecated after PHP 8.0.0 and not needed anymore
             openssl_pkey_free($res);
         }
@@ -49,7 +49,7 @@ 
             "curve_name" => "prime256v1",
         ]);
 
-        if(!openssl_pkey_export($res, $privateKey))
+        if (!openssl_pkey_export($res, $privateKey))
             throw new \RuntimeException("EC keypair export failed!");
 
         $details = openssl_pkey_get_details($res);
@@ -57,7 +57,7 @@ 
         file_put_contents($directory . $privateKeyFile, $privateKey);
         file_put_contents($directory . $publicKeyFile, $details['key']);
 
-        if(PHP_MAJOR_VERSION < 8) {
+        if (PHP_MAJOR_VERSION < 8) {
             // deprecated after PHP 8.0.0 and not needed anymore
             openssl_pkey_free($res);
         }

Braces +9 added lines, -6 removed lines

@@ -18,8 +18,9 @@ 
             "private_key_bits" => 4096,
         ]);
 
-        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);
 
@@ -41,16 +42,18 @@ 
      */
     public static function EC(string $directory, string $privateKeyFile = 'private.pem', string $publicKeyFile = 'public.pem') {
 
-        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");
+        }
 
         $res = openssl_pkey_new([
             "private_key_type" => OPENSSL_KEYTYPE_EC,
             "curve_name" => "prime256v1",
         ]);
 
-        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);
 

src/LE_ACME2/Utilities/Event.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
      */
     public function subscribe(string $event, callable $callable) : void {
 
-        if(!isset($this->_subscriber[$event])) {
+        if (!isset($this->_subscriber[$event])) {
             $this->_subscriber[$event] = [];
         }
 
@@ -29,11 +29,11 @@ 
 
         Logger::getInstance()->add(Logger::LEVEL_DEBUG, 'Event triggered: ' . $event);
 
-        if(!$this->_subscriber[$event]) {
+        if (!$this->_subscriber[$event]) {
             return;
         }
 
-        foreach($this->_subscriber[$event] as $callable) {
+        foreach ($this->_subscriber[$event] as $callable) {
             $callable($event, $payload);
         }
     }