smarcet / JOSE4PHP

src/jwk/impl/JWKSet.php

Spacing +16 added lines, -16 removed lines

@@ -42,11 +42,11 @@ 
      * @param JWK[] $keys
      * @throws JWKInvalidIdentifierException
      */
-    public function __construct(array $keys = array()){
+    public function __construct(array $keys = array()) {
 
         $this->set[JWKSetParameters::Keys] = new JsonArray(array());
 
-        foreach($keys as $k){
+        foreach ($keys as $k) {
             $this->addKey($k);
         }
     }
@@ -56,7 +56,7 @@ 
      */
     public function getKeys()
     {
-        if(isset($this->set[JWKSetParameters::Keys]))
+        if (isset($this->set[JWKSetParameters::Keys]))
             return $this->set[JWKSetParameters::Keys]->getValue();
         return array();
     }
@@ -70,18 +70,18 @@ 
     {
         $id = $key->getId();
 
-        if(empty($id))
+        if (empty($id))
             throw new JWKInvalidIdentifierException('key id is empty!');
 
-        if(array_key_exists($id->getValue(), $this->keys_ids))
+        if (array_key_exists($id->getValue(), $this->keys_ids))
             throw new JWKInvalidIdentifierException(sprintf('id %s already exists!'), $key->getId()->getValue());
 
-        if(!isset($this->set[JWKSetParameters::Keys]))
+        if (!isset($this->set[JWKSetParameters::Keys]))
             $this->set[JWKSetParameters::Keys] = new JsonArray(array());
 
         $keys = $this->set[JWKSetParameters::Keys];
         $keys->append($key);
-        $this->set[JWKSetParameters::Keys] = $keys ;
+        $this->set[JWKSetParameters::Keys] = $keys;
         $this->keys_ids[$id->getValue()] = $key;
     }
 
@@ -91,7 +91,7 @@ 
      */
     public function getKeyById($kid)
     {
-        if(!array_key_exists($kid, $this->keys_ids)) return null;
+        if (!array_key_exists($kid, $this->keys_ids)) return null;
         return $this->keys_ids[$kid];
     }
 
@@ -101,27 +101,27 @@ 
      * @throws InvalidJWKAlgorithm
      * @throws JWKInvalidIdentifierException
      */
-    static public function fromJson($json){
-        $json = str_replace( array("\n","\r","\t"), '', trim($json));
+    static public function fromJson($json) {
+        $json = str_replace(array("\n", "\r", "\t"), '', trim($json));
         $res  = json_decode($json, true);
-        if(!isset($res[JWKSetParameters::Keys])) throw new JWKInvalidIdentifierException;
+        if (!isset($res[JWKSetParameters::Keys])) throw new JWKInvalidIdentifierException;
         $keys = $res[JWKSetParameters::Keys];
         $jwk_set = new JWKSet;
-        foreach($keys as $key){
+        foreach ($keys as $key) {
             $kty = @$key[JSONWebKeyParameters::KeyType];
             $kid = @$key[JSONWebKeyParameters::KeyId];
             $use = @$key[JSONWebKeyParameters::PublicKeyUse];
             $alg = @$key[JSONWebKeyParameters::Algorithm];
-            if(empty($alg)) $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256;
+            if (empty($alg)) $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256;
 
-            if(empty($kty) || empty($kid) || empty($use)) continue;
+            if (empty($kty) || empty($kid) || empty($use)) continue;
 
-            if(!in_array($kty, JSONWebKeyTypes::$supported_keys)) continue;
+            if (!in_array($kty, JSONWebKeyTypes::$supported_keys)) continue;
 
             $n        = @$key[RSAKeysParameters::Modulus];
             $e        = @$key[RSAKeysParameters::Exponent];
             $x5c      = @$key[PublicJSONWebKeyParameters::X_509CertificateChain];
-            if(is_null($x5c)) $x5c = array();
+            if (is_null($x5c)) $x5c = array();
             $x5u      = @$key[PublicJSONWebKeyParameters::X_509Url];
             $x5t      = @$key[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint];
             $x5t_S256 = @$key[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint];

Braces +30 added lines, -14 removed lines

@@ -56,8 +56,9 @@ 
      */
     public function getKeys()
     {
-        if(isset($this->set[JWKSetParameters::Keys]))
-            return $this->set[JWKSetParameters::Keys]->getValue();
+        if(isset($this->set[JWKSetParameters::Keys])) {
+                    return $this->set[JWKSetParameters::Keys]->getValue();
+        }
         return array();
     }
 
@@ -70,14 +71,17 @@ 
     {
         $id = $key->getId();
 
-        if(empty($id))
-            throw new JWKInvalidIdentifierException('key id is empty!');
+        if(empty($id)) {
+                    throw new JWKInvalidIdentifierException('key id is empty!');
+        }
 
-        if(array_key_exists($id->getValue(), $this->keys_ids))
-            throw new JWKInvalidIdentifierException(sprintf('id %s already exists!'), $key->getId()->getValue());
+        if(array_key_exists($id->getValue(), $this->keys_ids)) {
+                    throw new JWKInvalidIdentifierException(sprintf('id %s already exists!'), $key->getId()->getValue());
+        }
 
-        if(!isset($this->set[JWKSetParameters::Keys]))
-            $this->set[JWKSetParameters::Keys] = new JsonArray(array());
+        if(!isset($this->set[JWKSetParameters::Keys])) {
+                    $this->set[JWKSetParameters::Keys] = new JsonArray(array());
+        }
 
         $keys = $this->set[JWKSetParameters::Keys];
         $keys->append($key);
@@ -91,7 +95,9 @@ 
      */
     public function getKeyById($kid)
     {
-        if(!array_key_exists($kid, $this->keys_ids)) return null;
+        if(!array_key_exists($kid, $this->keys_ids)) {
+         return null;
+        }
         return $this->keys_ids[$kid];
     }
 
@@ -104,7 +110,9 @@ 
     static public function fromJson($json){
         $json = str_replace( array("\n","\r","\t"), '', trim($json));
         $res  = json_decode($json, true);
-        if(!isset($res[JWKSetParameters::Keys])) throw new JWKInvalidIdentifierException;
+        if(!isset($res[JWKSetParameters::Keys])) {
+         throw new JWKInvalidIdentifierException;
+        }
         $keys = $res[JWKSetParameters::Keys];
         $jwk_set = new JWKSet;
         foreach($keys as $key){
@@ -112,16 +120,24 @@ 
             $kid = @$key[JSONWebKeyParameters::KeyId];
             $use = @$key[JSONWebKeyParameters::PublicKeyUse];
             $alg = @$key[JSONWebKeyParameters::Algorithm];
-            if(empty($alg)) $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256;
+            if(empty($alg)) {
+             $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256;
+            }
 
-            if(empty($kty) || empty($kid) || empty($use)) continue;
+            if(empty($kty) || empty($kid) || empty($use)) {
+             continue;
+            }
 
-            if(!in_array($kty, JSONWebKeyTypes::$supported_keys)) continue;
+            if(!in_array($kty, JSONWebKeyTypes::$supported_keys)) {
+             continue;
+            }
 
             $n        = @$key[RSAKeysParameters::Modulus];
             $e        = @$key[RSAKeysParameters::Exponent];
             $x5c      = @$key[PublicJSONWebKeyParameters::X_509CertificateChain];
-            if(is_null($x5c)) $x5c = array();
+            if(is_null($x5c)) {
+             $x5c = array();
+            }
             $x5u      = @$key[PublicJSONWebKeyParameters::X_509Url];
             $x5t      = @$key[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint];
             $x5t_S256 = @$key[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint];

src/jwk/impl/RSAJWKFactory.php

Spacing +11 added lines, -16 removed lines

@@ -41,30 +41,26 @@ 
     static public function build(IJWKSpecification $spec)
     {
 
-        if(is_null($spec)) throw new \InvalidArgumentException('missing spec param');
+        if (is_null($spec)) throw new \InvalidArgumentException('missing spec param');
 
         $algorithm = DigitalSignatures_MACs_Registry::getInstance()->get($spec->getAlg());
 
-        if(is_null($algorithm))
+        if (is_null($algorithm))
         {
             $algorithm = KeyManagementAlgorithms_Registry::getInstance()->get($spec->getAlg());
         }
 
-        if(is_null($algorithm))
-            throw new InvalidJWKAlgorithm
-            (
-                sprintf
-                (
+        if (is_null($algorithm))
+            throw new InvalidJWKAlgorithm(
+                sprintf(
                     'alg %s not supported!',
                     $spec->getAlg()
                 )
             );
 
-        if($algorithm->getKeyType() !== JSONWebKeyTypes::RSA)
-            throw new InvalidJWKAlgorithm
-            (
-                sprintf
-                (
+        if ($algorithm->getKeyType() !== JSONWebKeyTypes::RSA)
+            throw new InvalidJWKAlgorithm(
+                sprintf(
                     'key type %s not supported!',
                     $algorithm->getKeyType()
                 )
@@ -79,11 +75,10 @@ 
             $jwk->setKeyUse($spec->getUse());
             return $jwk;
         }
-        if($spec instanceof RSAJWKParamsPublicKeySpecification)
+        if ($spec instanceof RSAJWKParamsPublicKeySpecification)
         {
 
-            $public_key = RSAFacade::getInstance()->buildPublicKey
-            (
+            $public_key = RSAFacade::getInstance()->buildPublicKey(
                 $spec->getModulus()->toBigInt(),
                 $spec->getExponent()->toBigInt()
             );
@@ -96,7 +91,7 @@ 
 
             return $jwk;
         }
-        if($spec instanceof RSAJWKPEMPublicKeySpecification)
+        if ($spec instanceof RSAJWKPEMPublicKeySpecification)
         {
             $public_key = RSAFacade::getInstance()->buildPublicKeyFromPEM($spec->getPEM());
             $jwk = RSAJWK::fromPublicKey($public_key);

Braces +9 added lines, -5 removed lines

@@ -41,7 +41,9 @@ 
     static public function build(IJWKSpecification $spec)
     {
 
-        if(is_null($spec)) throw new \InvalidArgumentException('missing spec param');
+        if(is_null($spec)) {
+         throw new \InvalidArgumentException('missing spec param');
+        }
 
         $algorithm = DigitalSignatures_MACs_Registry::getInstance()->get($spec->getAlg());
 
@@ -50,8 +52,8 @@ 
             $algorithm = KeyManagementAlgorithms_Registry::getInstance()->get($spec->getAlg());
         }
 
-        if(is_null($algorithm))
-            throw new InvalidJWKAlgorithm
+        if(is_null($algorithm)) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -59,9 +61,10 @@ 
                     $spec->getAlg()
                 )
             );
+        }
 
-        if($algorithm->getKeyType() !== JSONWebKeyTypes::RSA)
-            throw new InvalidJWKAlgorithm
+        if($algorithm->getKeyType() !== JSONWebKeyTypes::RSA) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -69,6 +72,7 @@ 
                     $algorithm->getKeyType()
                 )
             );
+        }
 
         if ($spec instanceof RSAJWKPEMPrivateKeySpecification)
         {

src/jwk/impl/RSAJWKParamsPublicKeySpecification.php

Spacing +6 added lines, -6 removed lines

@@ -92,42 +92,42 @@
     /**
      * @return Base64urlUInt
      */
-    public function getModulus(){
+    public function getModulus() {
         return new Base64urlUInt($this->n_b64);
     }
 
     /**
      * @return Base64urlUInt
      */
-    public function getExponent(){
+    public function getExponent() {
         return new Base64urlUInt($this->e_b64);
     }
 
     /**
      * @return array
      */
-    public function getX509CertificateChain(){
+    public function getX509CertificateChain() {
         return $this->x5c;
     }
 
     /**
      * @return null|string
      */
-    public function getX509Url(){
+    public function getX509Url() {
         return $this->x5u;
     }
 
     /**
      * @return null|string
      */
-    public function getX509CertificateSHA_1_Thumbprint(){
+    public function getX509CertificateSHA_1_Thumbprint() {
         return $this->x5t;
     }
 
     /**
      * @return null|string
      */
-    public function getX509CertificateSHA_256_Thumbprint(){
+    public function getX509CertificateSHA_256_Thumbprint() {
         return $this->x5t_S256;
     }
 }
\ No newline at end of file

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwk/impl/RSAJWKPEMKeySpecification.php

Spacing +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
      * @param string $alg
      * @param string $use
      */
-    public function __construct
-    (
+    public function __construct(
         $key_pem,
         $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256,
         $use = JSONWebKeyPublicKeyUseValues::Signature

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwk/impl/RSAJWKSpecification.php

Spacing +2 added lines, -3 removed lines

@@ -32,14 +32,13 @@
      * @param string $kid
      * @throws InvalidJWKAlgorithm
      */
-    public function __construct
-    (
+    public function __construct(
         $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256,
         $use = JSONWebKeyPublicKeyUseValues::Signature,
         $kid = null
     )
     {
-        if(!empty($alg) && !in_array($alg, RSAKeysParameters::$valid_algorithms_values))
+        if (!empty($alg) && !in_array($alg, RSAKeysParameters::$valid_algorithms_values))
             throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
 
         parent::__construct($alg, $use, $kid);

Braces +3 added lines, -2 removed lines

@@ -39,8 +39,9 @@
         $kid = null
     )
     {
-        if(!empty($alg) && !in_array($alg, RSAKeysParameters::$valid_algorithms_values))
-            throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
+        if(!empty($alg) && !in_array($alg, RSAKeysParameters::$valid_algorithms_values)) {
+                    throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
+        }
 
         parent::__construct($alg, $use, $kid);
     }

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwk/impl/OctetSequenceJWKSpecification.php

Spacing +2 added lines, -3 removed lines

@@ -38,14 +38,13 @@
      * @param string $use
      * @throws InvalidJWKAlgorithm
      */
-    public function __construct
-    (
+    public function __construct(
         $shared_secret = self::GenerateSecret,
         $alg = JSONWebSignatureAndEncryptionAlgorithms::HS256,
         $use = JSONWebKeyPublicKeyUseValues::Signature
     )
     {
-        if(!in_array($alg, OctetSequenceKeysParameters::$valid_algorithms_values))
+        if (!in_array($alg, OctetSequenceKeysParameters::$valid_algorithms_values))
             throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
 
         parent::__construct($alg, $use);

Braces +3 added lines, -2 removed lines

@@ -45,8 +45,9 @@
         $use = JSONWebKeyPublicKeyUseValues::Signature
     )
     {
-        if(!in_array($alg, OctetSequenceKeysParameters::$valid_algorithms_values))
-            throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
+        if(!in_array($alg, OctetSequenceKeysParameters::$valid_algorithms_values)) {
+                    throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
+        }
 
         parent::__construct($alg, $use);
 

src/jwk/impl/AsymmetricJWK.php

Spacing +21 added lines, -21 removed lines

@@ -63,33 +63,33 @@ 
     {
         parent::__construct($headers);
 
-        if(count($headers) === 0 ) return;
+        if (count($headers) === 0) return;
 
         // certificates
-        if(in_array(PublicJSONWebKeyParameters::X_509CertificateChain, $headers) && is_array($headers[PublicJSONWebKeyParameters::X_509CertificateChain])){
+        if (in_array(PublicJSONWebKeyParameters::X_509CertificateChain, $headers) && is_array($headers[PublicJSONWebKeyParameters::X_509CertificateChain])) {
 
             // json array
-            foreach($headers[PublicJSONWebKeyParameters::X_509CertificateChain] as $x509_pem){
+            foreach ($headers[PublicJSONWebKeyParameters::X_509CertificateChain] as $x509_pem) {
                 array_push($this->x509_certificates_chain, X509CertificateFactory::buildFromPEM($x509_pem));
 
             }
 
-            if($this->checkX509CertMismatch()){
+            if ($this->checkX509CertMismatch()) {
                 throw new X509CertMismatchException;
             }
 
             $this->set[PublicJSONWebKeyParameters::X_509CertificateChain] = new JsonArray($headers[PublicJSONWebKeyParameters::X_509CertificateChain]);
         }
 
-        if(in_array(PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint, $headers)){
-            $this->set[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint] = new StringOrURI($headers[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint]) ;
+        if (in_array(PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint, $headers)) {
+            $this->set[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint] = new StringOrURI($headers[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint]);
         }
 
-        if(in_array(PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint, $headers)){
+        if (in_array(PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint, $headers)) {
             $this->set[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint] = new StringOrURI($headers[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint]);
         }
 
-        if(in_array(PublicJSONWebKeyParameters::X_509Url, $headers)){
+        if (in_array(PublicJSONWebKeyParameters::X_509Url, $headers)) {
             $this->set[PublicJSONWebKeyParameters::X_509Url] = new StringOrURI($headers[PublicJSONWebKeyParameters::X_509Url]);
         }
     }
@@ -109,7 +109,7 @@ 
      */
     public function setVisibility($visibility)
     {
-        if(!in_array($visibility, JSONWebKeyVisibility::$valid_values))
+        if (!in_array($visibility, JSONWebKeyVisibility::$valid_values))
             throw new InvalidJWKVisibilityException;
         $this->visibility = $visibility;
         return $this;
@@ -134,7 +134,7 @@ 
     /**
      * @return null | X509Certificate
      */
-    public function getX509LeafCertificate(){
+    public function getX509LeafCertificate() {
         return count($this->x509_certificates_chain) > 0 ? $this->x509_certificates_chain[0] : null;
     }
 
@@ -153,10 +153,10 @@ 
      */
     public function getX509CertificateSha1Thumbprint($fallback_on_x5c = false)
     {
-        $res = is_null($this[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint])? null : $this[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint]->getString();
-        if(empty($res) && $fallback_on_x5c){
+        $res = is_null($this[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint]) ? null : $this[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint]->getString();
+        if (empty($res) && $fallback_on_x5c) {
             $x509 = $this->getX509LeafCertificate();
-            if(!is_null($x509)){
+            if (!is_null($x509)) {
                 return $x509->getSHA_1_Thumbprint();
             }
         }
@@ -169,10 +169,10 @@ 
      */
     public function getX509CertificateSha256Thumbprint($fallback_on_x5c = false)
     {
-        $res = is_null($this[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint])? null : $this[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint]->getString();
-        if(empty($res) && $fallback_on_x5c){
+        $res = is_null($this[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint]) ? null : $this[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint]->getString();
+        if (empty($res) && $fallback_on_x5c) {
             $x509 = $this->getX509LeafCertificate();
-            if(!is_null($x509)){
+            if (!is_null($x509)) {
                 return $x509->getSHA_256_Thumbprint();
             }
         }
@@ -184,13 +184,13 @@ 
      */
     public function getX509Url()
     {
-        return is_null($this[PublicJSONWebKeyParameters::X_509Url])? null : $this[PublicJSONWebKeyParameters::X_509Url]->getString();
+        return is_null($this[PublicJSONWebKeyParameters::X_509Url]) ? null : $this[PublicJSONWebKeyParameters::X_509Url]->getString();
     }
 
     /**
      * @return bool
      */
-    protected function checkX509CertMismatch(){
+    protected function checkX509CertMismatch() {
         $x509 = $this->getX509LeafCertificate();
         return !is_null($x509) && $x509->getPublicKey() !== $this->public_key->getEncoded();
     }
@@ -200,13 +200,13 @@ 
      * @return $this
      * @throws X509CertMismatchException
      */
-    public function setX509CertificateChain(array $x5c){
+    public function setX509CertificateChain(array $x5c) {
         // json array
-        foreach($x5c as $x509_pem){
+        foreach ($x5c as $x509_pem) {
             array_push($this->x509_certificates_chain, X509CertificateFactory::buildFromPEM($x509_pem));
         }
 
-        if($this->checkX509CertMismatch()){
+        if ($this->checkX509CertMismatch()) {
             throw new X509CertMismatchException;
         }
 

Braces +6 added lines, -3 removed lines

@@ -63,7 +63,9 @@ 
     {
         parent::__construct($headers);
 
-        if(count($headers) === 0 ) return;
+        if(count($headers) === 0 ) {
+         return;
+        }
 
         // certificates
         if(in_array(PublicJSONWebKeyParameters::X_509CertificateChain, $headers) && is_array($headers[PublicJSONWebKeyParameters::X_509CertificateChain])){
@@ -109,8 +111,9 @@ 
      */
     public function setVisibility($visibility)
     {
-        if(!in_array($visibility, JSONWebKeyVisibility::$valid_values))
-            throw new InvalidJWKVisibilityException;
+        if(!in_array($visibility, JSONWebKeyVisibility::$valid_values)) {
+                    throw new InvalidJWKVisibilityException;
+        }
         $this->visibility = $visibility;
         return $this;
     }

Indentation +13 added lines, -13 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk\impl;
 
@@ -95,8 +95,8 @@ 
     }
 
        /**
-     * @return int
-     */
+        * @return int
+        */
     public function getVisibility()
     {
         return $this->visibility;

src/jwk/impl/JWK.php

Spacing +8 added lines, -8 removed lines

@@ -40,9 +40,9 @@ 
      * @throws InvalidJWKType
      * @throws InvalidJWKUseException
      */
-    protected function __construct(array $headers = array()){
+    protected function __construct(array $headers = array()) {
 
-        if(count($headers) === 0 ) return;
+        if (count($headers) === 0) return;
 
         $alg = @$headers[JSONWebKeyParameters::Algorithm];
         $this->setAlgorithm($alg);
@@ -84,7 +84,7 @@ 
      */
     public function setId($kid)
     {
-        if(!empty($kid))
+        if (!empty($kid))
             $this->set[JSONWebKeyParameters::KeyId] = new  JsonValue($kid);
         return $this;
     }
@@ -96,8 +96,8 @@ 
      */
     public function setAlgorithm($alg)
     {
-        if(!in_array($alg, JSONWebSignatureAndEncryptionAlgorithms::$header_location_alg))
-            throw new InvalidJWKAlgorithm (sprintf('alg %s', $alg));
+        if (!in_array($alg, JSONWebSignatureAndEncryptionAlgorithms::$header_location_alg))
+            throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
 
         $this->set[JSONWebKeyParameters::Algorithm] = new StringOrURI($alg);
         return $this;
@@ -110,8 +110,8 @@ 
      */
     public function setKeyUse($use)
     {
-        if(empty($use)) return $this;
-        if(!in_array($use, JSONWebKeyPublicKeyUseValues::$valid_uses))
+        if (empty($use)) return $this;
+        if (!in_array($use, JSONWebKeyPublicKeyUseValues::$valid_uses))
             throw new InvalidJWKUseException(sprintf('use %s', $use));
 
         $this->set[JSONWebKeyParameters::PublicKeyUse] = new StringOrURI($use);
@@ -125,7 +125,7 @@ 
      */
     public function setType($type)
     {
-        if(!in_array($type, JSONWebKeyTypes::$valid_keys_set))
+        if (!in_array($type, JSONWebKeyTypes::$valid_keys_set))
             throw new InvalidJWKType(sprintf('use %s', $type));
 
         $this->set[JSONWebKeyParameters::KeyType] = new StringOrURI($type);

Braces +18 added lines, -10 removed lines

@@ -42,7 +42,9 @@ 
      */
     protected function __construct(array $headers = array()){
 
-        if(count($headers) === 0 ) return;
+        if(count($headers) === 0 ) {
+         return;
+        }
 
         $alg = @$headers[JSONWebKeyParameters::Algorithm];
         $this->setAlgorithm($alg);
@@ -84,8 +86,9 @@ 
      */
     public function setId($kid)
     {
-        if(!empty($kid))
-            $this->set[JSONWebKeyParameters::KeyId] = new  JsonValue($kid);
+        if(!empty($kid)) {
+                    $this->set[JSONWebKeyParameters::KeyId] = new  JsonValue($kid);
+        }
         return $this;
     }
 
@@ -96,8 +99,9 @@ 
      */
     public function setAlgorithm($alg)
     {
-        if(!in_array($alg, JSONWebSignatureAndEncryptionAlgorithms::$header_location_alg))
-            throw new InvalidJWKAlgorithm (sprintf('alg %s', $alg));
+        if(!in_array($alg, JSONWebSignatureAndEncryptionAlgorithms::$header_location_alg)) {
+                    throw new InvalidJWKAlgorithm (sprintf('alg %s', $alg));
+        }
 
         $this->set[JSONWebKeyParameters::Algorithm] = new StringOrURI($alg);
         return $this;
@@ -110,9 +114,12 @@ 
      */
     public function setKeyUse($use)
     {
-        if(empty($use)) return $this;
-        if(!in_array($use, JSONWebKeyPublicKeyUseValues::$valid_uses))
-            throw new InvalidJWKUseException(sprintf('use %s', $use));
+        if(empty($use)) {
+         return $this;
+        }
+        if(!in_array($use, JSONWebKeyPublicKeyUseValues::$valid_uses)) {
+                    throw new InvalidJWKUseException(sprintf('use %s', $use));
+        }
 
         $this->set[JSONWebKeyParameters::PublicKeyUse] = new StringOrURI($use);
         return $this;
@@ -125,8 +132,9 @@ 
      */
     public function setType($type)
     {
-        if(!in_array($type, JSONWebKeyTypes::$valid_keys_set))
-            throw new InvalidJWKType(sprintf('use %s', $type));
+        if(!in_array($type, JSONWebKeyTypes::$valid_keys_set)) {
+                    throw new InvalidJWKType(sprintf('use %s', $type));
+        }
 
         $this->set[JSONWebKeyParameters::KeyType] = new StringOrURI($type);
         return $this;

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwk/JSONWebKeyVisibility.php

Spacing +3 added lines, -3 removed lines

@@ -23,11 +23,11 @@ 
     /**
      *
      */
-    const PublicOnly       = 1;
+    const PublicOnly = 1;
     /**
      *
      */
-    const IncludePrivate   = 2;
+    const IncludePrivate = 2;
     /**
      *
      */
@@ -36,5 +36,5 @@ 
     /**
      * @var array
      */
-    static public $valid_values = array ( self::IncludePrivate, self::IncludeSymmetric, self::PublicOnly);
+    static public $valid_values = array(self::IncludePrivate, self::IncludeSymmetric, self::PublicOnly);
 }
\ No newline at end of file