smarcet / JOSE4PHP

src/jwk/impl/AsymmetricJWK.php

Spacing +24 added lines, -24 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,18 +179,18 @@ 
      */
     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();
-        if(is_null($x509)) return false;
+        if (is_null($x509)) return false;
         $ppk1 = $x509->getPublicKey();
         $ppk2 = $this->public_key->getStrippedEncoded();
-        return $ppk1 !== $ppk2 ;
+        return $ppk1 !== $ppk2;
     }
 
     /**
@@ -198,13 +198,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;
         }
 

Braces +9 added lines, -4 removed lines

@@ -59,7 +59,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])){
@@ -104,8 +106,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;
     }
@@ -187,7 +190,9 @@ 
      */
     protected function checkX509CertMismatch(){
         $x509 = $this->getX509LeafCertificate();
-        if(is_null($x509)) return false;
+        if(is_null($x509)) {
+         return false;
+        }
         $ppk1 = $x509->getPublicKey();
         $ppk2 = $this->public_key->getStrippedEncoded();
         return $ppk1 !== $ppk2 ;

src/security/rsa/_AbstractRSAKeyPEMFormat.php

Spacing +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
     /**
      * @return null|string
      */
-    public function getPassword():?string{
+    public function getPassword(): ?string{
         return $this->password;
     }
 
@@ -66,18 +66,18 @@ 
      * @param string $password
      * @throws RSABadPEMFormat
      */
-    public function __construct($pem_format, $password = null){
+    public function __construct($pem_format, $password = null) {
 
         $this->pem_format = $pem_format;
         $this->rsa_imp    = new RSA();
 
-        if(!empty($password)) {
+        if (!empty($password)) {
             $this->password = trim($password);
             $this->rsa_imp->setPassword($this->password);
         }
 
         $res = $this->rsa_imp->loadKey($this->pem_format, RSA::PRIVATE_FORMAT_PKCS1);
-        if(!$res) throw new RSABadPEMFormat(sprintf('pem %s',$pem_format ));
+        if (!$res) throw new RSABadPEMFormat(sprintf('pem %s', $pem_format));
 
         $this->key = PublicKeyLoader::load($this->pem_format, $this->password)->toString('raw');
 

Braces +3 added lines, -1 removed lines

@@ -77,7 +77,9 @@
         }
 
         $res = $this->rsa_imp->loadKey($this->pem_format, RSA::PRIVATE_FORMAT_PKCS1);
-        if(!$res) throw new RSABadPEMFormat(sprintf('pem %s',$pem_format ));
+        if(!$res) {
+         throw new RSABadPEMFormat(sprintf('pem %s',$pem_format ));
+        }
 
         $this->key = PublicKeyLoader::load($this->pem_format, $this->password)->toString('raw');
 

src/security/rsa/RSAFacade.php

Spacing +11 added lines, -11 removed lines

@@ -34,17 +34,17 @@ 
      */
     private $rsa_imp;
 
-    private function __construct(){
+    private function __construct() {
         $this->rsa_imp = new RSA();
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return RSAFacade
      */
-    public static function getInstance(){
-        if(!is_object(self::$instance)){
+    public static function getInstance() {
+        if (!is_object(self::$instance)) {
             self::$instance = new RSAFacade();
         }
         return self::$instance;
@@ -54,12 +54,12 @@ 
      * @param $bits
      * @return KeyPair
      */
-    public function buildKeyPair($bits){
+    public function buildKeyPair($bits) {
         $this->rsa_imp->setPrivateKeyFormat(RSA::PRIVATE_FORMAT_PKCS1);
         $this->rsa_imp->setPublicKeyFormat(RSA::PUBLIC_FORMAT_PKCS1);
 
         $list = $this->rsa_imp->createKey($bits);
-        return new KeyPair( new _RSAPublicKeyPEMFormat($list['publickey']), new _RSAPrivateKeyPEMFormat($list['privatekey']));
+        return new KeyPair(new _RSAPublicKeyPEMFormat($list['publickey']), new _RSAPrivateKeyPEMFormat($list['privatekey']));
     }
 
     /**
@@ -67,7 +67,7 @@ 
      * @param BigInteger $e
      * @return RSAPublicKey
      */
-    public function buildPublicKey(BigInteger $n, BigInteger $e){
+    public function buildPublicKey(BigInteger $n, BigInteger $e) {
 
 
         $key = PublicKeyLoader::load([
@@ -84,7 +84,7 @@ 
      * @param \Math_BigInteger $d
      * @return RSAPrivateKey
      */
-    public function buildMinimalPrivateKey(\Math_BigInteger $n, \Math_BigInteger $d){
+    public function buildMinimalPrivateKey(\Math_BigInteger $n, \Math_BigInteger $d) {
         $this->rsa_imp->modulus = $n;
         $this->rsa_imp->exponent = $d;
         $private_key_pem = $this->rsa_imp->_getPrivatePublicKey();
@@ -109,7 +109,7 @@ 
                                     BigInteger $q,
                                     BigInteger $dp,
                                     BigInteger $dq,
-                                    BigInteger $qi){
+                                    BigInteger $qi) {
 
         $private_key_pem = $this->rsa_imp->_convertPrivateKey(
             $n,
@@ -128,7 +128,7 @@ 
      * @return RSAPrivateKey
      * @throws RSABadPEMFormat
      */
-    public function buildPrivateKeyFromPEM($private_key_pem, $password = null){
+    public function buildPrivateKeyFromPEM($private_key_pem, $password = null) {
        return new _RSAPrivateKeyPEMFormat($private_key_pem, $password);
     }
 
@@ -137,7 +137,7 @@ 
      * @return RSAPublicKey
      * @throws RSABadPEMFormat
      */
-    public function buildPublicKeyFromPEM($public_key_pem){
+    public function buildPublicKeyFromPEM($public_key_pem) {
         return new _RSAPublicKeyPEMFormat($public_key_pem);
     }
 

src/security/rsa/_RSAPublicKeyPEMFormat.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
      * @param string $password
      * @throws RSABadPEMFormat
      */
-    public function __construct($pem_format, $password = null){
+    public function __construct($pem_format, $password = null) {
         parent::__construct($pem_format, $password);
         $this->e = $this->key['e'];
     }
@@ -83,9 +83,9 @@ 
      */
     public function getStrippedEncoded(): string
     {
-        $pem = preg_replace('/\-+BEGIN PUBLIC KEY\-+/','', $this->getEncoded());
-        $pem = preg_replace('/\-+END PUBLIC KEY\-+/','',$pem);
-        $pem = str_replace( array("\n","\r","\t"), '', trim($pem));
+        $pem = preg_replace('/\-+BEGIN PUBLIC KEY\-+/', '', $this->getEncoded());
+        $pem = preg_replace('/\-+END PUBLIC KEY\-+/', '', $pem);
+        $pem = str_replace(array("\n", "\r", "\t"), '', trim($pem));
         return $pem;
     }
 }
\ No newline at end of file

src/security/rsa/_RSAPrivateKeyPEMFormat.php

Spacing +5 added lines, -5 removed lines

@@ -32,11 +32,11 @@ 
      * @param string $password
      * @throws RSABadPEMFormat
      */
-    public function __construct($pem_format, $password = null){
+    public function __construct($pem_format, $password = null) {
 
         parent::__construct($pem_format, $password);
         $this->d = $this->key['d'];
-        if($this->d->toString() === $this->e->toString())
+        if ($this->d->toString() === $this->e->toString())
             throw new RSABadPEMFormat(sprintf('pem %s is a public key!', $pem_format));
     }
 
@@ -71,9 +71,9 @@ 
      */
     public function getStrippedEncoded(): string
     {
-        $pem = preg_replace('/\-+BEGIN RSA PRIVATE KEY\-+/','',$this->getEncoded());
-        $pem = preg_replace('/\-+END RSA PRIVATE KEY\-+/','',$pem);
-        $pem = str_replace( array("\n","\r","\t"), '', trim($pem));
+        $pem = preg_replace('/\-+BEGIN RSA PRIVATE KEY\-+/', '', $this->getEncoded());
+        $pem = preg_replace('/\-+END RSA PRIVATE KEY\-+/', '', $pem);
+        $pem = str_replace(array("\n", "\r", "\t"), '', trim($pem));
         return $pem;
     }
 

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
 
         parent::__construct($pem_format, $password);
         $this->d = $this->key['d'];
-        if($this->d->toString() === $this->e->toString())
-            throw new RSABadPEMFormat(sprintf('pem %s is a public key!', $pem_format));
+        if($this->d->toString() === $this->e->toString()) {
+                    throw new RSABadPEMFormat(sprintf('pem %s is a public key!', $pem_format));
+        }
     }
 
     /**