smarcet / JOSE4PHP

src/jws/impl/JWS.php

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

src/jwe/impl/specs/JWE_CompactFormatSpecification.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     /**
      * @param string $compact_format
      */
-    public function __construct($compact_format){
+    public function __construct($compact_format) {
         $this->compact_format = $compact_format;
     }
 

src/utils/json_types/StringOrURI.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
  */
 class StringOrURI extends JsonValue {
 
-    public function getString(){
+    public function getString() {
         return (string)$this->value;
     }
 
@@ -33,11 +33,11 @@ 
      * @throws \RuntimeException
      * @return string
      */
-    public function getUri(){
+    public function getUri() {
 
-        if($this->isString())
+        if ($this->isString())
             throw new \RuntimeException('current value is not an uri!');
-        if(filter_var($this->value, FILTER_VALIDATE_URL) === false)
+        if (filter_var($this->value, FILTER_VALIDATE_URL) === false)
             throw new \RuntimeException('current value is not an uri!');
 
         return (string)$this->value;
@@ -46,21 +46,21 @@ 
     /**
      * @return bool
      */
-    public function isString(){
+    public function isString() {
         return !$this->isUri();
     }
 
     /**
      * @return bool
      */
-    public function isUri(){
+    public function isUri() {
         return filter_var($this->value, FILTER_VALIDATE_URL) !== false;
     }
 
     /**
      * @return string
      */
-    public function getValue(){
+    public function getValue() {
         return $this->isUri() ? $this->getUri() : $this->getString();
     }
 }
\ No newline at end of file

src/jwt/impl/JWTSerializer.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
      * @param IJWTSnapshot $jwt_snapshot
      * @return string
      */
-    static public function serialize(IJWTSnapshot $jwt_snapshot){
+    static public function serialize(IJWTSnapshot $jwt_snapshot) {
         list($header, $payload, $signature) = $jwt_snapshot->take();
 
         $e_header    = JOSEHeaderSerializer::serialize($header);
@@ -46,18 +46,18 @@ 
      * @return array
      * @throws InvalidJWTException
      */
-    static public function deserialize($input){
+    static public function deserialize($input) {
 
         $e_parts = explode(IBasicJWT::SegmentSeparator, $input);
 
-        if(count($e_parts) < 2)
+        if (count($e_parts) < 2)
             throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
         $e_header    = $e_parts[0];
         $e_payload   = $e_parts[1];
-        $e_signature = count($e_parts)>2 ? $e_parts[2] : '';
+        $e_signature = count($e_parts) > 2 ? $e_parts[2] : '';
         $header    = JOSEHeaderSerializer::deserialize($e_header);
         $payload   = ($header->getType()->getString() === 'JWT') ? JWTClaimSetSerializer::deserialize($e_payload) : JWTRawSerializer::deserialize($e_payload);
-        $signature = !empty($e_signature) ? JWTRawSerializer::deserialize($e_signature): '';
+        $signature = !empty($e_signature) ? JWTRawSerializer::deserialize($e_signature) : '';
         return array($header, $payload, $signature);
     }
 }
\ No newline at end of file