smarcet / JOSE4PHP

src/jwe/impl/ContentEncryptionKeyFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
     /**
      * @param Key $management_key
-     * @param $key_management_mode
+     * @param string $key_management_mode
      * @param ContentEncryptionAlgorithm $enc
      * @return Key
      * @throws \Exception

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
                  * The CEK MUST have a length equal to that required for the
                  * content encryption algorithm.
                  */
-                $rnd       = $generator->invoke($enc->getMinKeyLen()/8);
+                $rnd       = $generator->invoke($enc->getMinKeyLen() / 8);
                 $cek       = new _ContentEncryptionKey($enc->getName(), 'RAW', $rnd);
             }
             break;
@@ -85,7 +85,7 @@ 
      * @param EncryptionAlgorithm $alg
      * @return Key
      */
-    static public function fromRaw($value, EncryptionAlgorithm $alg){
+    static public function fromRaw($value, EncryptionAlgorithm $alg) {
         return  new _ContentEncryptionKey($alg->getName(), 'RAW', $value);
     }
 }
\ 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/jwe/impl/IVFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 final class IVFactory {
 
     /**
-     * @param $size
+     * @param integer $size
      * @return string
      */
     static public function build($size){

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      * @param $size
      * @return string
      */
-    static public function build($size){
+    static public function build($size) {
 
         $generator = Utils_Registry::getInstance()->get(Utils_Registry::RandomNumberGeneratorService);
         return $generator->invoke($size / 8);

src/jwk/impl/RSAJWK.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 
     /**
      * @param PrivateKey $private_key
-     * @return IAsymmetricJWK|null
+     * @return RSAJWK
      * @throws InvalidJWKType
      */
     static public function fromPrivateKey(PrivateKey $private_key)

Spacing +5 added lines, -5 removed lines

@@ -112,10 +112,10 @@ 
      */
     static public function fromKeys(KeyPair $keys)
     {
-        if(!($keys->getPrivate() instanceof RSAPrivateKey))
+        if (!($keys->getPrivate() instanceof RSAPrivateKey))
             throw new \RuntimeException('Private key of invalid type!');
 
-        if(!($keys->getPublic() instanceof RSAPublicKey))
+        if (!($keys->getPublic() instanceof RSAPublicKey))
             throw new \RuntimeException('Public key of invalid type!');
 
         $jwk                                          = new RSAJWK();
@@ -165,7 +165,7 @@ 
      */
     public function getKey($key_op = JSONWebKeyKeyOperationsValues::ComputeDigitalSignatureOrMAC)
     {
-        switch($key_op){
+        switch ($key_op) {
             case JSONWebKeyKeyOperationsValues::ComputeDigitalSignatureOrMAC:
             case JSONWebKeyKeyOperationsValues::DecryptContentAndValidateDecryption: {
                 return $this->getPrivateKey();
@@ -177,7 +177,7 @@ 
             }
             break;
             default:{
-                throw new InvalidJWKUseException(sprintf('key_op %s',  $key_op));
+                throw new InvalidJWKUseException(sprintf('key_op %s', $key_op));
             }
             break;
         }
@@ -190,7 +190,7 @@ 
     public function toArray()
     {
         $res = parent::toArray();
-        if($this->visibility === JSONWebKeyVisibility::PublicOnly){
+        if ($this->visibility === JSONWebKeyVisibility::PublicOnly) {
             //remove private attributes
             unset($res[RSAKeysParameters::PrivateExponent]);
             unset($res[RSAKeysParameters::FirstPrimeFactor]);

Braces +21 added lines, -11 removed lines

@@ -53,11 +53,14 @@ 
 
         parent::__construct($headers);
 
-        if (count($headers) === 0) return;
+        if (count($headers) === 0) {
+         return;
+        }
 
         foreach (RSAKeysParameters::$public_key_params as $p) {
-            if (!array_key_exists($p, $headers))
-                throw new RSAJWKMissingPublicKeyParamException();
+            if (!array_key_exists($p, $headers)) {
+                            throw new RSAJWKMissingPublicKeyParamException();
+            }
             $this->set[$p] = new Base64urlUInt($headers[$p]);
         }
 
@@ -74,8 +77,9 @@ 
             //its has one private param, must have all ...
             if (in_array(RSAKeysParameters::FirstPrimeFactor, $headers)) {
                 foreach (RSAKeysParameters::$producers_private_key_params as $p) {
-                    if (!array_key_exists($p, $headers))
-                        throw new RSAJWKMissingPrivateKeyParamException();
+                    if (!array_key_exists($p, $headers)) {
+                                            throw new RSAJWKMissingPrivateKeyParamException();
+                    }
                     $this->set[$p] = new Base64urlUInt($headers[$p]);
                 }
                 $this->private_key = RSAFacade::getInstance()->buildPrivateKey(
@@ -112,11 +116,13 @@ 
      */
     static public function fromKeys(KeyPair $keys)
     {
-        if(!($keys->getPrivate() instanceof RSAPrivateKey))
-            throw new \RuntimeException('Private key of invalid type!');
+        if(!($keys->getPrivate() instanceof RSAPrivateKey)) {
+                    throw new \RuntimeException('Private key of invalid type!');
+        }
 
-        if(!($keys->getPublic() instanceof RSAPublicKey))
-            throw new \RuntimeException('Public key of invalid type!');
+        if(!($keys->getPublic() instanceof RSAPublicKey)) {
+                    throw new \RuntimeException('Public key of invalid type!');
+        }
 
         $jwk                                          = new RSAJWK();
         $jwk->public_key                              = $keys->getPublic();
@@ -134,7 +140,9 @@ 
      */
     static public function fromPublicKey(PublicKey $public_key)
     {
-        if (!($public_key instanceof RSAPublicKey)) throw new InvalidJWKType();
+        if (!($public_key instanceof RSAPublicKey)) {
+         throw new InvalidJWKType();
+        }
         $jwk = new RSAJWK();
         $jwk->public_key = $public_key;
         $jwk->set[RSAKeysParameters::Exponent] = Base64urlUInt::fromBigInt($public_key->getPublicExponent());
@@ -149,7 +157,9 @@ 
      */
     static public function fromPrivateKey(PrivateKey $private_key)
     {
-        if (!($private_key instanceof RSAPrivateKey)) throw new InvalidJWKType();
+        if (!($private_key instanceof RSAPrivateKey)) {
+         throw new InvalidJWKType();
+        }
         $jwk = new RSAJWK();
         $jwk->private_key = $private_key;
         $jwk->set[RSAKeysParameters::Exponent] = Base64urlUInt::fromBigInt($private_key->getPublicExponent());

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

Unused Use Statements -1 removed lines

@@ -39,7 +39,6 @@
 use jwt\utils\JOSEHeaderSerializer;
 use jwt\utils\JWTClaimSetSerializer;
 use jwt\utils\JWTRawSerializer;
-use utils\json_types\JsonArray;
 use utils\json_types\JsonValue;
 use utils\json_types\StringOrURI;
 

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 +38 added lines, -50 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,11 +168,11 @@ 
      */
     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->isClaimSet() && $this->payload instanceof IJWSPayloadClaimSetSpec)
+        if ($this->payload->isClaimSet() && $this->payload instanceof IJWSPayloadClaimSetSpec)
         {
             $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet());
         }
@@ -233,27 +230,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()
@@ -262,34 +255,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);
@@ -310,9 +299,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);
     }
 
     /**
@@ -320,10 +309,9 @@ 
      */
     public function take()
     {
-        $payload = $this->payload->isClaimSet() ?  $this->claim_set : $this->payload->getRaw();
+        $payload = $this->payload->isClaimSet() ? $this->claim_set : $this->payload->getRaw();
 
-        return array
-        (
+        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,15 +174,15 @@ 
      */
     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->isClaimSet() && $this->payload instanceof IJWSPayloadClaimSetSpec)
         {
             $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet());
-        }
-        else
+        } else
         {
             $enc_payload = JWTRawSerializer::serialize($this->payload->getRaw());
         }
@@ -233,11 +236,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
                 (
@@ -245,12 +249,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
                 (
@@ -259,16 +265,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
                 (
@@ -277,9 +285,10 @@ 
                     $original_alg
                 )
             );
+        }
 
-        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg)
-            throw new InvalidJWKAlgorithm
+        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -288,6 +297,7 @@ 
                     $original_alg
                 )
             );
+        }
 
         $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
 

src/jwa/cryptographic_algorithms/KeyManagementAlgorithms_Registry.php

Spacing +3 added lines, -3 removed lines

@@ -43,14 +43,14 @@ 
         $this->algorithms[JSONWebSignatureAndEncryptionAlgorithms::Dir] = new DirAlgorithm;
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return KeyManagementAlgorithms_Registry
      */
     public static function getInstance()
     {
-        if(!is_object(self::$instance))
+        if (!is_object(self::$instance))
         {
             self::$instance = new KeyManagementAlgorithms_Registry();
         }
@@ -72,7 +72,7 @@ 
      */
     public function get($alg)
     {
-        if(!$this->isSupported($alg)) return null;
+        if (!$this->isSupported($alg)) return null;
         return $this->algorithms[$alg];
     }
 }
\ 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;
 

Braces +3 added lines, -1 removed lines

@@ -64,7 +64,9 @@
      * @return null|CompressionAlgorithm
      */
     public function get($alg){
-        if(!$this->isSupported($alg)) return null;
+        if(!$this->isSupported($alg)) {
+         return null;
+        }
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

src/jwa/cryptographic_algorithms/macs/HSMAC_Algorithm.php

Spacing +5 added lines, -5 removed lines

@@ -35,10 +35,10 @@ 
      * @return string
      * @throws InvalidKeyLengthAlgorithmException
      */
-    public function digest(SharedKey $key, $message){
+    public function digest(SharedKey $key, $message) {
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if ($this->getMinKeyLen() > $key->getBitLength())
+            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $key->getBitLength()));
 
         return hash_hmac($this->getHashingAlgorithm(), $message, $key->getSecret(), true);
     }
@@ -51,8 +51,8 @@ 
      * @throws InvalidKeyLengthAlgorithmException
      * @throws InvalidKeyTypeAlgorithmException
      */
-    public function verify(Key $key, $message, $digest){
-        if(!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
+    public function verify(Key $key, $message, $digest) {
+        if (!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
 
         return $digest === $this->digest($key, $message);
     }

Braces +6 added lines, -3 removed lines

@@ -37,8 +37,9 @@ 
      */
     public function digest(SharedKey $key, $message){
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if($this->getMinKeyLen() > $key->getBitLength()) {
+                    throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        }
 
         return hash_hmac($this->getHashingAlgorithm(), $message, $key->getSecret(), true);
     }
@@ -52,7 +53,9 @@ 
      * @throws InvalidKeyTypeAlgorithmException
      */
     public function verify(Key $key, $message, $digest){
-        if(!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
+        if(!($key instanceof SharedKey)) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
         return $digest === $this->digest($key, $message);
     }

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/jwa/cryptographic_algorithms/ContentEncryptionAlgorithms_Registry.php

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
      * @return null|ContentEncryptionAlgorithm
      */
     public function get($alg) {
-        if (!$this->isSupported($alg)) return null;
+        if (!$this->isSupported($alg)) {
+         return null;
+        }
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

src/jwa/cryptographic_algorithms/digital_signatures/rsa/RSA_Algorithm.php

Spacing +8 added lines, -8 removed lines

@@ -45,14 +45,14 @@ 
      */
     public function sign(PrivateKey $private_key, $message)
     {
-        if(!($private_key instanceof RSAPrivateKey)) throw new InvalidKeyTypeAlgorithmException;
+        if (!($private_key instanceof RSAPrivateKey)) throw new InvalidKeyTypeAlgorithmException;
 
-        if($this->getMinKeyLen() > $private_key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $private_key->getBitLength()));
+        if ($this->getMinKeyLen() > $private_key->getBitLength())
+            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $private_key->getBitLength()));
 
         $res = $this->rsa_impl->loadKey($private_key->getEncoded());
 
-        if(!$res) throw new InvalidKeyTypeAlgorithmException;
+        if (!$res) throw new InvalidKeyTypeAlgorithmException;
 
         $this->rsa_impl->setHash($this->getHashingAlgorithm());
         $this->rsa_impl->setMGFHash($this->getHashingAlgorithm());
@@ -70,14 +70,14 @@ 
      */
     public function verify(Key $key, $message, $signature)
     {
-        if(!($key instanceof RSAPublicKey)) throw new InvalidKeyTypeAlgorithmException;
+        if (!($key instanceof RSAPublicKey)) throw new InvalidKeyTypeAlgorithmException;
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if ($this->getMinKeyLen() > $key->getBitLength())
+            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $key->getBitLength()));
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res) throw new InvalidKeyTypeAlgorithmException;
+        if (!$res) throw new InvalidKeyTypeAlgorithmException;
 
         $this->rsa_impl->setHash($this->getHashingAlgorithm());
         $this->rsa_impl->setMGFHash($this->getHashingAlgorithm());

Braces +18 added lines, -8 removed lines

@@ -45,14 +45,19 @@ 
      */
     public function sign(PrivateKey $private_key, $message)
     {
-        if(!($private_key instanceof RSAPrivateKey)) throw new InvalidKeyTypeAlgorithmException;
+        if(!($private_key instanceof RSAPrivateKey)) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
-        if($this->getMinKeyLen() > $private_key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $private_key->getBitLength()));
+        if($this->getMinKeyLen() > $private_key->getBitLength()) {
+                    throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $private_key->getBitLength()));
+        }
 
         $res = $this->rsa_impl->loadKey($private_key->getEncoded());
 
-        if(!$res) throw new InvalidKeyTypeAlgorithmException;
+        if(!$res) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
         $this->rsa_impl->setHash($this->getHashingAlgorithm());
         $this->rsa_impl->setMGFHash($this->getHashingAlgorithm());
@@ -70,14 +75,19 @@ 
      */
     public function verify(Key $key, $message, $signature)
     {
-        if(!($key instanceof RSAPublicKey)) throw new InvalidKeyTypeAlgorithmException;
+        if(!($key instanceof RSAPublicKey)) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if($this->getMinKeyLen() > $key->getBitLength()) {
+                    throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        }
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res) throw new InvalidKeyTypeAlgorithmException;
+        if(!$res) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
         $this->rsa_impl->setHash($this->getHashingAlgorithm());
         $this->rsa_impl->setMGFHash($this->getHashingAlgorithm());

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/jwa/cryptographic_algorithms/key_management/rsa/RSA_KeyManagementAlgorithm.php

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
     extends Abstract_RSA_Algorithm
     implements EncryptionAlgorithm, KeyEncryption {
 
-    public function __construct(){
+    public function __construct() {
 
         parent::__construct();
         //configuration ...
@@ -47,18 +47,18 @@ 
      */
     public function encrypt(Key $key, $message)
     {
-        if(!($key instanceof RSAPublicKey))
+        if (!($key instanceof RSAPublicKey))
             throw new InvalidKeyTypeAlgorithmException('key is not public');
 
-        if($key->getFormat() !== 'PKCS8')
+        if ($key->getFormat() !== 'PKCS8')
             throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
+        if (!$res)
             throw new InvalidKeyTypeAlgorithmException('could not parse the key');
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
+        if ($this->rsa_impl->getSize() < $this->getMinKeyLen())
             throw new InvalidKeyTypeAlgorithmException('len is invalid');
 
         return $this->rsa_impl->encrypt($message);
@@ -70,21 +70,21 @@ 
      * @return string
      * @throws InvalidKeyTypeAlgorithmException
      */
-    public function decrypt(Key $key, $enc_message){
+    public function decrypt(Key $key, $enc_message) {
 
-        if(!($key instanceof RSAPrivateKey))
+        if (!($key instanceof RSAPrivateKey))
             throw new InvalidKeyTypeAlgorithmException('key is not private');
 
 
-        if($key->getFormat() !== 'PKCS1')
+        if ($key->getFormat() !== 'PKCS1')
             throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
+        if (!$res)
             throw new InvalidKeyTypeAlgorithmException('could not parse the key');
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
+        if ($this->rsa_impl->getSize() < $this->getMinKeyLen())
             throw new InvalidKeyTypeAlgorithmException('len is invalid');
 
         return $this->rsa_impl->decrypt($enc_message);

Braces +24 added lines, -16 removed lines

@@ -47,19 +47,23 @@ 
      */
     public function encrypt(Key $key, $message)
     {
-        if(!($key instanceof RSAPublicKey))
-            throw new InvalidKeyTypeAlgorithmException('key is not public');
+        if(!($key instanceof RSAPublicKey)) {
+                    throw new InvalidKeyTypeAlgorithmException('key is not public');
+        }
 
-        if($key->getFormat() !== 'PKCS8')
-            throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        if($key->getFormat() !== 'PKCS8') {
+                    throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        }
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
-            throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        if(!$res) {
+                    throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        }
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
-            throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        if($this->rsa_impl->getSize() < $this->getMinKeyLen()) {
+                    throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        }
 
         return $this->rsa_impl->encrypt($message);
     }
@@ -72,20 +76,24 @@ 
      */
     public function decrypt(Key $key, $enc_message){
 
-        if(!($key instanceof RSAPrivateKey))
-            throw new InvalidKeyTypeAlgorithmException('key is not private');
+        if(!($key instanceof RSAPrivateKey)) {
+                    throw new InvalidKeyTypeAlgorithmException('key is not private');
+        }
 
 
-        if($key->getFormat() !== 'PKCS1')
-            throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        if($key->getFormat() !== 'PKCS1') {
+                    throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        }
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
-            throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        if(!$res) {
+                    throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        }
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
-            throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        if($this->rsa_impl->getSize() < $this->getMinKeyLen()) {
+                    throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        }
 
         return $this->rsa_impl->decrypt($enc_message);
     }

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;