smarcet / JOSE4PHP

src/jws/impl/JWS.php

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

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;
     }
 

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);
     }

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;
     }

src/utils/factories/BasicJWTFactory.php

Spacing +4 added lines, -4 removed lines

@@ -42,18 +42,18 @@
         $segments = explode(IBasicJWT::SegmentSeparator, $compact_serialization);
         // JWSs have three segments separated by two period ('.') characters.
         // JWEs have five segments separated by four period ('.') characters.
-        switch(count($segments))
+        switch (count($segments))
         {
             case 3:
                 // JWS or unsecured one
                 $header = JOSEHeaderSerializer::deserialize($segments[0]);
-                if($header->getAlgorithm()->getString() === 'none' && empty($segments[2]))
+                if ($header->getAlgorithm()->getString() === 'none' && empty($segments[2]))
                     return UnsecuredJWT::fromCompactSerialization($compact_serialization);
-                return JWSFactory::build( new JWS_CompactFormatSpecification($compact_serialization) );
+                return JWSFactory::build(new JWS_CompactFormatSpecification($compact_serialization));
             break;
             case 5:
                 // JWE
-                return JWEFactory::build( new JWE_CompactFormatSpecification($compact_serialization) );
+                return JWEFactory::build(new JWE_CompactFormatSpecification($compact_serialization));
             break;
             default:
                 throw new InvalidCompactSerializationException;

src/utils/json_types/JsonValue.php

Spacing +2 added lines, -2 removed lines

@@ -29,14 +29,14 @@
     /**
      * @param int|string|array|bool|IJsonObject $value
      */
-    public function __construct($value){
+    public function __construct($value) {
         $this->value = $value;
     }
 
     /**
      * @return int|string|array|bool|IJsonObject
      */
-    public function getValue(){
+    public function getValue() {
         return $this->value;
     }
 

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 !(strstr($this->value, ':') === false);
     }
 
     /**
      * @return string
      */
-    public function getValue(){
+    public function getValue() {
         return $this->isUri() ? $this->getUri() : $this->getString();
     }
 }
\ No newline at end of file

src/utils/json_types/JsonArray.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  */
 class JsonArray extends JsonValue implements \ArrayAccess {
 
-    public function __construct(array $values){
+    public function __construct(array $values) {
         parent::__construct($values);
     }
 
@@ -45,7 +45,7 @@ 
             unset($this->value[$offset]);
     }
 
-    public function append($value){
+    public function append($value) {
         array_push($this->value, $value);
     }