smarcet / JOSE4PHP

src/jwk/impl/RSAJWKFactory.php

Spacing +11 added lines, -16 removed lines

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

Braces +9 added lines, -5 removed lines

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

src/jwk/impl/RSAJWKParamsPublicKeySpecification.php

Spacing +6 added lines, -6 removed lines

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

src/jwk/impl/RSAJWKPEMKeySpecification.php

Spacing +1 added lines, -2 removed lines

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

src/jwk/impl/RSAJWKSpecification.php

Spacing +2 added lines, -3 removed lines

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

Braces +3 added lines, -2 removed lines

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

src/jwk/impl/OctetSequenceJWKSpecification.php

Spacing +2 added lines, -3 removed lines

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

Braces +3 added lines, -2 removed lines

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

src/jwk/impl/RSAJWK.php

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

src/jwk/impl/AsymmetricJWK.php

Indentation +2 added lines, -2 removed lines

@@ -95,8 +95,8 @@
     }
 
        /**
-     * @return int
-     */
+        * @return int
+        */
     public function getVisibility()
     {
         return $this->visibility;

Braces +6 added lines, -3 removed lines

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

Spacing +22 added lines, -22 removed lines

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

src/jwk/JSONWebKeyVisibility.php

Spacing +3 added lines, -3 removed lines

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

src/jwk/JSONWebKeyPublicKeyUseValues.php

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
     /**
      *
      */
-    const Signature  = 'sig';
+    const Signature = 'sig';
     /**
      *
      */
     const Encryption = 'enc';
 
-    public static $valid_uses = array ( self::Signature, self::Encryption);
+    public static $valid_uses = array(self::Signature, self::Encryption);
 }
\ No newline at end of file