smarcet / JOSE4PHP

src/security/KeyPair.php

Spacing +4 added lines, -4 removed lines

@@ -33,20 +33,20 @@
      * @param PublicKey $public_key
      * @param PrivateKey $private_key
      */
-    public function __construct(PublicKey $public_key, PrivateKey $private_key){
+    public function __construct(PublicKey $public_key, PrivateKey $private_key) {
 
         $this->private_key = $private_key;
-        $this->public_key   = $public_key;
+        $this->public_key = $public_key;
     }
 
     /**
      * @return PublicKey
      */
-    public function getPublic(){ return $this->public_key; }
+    public function getPublic() { return $this->public_key; }
 
     /**
      * @return PrivateKey
      */
-    public function getPrivate(){ return $this->private_key; }
+    public function getPrivate() { return $this->private_key; }
 
 }
\ No newline at end of file

src/security/x509/X509CertificateFactory.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      * @param string $pem
      * @return X509Certificate
      */
-    static public function buildFromPEM($pem){
+    static public function buildFromPEM($pem) {
         return new _X509Certificate($pem);
     }
 }
\ No newline at end of file

src/security/x509/_X509Certificate.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * @var array
      */
-    private $info  = array();
+    private $info = array();
 
     /**
      * @var \File_X509|null
@@ -39,11 +39,11 @@ 
      */
     private $original_pem = null;
 
-    public function __construct($pem){
+    public function __construct($pem) {
 
         $this->file = new \File_X509();
         $this->info = $this->file->loadX509($pem);
-        if($this->info === false) throw new InvalidX509CertificateException($pem);
+        if ($this->info === false) throw new InvalidX509CertificateException($pem);
         $this->original_pem = $pem;
     }
 
@@ -55,8 +55,8 @@ 
        return $this->original_pem;
     }
 
-    private function calculateThumbprint($alg){
-        $pem = str_replace( array("\n","\r"), '', trim($this->original_pem));
+    private function calculateThumbprint($alg) {
+        $pem = str_replace(array("\n", "\r"), '', trim($this->original_pem));
         return strtoupper(hash($alg, base64_decode($pem)));
     }
 
@@ -82,9 +82,9 @@ 
     public function getPublicKey()
     {
         $pem = (string)$this->file->getPublicKey();
-        $pem = preg_replace('/\-+BEGIN PUBLIC KEY\-+/','',$pem);
-        $pem = preg_replace('/\-+END PUBLIC KEY\-+/','',$pem);
-        $pem = str_replace( array("\n","\r","\t"), '', trim($pem));
+        $pem = preg_replace('/\-+BEGIN PUBLIC KEY\-+/', '', $pem);
+        $pem = preg_replace('/\-+END PUBLIC KEY\-+/', '', $pem);
+        $pem = str_replace(array("\n", "\r", "\t"), '', trim($pem));
         return $pem;
     }
 

Braces +3 added lines, -1 removed lines

@@ -43,7 +43,9 @@
 
         $this->file = new \File_X509();
         $this->info = $this->file->loadX509($pem);
-        if($this->info === false) throw new InvalidX509CertificateException($pem);
+        if($this->info === false) {
+         throw new InvalidX509CertificateException($pem);
+        }
         $this->original_pem = $pem;
     }
 

src/jwk/IJWK.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  * Interface IJWK
  * @package jwk
  */
-interface IJWK extends IReadOnlyJWK  {
+interface IJWK extends IReadOnlyJWK {
 
     /**
      * @param  string $kid

src/jwk/RSAKeysParameters.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
      */
     const Exponent = 'e';
 
-    public static $public_key_params = array ( self::Modulus, self::Exponent);
+    public static $public_key_params = array(self::Modulus, self::Exponent);
 
     /**
      * The "d" (private exponent) parameter contains the private exponent
@@ -79,7 +79,7 @@ 
 
 
 
-    public static $producers_private_key_params = array (
+    public static $producers_private_key_params = array(
         self::FirstPrimeFactor,
         self::SecondPrimeFactor,
         self::FirstFactorCRTExponent,

src/jwk/impl/OctetSequenceJWK.php

Spacing +5 added lines, -5 removed lines

@@ -40,14 +40,14 @@ 
     protected function __construct(Key $secret, $headers = array())
     {
 
-        if(empty($secret))
+        if (empty($secret))
             throw new InvalidOctetSequenceJWKException('secret is not set!.');
 
         $this->set[JSONWebKeyParameters::KeyType] = new StringOrURI(JSONWebKeyTypes::OctetSequence);
 
         parent::__construct($headers);
 
-        if(count($headers) === 0 ) return;
+        if (count($headers) === 0) return;
 
         $b64 = new Base64UrlRepresentation();
 
@@ -72,17 +72,17 @@ 
      * @param string $use
      * @return IJWK
      */
-    static public function fromSecret(Key $key, $alg = null, $use = JSONWebKeyPublicKeyUseValues::Signature){
+    static public function fromSecret(Key $key, $alg = null, $use = JSONWebKeyPublicKeyUseValues::Signature) {
 
         $headers = array();
 
-        if(!empty($alg)) {
+        if (!empty($alg)) {
 
             $headers[JSONWebKeyParameters::Algorithm] = $alg;
         }
 
         $headers[JSONWebKeyParameters::PublicKeyUse] = $use;
 
-        return new OctetSequenceJWK($key, $headers) ;
+        return new OctetSequenceJWK($key, $headers);
     }
 }
\ No newline at end of file

Braces +6 added lines, -3 removed lines

@@ -40,14 +40,17 @@
     protected function __construct(Key $secret, $headers = array())
     {
 
-        if(empty($secret))
-            throw new InvalidOctetSequenceJWKException('secret is not set!.');
+        if(empty($secret)) {
+                    throw new InvalidOctetSequenceJWKException('secret is not set!.');
+        }
 
         $this->set[JSONWebKeyParameters::KeyType] = new StringOrURI(JSONWebKeyTypes::OctetSequence);
 
         parent::__construct($headers);
 
-        if(count($headers) === 0 ) return;
+        if(count($headers) === 0 ) {
+         return;
+        }
 
         $b64 = new Base64UrlRepresentation();
 

src/jwk/impl/JWKSpecification.php

Spacing +2 added lines, -3 removed lines

@@ -46,8 +46,7 @@ 
      * @param string $use
      * @param null|string $kid
      */
-    public function __construct
-    (
+    public function __construct(
         $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256,
         $use = JSONWebKeyPublicKeyUseValues::Signature,
         $kid = null
@@ -58,7 +57,7 @@ 
         $this->kid  = $kid;
     }
 
-    public function getAlg(){
+    public function getAlg() {
         return $this->alg;
     }
 

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

Braces +18 added lines, -10 removed lines

@@ -41,37 +41,42 @@ 
     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))
-            $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()
                 )
             );
+        }
 
 
-        if($algorithm->getKeyType() !== JSONWebKeyTypes::OctetSequence)
-            throw new InvalidJWKAlgorithm
+        if($algorithm->getKeyType() !== JSONWebKeyTypes::OctetSequence) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -79,8 +84,11 @@ 
                     $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);