smarcet / JOSE4PHP

src/jwk/impl/RSAJWKPEMPrivateKeySpecification.php

Spacing +2 added lines, -3 removed lines

@@ -36,15 +36,14 @@
      * @param string $alg
      * @param string $use
      */
-    public function __construct
-    (
+    public function __construct(
         $key_pem,
         $password = self::WithoutPassword,
         $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256,
         $use = JSONWebKeyPublicKeyUseValues::Signature
     )
     {
-        parent::__construct($key_pem , $alg, $use);
+        parent::__construct($key_pem, $alg, $use);
         $this->password = $password;
     }
     /**

src/jwk/impl/OctetSequenceJWKFactory.php

Spacing +15 added lines, -23 removed lines

@@ -41,28 +41,24 @@ 
     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
-        (
+        $algorithm = DigitalSignatures_MACs_Registry::getInstance()->get(
             $spec->getAlg()
         );
 
-        if(is_null($algorithm))
-            $algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get
-            (
+        if (is_null($algorithm))
+            $algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get(
                 $spec->getAlg()
             );
 
-        if(is_null($algorithm))
-            $algorithm = KeyManagementAlgorithms_Registry::getInstance()->get
-            (
+        if (is_null($algorithm))
+            $algorithm = KeyManagementAlgorithms_Registry::getInstance()->get(
                 $spec->getAlg()
             );
 
-        if(is_null($algorithm))
-            throw new InvalidJWKAlgorithm
-            (
+        if (is_null($algorithm))
+            throw new InvalidJWKAlgorithm(
                 sprintf(
                     'alg %s not supported!',
                     $spec->getAlg()
@@ -70,31 +66,27 @@ 
             );
 
 
-        if($algorithm->getKeyType() !== JSONWebKeyTypes::OctetSequence)
-            throw new InvalidJWKAlgorithm
-            (
-                sprintf
-                (
+        if ($algorithm->getKeyType() !== JSONWebKeyTypes::OctetSequence)
+            throw new InvalidJWKAlgorithm(
+                sprintf(
                     'key type %s not supported!',
                     $algorithm->getKeyType()
                 )
             );
 
-        if(!($spec instanceof OctetSequenceJWKSpecification)) throw new JWKInvalidSpecException;
+        if (!($spec instanceof OctetSequenceJWKSpecification)) throw new JWKInvalidSpecException;
 
         $shared_secret = $spec->getSharedSecret();
         $secret_len    = strlen($shared_secret);
 
-        if($secret_len === 0 )
+        if ($secret_len === 0)
         {
             $generator = Utils_Registry::getInstance()->get(Utils_Registry::RandomNumberGeneratorService);
             $shared_secret = $generator->invoke($algorithm->getMinKeyLen() / 8);
         }
 
-        return OctetSequenceJWK::fromSecret
-        (
-            new SymmetricSharedKey
-            (
+        return OctetSequenceJWK::fromSecret(
+            new SymmetricSharedKey(
                 $shared_secret
             ),
             $spec->getAlg(),

src/jwk/impl/JWKSet.php

Spacing +16 added lines, -16 removed lines

@@ -42,11 +42,11 @@ 
      * @param JWK[] $keys
      * @throws JWKInvalidIdentifierException
      */
-    public function __construct(array $keys = array()){
+    public function __construct(array $keys = array()) {
 
         $this->set[JWKSetParameters::Keys] = new JsonArray(array());
 
-        foreach($keys as $k){
+        foreach ($keys as $k) {
             $this->addKey($k);
         }
     }
@@ -56,7 +56,7 @@ 
      */
     public function getKeys()
     {
-        if(isset($this->set[JWKSetParameters::Keys]))
+        if (isset($this->set[JWKSetParameters::Keys]))
             return $this->set[JWKSetParameters::Keys]->getValue();
         return array();
     }
@@ -70,18 +70,18 @@ 
     {
         $id = $key->getId();
 
-        if(empty($id))
+        if (empty($id))
             throw new JWKInvalidIdentifierException('key id is empty!');
 
-        if(array_key_exists($id->getValue(), $this->keys_ids))
+        if (array_key_exists($id->getValue(), $this->keys_ids))
             throw new JWKInvalidIdentifierException(sprintf('id %s already exists!'), $key->getId()->getValue());
 
-        if(!isset($this->set[JWKSetParameters::Keys]))
+        if (!isset($this->set[JWKSetParameters::Keys]))
             $this->set[JWKSetParameters::Keys] = new JsonArray(array());
 
         $keys = $this->set[JWKSetParameters::Keys];
         $keys->append($key);
-        $this->set[JWKSetParameters::Keys] = $keys ;
+        $this->set[JWKSetParameters::Keys] = $keys;
         $this->keys_ids[$id->getValue()] = $key;
     }
 
@@ -91,7 +91,7 @@ 
      */
     public function getKeyById($kid)
     {
-        if(!array_key_exists($kid, $this->keys_ids)) return null;
+        if (!array_key_exists($kid, $this->keys_ids)) return null;
         return $this->keys_ids[$kid];
     }
 
@@ -101,27 +101,27 @@ 
      * @throws InvalidJWKAlgorithm
      * @throws JWKInvalidIdentifierException
      */
-    static public function fromJson($json){
-        $json = str_replace( array("\n","\r","\t"), '', trim($json));
+    static public function fromJson($json) {
+        $json = str_replace(array("\n", "\r", "\t"), '', trim($json));
         $res  = json_decode($json, true);
-        if(!isset($res[JWKSetParameters::Keys])) throw new JWKInvalidIdentifierException;
+        if (!isset($res[JWKSetParameters::Keys])) throw new JWKInvalidIdentifierException;
         $keys = $res[JWKSetParameters::Keys];
         $jwk_set = new JWKSet;
-        foreach($keys as $key){
+        foreach ($keys as $key) {
             $kty = @$key[JSONWebKeyParameters::KeyType];
             $kid = @$key[JSONWebKeyParameters::KeyId];
             $use = @$key[JSONWebKeyParameters::PublicKeyUse];
             $alg = @$key[JSONWebKeyParameters::Algorithm];
-            if(empty($alg)) $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256;
+            if (empty($alg)) $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256;
 
-            if(empty($kty) || empty($kid) || empty($use)) continue;
+            if (empty($kty) || empty($kid) || empty($use)) continue;
 
-            if(!in_array($kty, JSONWebKeyTypes::$supported_keys)) continue;
+            if (!in_array($kty, JSONWebKeyTypes::$supported_keys)) continue;
 
             $n        = @$key[RSAKeysParameters::Modulus];
             $e        = @$key[RSAKeysParameters::Exponent];
             $x5c      = @$key[PublicJSONWebKeyParameters::X_509CertificateChain];
-            if(is_null($x5c)) $x5c = array();
+            if (is_null($x5c)) $x5c = array();
             $x5u      = @$key[PublicJSONWebKeyParameters::X_509Url];
             $x5t      = @$key[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint];
             $x5t_S256 = @$key[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint];

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

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

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

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