smarcet / JOSE4PHP

src/jwt/utils/JWTClaimSetSerializer.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      * @param IJWTClaimSet $claim_set
      * @return string
      */
-    public static function serialize(IJWTClaimSet $claim_set){
+    public static function serialize(IJWTClaimSet $claim_set) {
         $json = $claim_set->toJson();
         return JWTRawSerializer::serialize($json);
     }
@@ -35,7 +35,7 @@ 
      * @param $input
      * @return IJWTClaimSet
      */
-    public static function deserialize($input){
+    public static function deserialize($input) {
         $json        = JWTRawSerializer::deserialize($input);
         $raw_claims  = json_decode($json, true);
 

src/jwt/RegisteredJOSEHeaderNames.php

Spacing +3 added lines, -5 removed lines

@@ -203,17 +203,15 @@
     const Critical = 'crit';
 
 
-    public static $registered_basic_headers_set = array
-    (
+    public static $registered_basic_headers_set = array(
         self::Algorithm,
         self::Type,
         self::KeyID,
         self::ContentType,
     );
 
-    public static $registered_basic_headers_set_types = array
-    (
-        self::Algorithm   => JsonTypes::StringOrURI ,
+    public static $registered_basic_headers_set_types = array(
+        self::Algorithm   => JsonTypes::StringOrURI,
         self::Type        => JsonTypes::StringOrURI,
         self::ContentType => JsonTypes::StringOrURI,
         self::KeyID       => JsonTypes::JsonValue

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/jws/JWSFactory.php

Spacing +9 added lines, -14 removed lines

@@ -39,31 +39,26 @@ 
     static public function build(IJWS_Specification $spec)
     {
 
-        if($spec instanceof IJWS_ParamsSpecification)
+        if ($spec instanceof IJWS_ParamsSpecification)
         {
-            if($spec->getKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
-                throw new InvalidJWKType
-                (
-                    sprintf
-                    (
+            if ($spec->getKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
+                throw new InvalidJWKType(
+                    sprintf(
                         'use % not supported (sig)',
                         $spec->getKey()->getKeyUse()->getString()
                     )
                 );
 
-            if($spec->getAlg()->getString() !== $spec->getKey()->getAlgorithm()->getString())
-                throw new InvalidJWKAlgorithm
-                (
-                    sprintf
-                    (
+            if ($spec->getAlg()->getString() !== $spec->getKey()->getAlgorithm()->getString())
+                throw new InvalidJWKAlgorithm(
+                    sprintf(
                         'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to secure the JWS %s',
                         $spec->getAlg()->getString(),
                         $spec->getKey()->getAlgorithm()->getString()
                     )
                 );
 
-            $header = new JOSEHeader
-            (
+            $header = new JOSEHeader(
                 $spec->getAlg(),
                 new StringOrURI('JWT'),
                 $spec->getKey()->getId()
@@ -73,7 +68,7 @@ 
             $jws->setKey($spec->getKey());
             return $jws;
         }
-        if($spec instanceof IJWS_CompactFormatSpecification)
+        if ($spec instanceof IJWS_CompactFormatSpecification)
         {
             return JWS::fromCompactSerialization($spec->getCompactFormat());
         }

Braces +6 added lines, -4 removed lines

@@ -41,8 +41,8 @@ 
 
         if($spec instanceof IJWS_ParamsSpecification)
         {
-            if($spec->getKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
-                throw new InvalidJWKType
+            if($spec->getKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) {
+                            throw new InvalidJWKType
                 (
                     sprintf
                     (
@@ -50,9 +50,10 @@ 
                         $spec->getKey()->getKeyUse()->getString()
                     )
                 );
+            }
 
-            if($spec->getAlg()->getString() !== $spec->getKey()->getAlgorithm()->getString())
-                throw new InvalidJWKAlgorithm
+            if($spec->getAlg()->getString() !== $spec->getKey()->getAlgorithm()->getString()) {
+                            throw new InvalidJWKAlgorithm
                 (
                     sprintf
                     (
@@ -61,6 +62,7 @@ 
                         $spec->getKey()->getAlgorithm()->getString()
                     )
                 );
+            }
 
             $header = new JOSEHeader
             (

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/jws/impl/specs/JWS_ParamsSpecification.php

Spacing +3 added lines, -3 removed lines

@@ -54,12 +54,12 @@
      * @throws InvalidJWKType
      * @throws JWSInvalidPayloadException
      */
-    public function __construct(IJWK $key, StringOrURI $alg, $payload, $signature = ''){
+    public function __construct(IJWK $key, StringOrURI $alg, $payload, $signature = '') {
 
-        if(is_null($key))
+        if (is_null($key))
             throw new InvalidJWKType();
 
-        if(is_null($payload))
+        if (is_null($payload))
             throw new JWSInvalidPayloadException('missing payload');
 
         $this->key = $key;

Braces +6 added lines, -4 removed lines

@@ -56,11 +56,13 @@
      */
     public function __construct(IJWK $key, StringOrURI $alg, $payload, $signature = ''){
 
-        if(is_null($key))
-            throw new InvalidJWKType();
+        if(is_null($key)) {
+                    throw new InvalidJWKType();
+        }
 
-        if(is_null($payload))
-            throw new JWSInvalidPayloadException('missing payload');
+        if(is_null($payload)) {
+                    throw new JWSInvalidPayloadException('missing payload');
+        }
 
         $this->key = $key;
         $this->alg = $alg;

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/jws/impl/JWS.php

Indentation +16 added lines, -16 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 jws\impl;
 
@@ -305,11 +305,11 @@ 
     }
 
      /**
-     * @param IJOSEHeader $header
-     * @param IJWSPayloadSpec $payload
-     * @param string $signature
-     * @return IJWS
-     */
+      * @param IJOSEHeader $header
+      * @param IJWSPayloadSpec $payload
+      * @param string $signature
+      * @return IJWS
+      */
     static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null , $signature = '')
     {
         return new JWS($header, $payload, $signature );

Spacing +39 added lines, -51 removed lines

@@ -72,14 +72,14 @@ 
 
         $claim_set = null;
 
-        if(!is_null($payload) && $payload->isClaimSet() && $payload instanceof IJWSPayloadClaimSetSpec) {
+        if (!is_null($payload) && $payload->isClaimSet() && $payload instanceof IJWSPayloadClaimSetSpec) {
             $header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::Type, new StringOrURI('JWT')));
             $claim_set = $payload->getClaimSet();
         }
 
         parent::__construct($header, $claim_set);
 
-        if(!is_null($payload))
+        if (!is_null($payload))
             $this->setPayload($payload);
 
         $this->signature = $signature;
@@ -100,21 +100,18 @@ 
      */
     public function toCompactSerialization()
     {
-        if(!is_null($this->jwk->getId()))
+        if (!is_null($this->jwk->getId()))
             $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId()));
 
-        if($this->jwk instanceof IAsymmetricJWK)
+        if ($this->jwk instanceof IAsymmetricJWK)
         {
             // we should add the public key on the header
             $public_key = clone $this->jwk;
 
-            $this->header->addHeader
-            (
-                new JOSEHeaderParam
-                (
+            $this->header->addHeader(
+                new JOSEHeaderParam(
                     RegisteredJOSEHeaderNames::JSONWebKey,
-                    new JsonValue
-                    (
+                    new JsonValue(
                         $public_key->setVisibility(JSONWebKeyVisibility::PublicOnly)
                     )
                 )
@@ -134,32 +131,32 @@ 
     public function sign()
     {
 
-        if(is_null($this->jwk))
+        if (is_null($this->jwk))
             throw new JWSInvalidJWKException;
 
-        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
+        if ($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
             throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString()));
 
         $alg = DigitalSignatures_MACs_Registry::getInstance()->get($this->header->getAlgorithm()->getString());
 
-        if(is_null($alg))
-            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
+        if (is_null($alg))
+            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.', $this->header->getAlgorithm()->getString()));
 
-        $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
+        $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header).IBasicJWT::SegmentSeparator.$this->getEncodedPayload();
 
-        $key  = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::ComputeDigitalSignatureOrMAC);
+        $key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::ComputeDigitalSignatureOrMAC);
 
-        if($alg instanceof DigitalSignatureAlgorithm)
+        if ($alg instanceof DigitalSignatureAlgorithm)
         {
             $this->signature = $alg->sign($key, $secured_input_bytes);
         }
-        else if($alg instanceof MAC_Algorithm )
+        else if ($alg instanceof MAC_Algorithm)
         {
             $this->signature = $alg->digest($key, $secured_input_bytes);
         }
         else
         {
-            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
+            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.', $this->header->getAlgorithm()->getString()));
         }
 
         return $this;
@@ -171,16 +168,16 @@ 
      */
     public function getEncodedPayload()
     {
-        if(is_null($this->payload))
+        if (is_null($this->payload))
             throw new JWSInvalidPayloadException('payload is not set!');
 
         $enc_payload = '';
 
-        if($this->payload instanceof IJWSPayloadClaimSetSpec)
+        if ($this->payload instanceof IJWSPayloadClaimSetSpec)
         {
             $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet());
         }
-        else if($this->payload instanceof IJWSPayloadRawSpec)
+        else if ($this->payload instanceof IJWSPayloadRawSpec)
         {
             $enc_payload = JWTRawSerializer::serialize($this->payload->getRaw());
         }
@@ -234,27 +231,23 @@ 
      */
     public function verify($original_alg)
     {
-        if(is_null($this->jwk))
+        if (is_null($this->jwk))
             throw new JWSInvalidJWKException;
 
-        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
-            throw new JWSInvalidJWKException
-            (
-                sprintf
-                (
+        if ($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
+            throw new JWSInvalidJWKException(
+                sprintf(
                     'use %s not supported ',
                     $this->jwk->getKeyUse()->getString()
                 )
             );
 
-        if(is_null($this->jwk->getAlgorithm()))
+        if (is_null($this->jwk->getAlgorithm()))
             throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! ');
 
-        if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue())
-            throw new JWSInvalidJWKException
-            (
-                sprintf
-                (
+        if (!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue())
+            throw new JWSInvalidJWKException(
+                sprintf(
                     'original kid %s - current kid %s',
                     $this->header->getKeyID()->getValue(),
                     $this->jwk->getId()->getValue()
@@ -263,34 +256,30 @@ 
 
         $alg = DigitalSignatures_MACs_Registry::getInstance()->get($original_alg);
 
-        if(is_null($alg))
+        if (is_null($alg))
             throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg));
 
         $former_alg = $this->header->getAlgorithm()->getString();
 
-        if($former_alg != $original_alg)
-            throw new JWSNotSupportedAlgorithm
-            (
-                sprintf
-                (
+        if ($former_alg != $original_alg)
+            throw new JWSNotSupportedAlgorithm(
+                sprintf(
                     'former alg %s - original alg %s',
                     $former_alg,
                     $original_alg
                 )
             );
 
-        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg)
-            throw new InvalidJWKAlgorithm
-            (
-                sprintf
-                (
+        if ($this->jwk->getAlgorithm()->getValue() !== $original_alg)
+            throw new InvalidJWKAlgorithm(
+                sprintf(
                     'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to secure the JWS %s',
                     $this->jwk->getAlgorithm()->getValue(),
                     $original_alg
                 )
             );
 
-        $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
+        $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header).IBasicJWT::SegmentSeparator.$this->getEncodedPayload();
 
         // use public key / secret
         $key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::VerifyDigitalSignatureOrMAC);
@@ -311,9 +300,9 @@ 
      * @param string $signature
      * @return IJWS
      */
-    static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null , $signature = '')
+    static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null, $signature = '')
     {
-        return new JWS($header, $payload, $signature );
+        return new JWS($header, $payload, $signature);
     }
 
     /**
@@ -321,9 +310,8 @@ 
      */
     public function take()
     {
-        $payload = ($this->payload instanceof IJWSPayloadRawSpec) ?  $this->payload->getRaw() : $this->claim_set;
-        return array
-        (
+        $payload = ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw() : $this->claim_set;
+        return array(
             $this->header,
             $payload,
             $this->signature

Braces +42 added lines, -32 removed lines

@@ -79,8 +79,9 @@ 
 
         parent::__construct($header, $claim_set);
 
-        if(!is_null($payload))
-            $this->setPayload($payload);
+        if(!is_null($payload)) {
+                    $this->setPayload($payload);
+        }
 
         $this->signature = $signature;
     }
@@ -100,8 +101,9 @@ 
      */
     public function toCompactSerialization()
     {
-        if(!is_null($this->jwk->getId()))
-            $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId()));
+        if(!is_null($this->jwk->getId())) {
+                    $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId()));
+        }
 
         if($this->jwk instanceof IAsymmetricJWK)
         {
@@ -134,16 +136,19 @@ 
     public function sign()
     {
 
-        if(is_null($this->jwk))
-            throw new JWSInvalidJWKException;
+        if(is_null($this->jwk)) {
+                    throw new JWSInvalidJWKException;
+        }
 
-        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
-            throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString()));
+        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) {
+                    throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString()));
+        }
 
         $alg = DigitalSignatures_MACs_Registry::getInstance()->get($this->header->getAlgorithm()->getString());
 
-        if(is_null($alg))
-            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
+        if(is_null($alg)) {
+                    throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
+        }
 
         $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
 
@@ -152,12 +157,10 @@ 
         if($alg instanceof DigitalSignatureAlgorithm)
         {
             $this->signature = $alg->sign($key, $secured_input_bytes);
-        }
-        else if($alg instanceof MAC_Algorithm )
+        } else if($alg instanceof MAC_Algorithm )
         {
             $this->signature = $alg->digest($key, $secured_input_bytes);
-        }
-        else
+        } else
         {
             throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
         }
@@ -171,16 +174,16 @@ 
      */
     public function getEncodedPayload()
     {
-        if(is_null($this->payload))
-            throw new JWSInvalidPayloadException('payload is not set!');
+        if(is_null($this->payload)) {
+                    throw new JWSInvalidPayloadException('payload is not set!');
+        }
 
         $enc_payload = '';
 
         if($this->payload instanceof IJWSPayloadClaimSetSpec)
         {
             $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet());
-        }
-        else if($this->payload instanceof IJWSPayloadRawSpec)
+        } else if($this->payload instanceof IJWSPayloadRawSpec)
         {
             $enc_payload = JWTRawSerializer::serialize($this->payload->getRaw());
         }
@@ -234,11 +237,12 @@ 
      */
     public function verify($original_alg)
     {
-        if(is_null($this->jwk))
-            throw new JWSInvalidJWKException;
+        if(is_null($this->jwk)) {
+                    throw new JWSInvalidJWKException;
+        }
 
-        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
-            throw new JWSInvalidJWKException
+        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature) {
+                    throw new JWSInvalidJWKException
             (
                 sprintf
                 (
@@ -246,12 +250,14 @@ 
                     $this->jwk->getKeyUse()->getString()
                 )
             );
+        }
 
-        if(is_null($this->jwk->getAlgorithm()))
-            throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! ');
+        if(is_null($this->jwk->getAlgorithm())) {
+                    throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! ');
+        }
 
-        if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue())
-            throw new JWSInvalidJWKException
+        if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue()) {
+                    throw new JWSInvalidJWKException
             (
                 sprintf
                 (
@@ -260,16 +266,18 @@ 
                     $this->jwk->getId()->getValue()
                 )
             );
+        }
 
         $alg = DigitalSignatures_MACs_Registry::getInstance()->get($original_alg);
 
-        if(is_null($alg))
-            throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg));
+        if(is_null($alg)) {
+                    throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg));
+        }
 
         $former_alg = $this->header->getAlgorithm()->getString();
 
-        if($former_alg != $original_alg)
-            throw new JWSNotSupportedAlgorithm
+        if($former_alg != $original_alg) {
+                    throw new JWSNotSupportedAlgorithm
             (
                 sprintf
                 (
@@ -278,9 +286,10 @@ 
                     $original_alg
                 )
             );
+        }
 
-        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg)
-            throw new InvalidJWKAlgorithm
+        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -289,6 +298,7 @@ 
                     $original_alg
                 )
             );
+        }
 
         $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
 

src/jws/payloads/JWSPayloadFactory .php

Spacing +5 added lines, -5 removed lines

@@ -29,12 +29,12 @@ 
      * @param mixed $content
      * @return IJWSPayloadSpec
      */
-    public static function build($content){
+    public static function build($content) {
 
-        if($content instanceof IJWTClaimSet){
+        if ($content instanceof IJWTClaimSet) {
             return new _JWSPayloadClaimSetSpec($content);
         }
-        else{
+        else {
             return new _JWSPayloadRawSpec($content);
         }
     }
@@ -56,7 +56,7 @@ 
     /**
      * @param IJWTClaimSet $claim_set
      */
-    public function __construct(IJWTClaimSet $claim_set){
+    public function __construct(IJWTClaimSet $claim_set) {
         $this->claim_set = $claim_set;
     }
 
@@ -101,7 +101,7 @@ 
     /**
      * @param string $raw
      */
-    public function __construct($raw){
+    public function __construct($raw) {
         $this->raw = $raw;
     }
 

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
 
         if($content instanceof IJWTClaimSet){
             return new _JWSPayloadClaimSetSpec($content);
-        }
-        else{
+        } else{
             return new _JWSPayloadRawSpec($content);
         }
     }

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/jws/IJWS.php

Spacing +1 added lines, -1 removed lines

@@ -72,5 +72,5 @@
      * @param string $signature
      * @return IJWS
      */
-    static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null , $signature = '');
+    static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null, $signature = '');
 }
\ No newline at end of file

src/utils/services/impl/RandomNumberGeneratorService.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      */
     public function invoke()
     {
-        if(func_num_args() <= 0) throw new \RuntimeException('you must pass len as arg!');
+        if (func_num_args() <= 0) throw new \RuntimeException('you must pass len as arg!');
         $byte_len = func_get_arg(0);
         return ByteUtil::randomBytes($byte_len);
     }

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
      */
     public function invoke()
     {
-        if(func_num_args() <= 0) throw new \RuntimeException('you must pass len as arg!');
+        if(func_num_args() <= 0) {
+         throw new \RuntimeException('you must pass len as arg!');
+        }
         $byte_len = func_get_arg(0);
         return ByteUtil::randomBytes($byte_len);
     }

src/utils/services/Utils_Registry.php

Spacing +7 added lines, -7 removed lines

@@ -32,18 +32,18 @@ 
 
     private $services = array();
 
-    private function __construct(){
+    private function __construct() {
 
         $this->services[self::RandomNumberGeneratorService] = new RandomNumberGeneratorService;
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return Utils_Registry
      */
-    public static function getInstance(){
-        if(!is_object(self::$instance)){
+    public static function getInstance() {
+        if (!is_object(self::$instance)) {
             self::$instance = new Utils_Registry();
         }
         return self::$instance;
@@ -53,8 +53,8 @@ 
      * @param string $service_name
      * @return null|IService
      */
-    public function get($service_name){
-        if(!array_key_exists($service_name,  $this->services))
+    public function get($service_name) {
+        if (!array_key_exists($service_name, $this->services))
             throw new \InvalidArgumentException('unknown service!');
 
         return $this->services[$service_name];
@@ -65,7 +65,7 @@ 
      * @param IService $service
      * @return $this
      */
-    public function add($service_name, IService $service){
+    public function add($service_name, IService $service) {
         $this->services[$service_name] = $service;
         return $this;
     }

Braces +3 added lines, -2 removed lines

@@ -54,8 +54,9 @@
      * @return null|IService
      */
     public function get($service_name){
-        if(!array_key_exists($service_name,  $this->services))
-            throw new \InvalidArgumentException('unknown service!');
+        if(!array_key_exists($service_name,  $this->services)) {
+                    throw new \InvalidArgumentException('unknown service!');
+        }
 
         return $this->services[$service_name];
     }