smarcet / JOSE4PHP

src/jwe/JWEFactory.php

Spacing +11 added lines, -16 removed lines

@@ -37,41 +37,36 @@ 
     static public function build(IJWE_Specification $spec)
     {
 
-        if($spec instanceof IJWE_ParamsSpecification)
+        if ($spec instanceof IJWE_ParamsSpecification)
         {
 
-            if($spec->getRecipientKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Encryption)
-                throw new InvalidJWKType
-                (
-                    sprintf
-                    (
+            if ($spec->getRecipientKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Encryption)
+                throw new InvalidJWKType(
+                    sprintf(
                         'use %s not supported (should be "enc")',
                         $spec->getRecipientKey()->getKeyUse()->getString()
                     )
                 );
 
-            if($spec->getAlg()->getString() !== $spec->getRecipientKey()->getAlgorithm()->getString())
-                throw new InvalidJWKAlgorithm
-                (
-                    sprintf
-                    (
+            if ($spec->getAlg()->getString() !== $spec->getRecipientKey()->getAlgorithm()->getString())
+                throw new InvalidJWKAlgorithm(
+                    sprintf(
                         'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to encrypt or determine the value of the CEK %s',
                         $spec->getAlg()->getString(),
                         $spec->getRecipientKey()->getAlgorithm()->getString()
                     )
                 );
 
-            $header = new JWEJOSEHeader
-            (
+            $header = new JWEJOSEHeader(
                 $spec->getAlg(),
                 $spec->getEnc(),
                 $spec->getRecipientKey()->getId()
             );
 
             //set zip alg
-            $zip    = $spec->getZip();
+            $zip = $spec->getZip();
 
-            if(!is_null($zip))
+            if (!is_null($zip))
                 $header->setCompressionAlgorithm($zip);
 
             $jwe = JWE::fromHeaderAndPayload($header, $spec->getPayload());
@@ -81,7 +76,7 @@ 
             return $jwe;
         }
 
-        if($spec instanceof IJWE_CompactFormatSpecification)
+        if ($spec instanceof IJWE_CompactFormatSpecification)
         {
             return JWE::fromCompactSerialization($spec->getCompactFormat());
         }

Braces +9 added lines, -6 removed lines

@@ -40,8 +40,8 @@ 
         if($spec instanceof IJWE_ParamsSpecification)
         {
 
-            if($spec->getRecipientKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Encryption)
-                throw new InvalidJWKType
+            if($spec->getRecipientKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Encryption) {
+                            throw new InvalidJWKType
                 (
                     sprintf
                     (
@@ -49,9 +49,10 @@ 
                         $spec->getRecipientKey()->getKeyUse()->getString()
                     )
                 );
+            }
 
-            if($spec->getAlg()->getString() !== $spec->getRecipientKey()->getAlgorithm()->getString())
-                throw new InvalidJWKAlgorithm
+            if($spec->getAlg()->getString() !== $spec->getRecipientKey()->getAlgorithm()->getString()) {
+                            throw new InvalidJWKAlgorithm
                 (
                     sprintf
                     (
@@ -60,6 +61,7 @@ 
                         $spec->getRecipientKey()->getAlgorithm()->getString()
                     )
                 );
+            }
 
             $header = new JWEJOSEHeader
             (
@@ -71,8 +73,9 @@ 
             //set zip alg
             $zip    = $spec->getZip();
 
-            if(!is_null($zip))
-                $header->setCompressionAlgorithm($zip);
+            if(!is_null($zip)) {
+                            $header->setCompressionAlgorithm($zip);
+            }
 
             $jwe = JWE::fromHeaderAndPayload($header, $spec->getPayload());
 

src/jwe/compression_algorithms/CompressionAlgorithms_Registry.php

Braces +3 added lines, -1 removed lines

@@ -64,7 +64,9 @@
      * @return null|CompressionAlgorithm
      */
     public function get($alg){
-        if(!$this->isSupported($alg)) return null;
+        if(!$this->isSupported($alg)) {
+         return null;
+        }
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 
     private $algorithms = [];
 
-    private function __construct(){
+    private function __construct() {
 
         $this->algorithms[CompressionAlgorithmsNames::Deflate] = new Deflate;
         $this->algorithms[CompressionAlgorithmsNames::GZip]    = new GZip;
@@ -35,13 +35,13 @@ 
 
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return CompressionAlgorithms_Registry
      */
-    public static function getInstance(){
-        if(!is_object(self::$instance)){
+    public static function getInstance() {
+        if (!is_object(self::$instance)) {
             self::$instance = new CompressionAlgorithms_Registry();
         }
         return self::$instance;
@@ -51,7 +51,7 @@ 
      * @param string $alg
      * @return bool
      */
-    public function isSupported($alg){
+    public function isSupported($alg) {
         return array_key_exists($alg, $this->algorithms);
     }
 
@@ -59,8 +59,8 @@ 
      * @param $alg
      * @return null|CompressionAlgorithm
      */
-    public function get($alg){
-        if(!$this->isSupported($alg)) return null;
+    public function get($alg) {
+        if (!$this->isSupported($alg)) return null;
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

src/security/SymmetricSharedKey.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     /**
      * @param string $secret
      */
-    public function __construct($secret){
+    public function __construct($secret) {
         $this->secret = $secret;
     }
 

src/security/rsa/_RSAPrivateKeyPEMFornat.php

Braces +3 added lines, -2 removed lines

@@ -37,8 +37,9 @@
 
         parent::__construct($pem_format, $password);
         $this->d = $this->rsa_imp->exponent;
-        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));
+        }
     }
 
     /**

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->rsa_imp->exponent;
-        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));
     }
 
@@ -56,9 +56,9 @@ 
     public function getEncoded()
     {
         $pem = $this->rsa_imp->getPrivateKey(RSA::PUBLIC_FORMAT_PKCS1);
-        $pem = preg_replace('/\-+BEGIN RSA PRIVATE KEY\-+/','',$pem);
-        $pem = preg_replace('/\-+END RSA PRIVATE KEY\-+/','',$pem);
-        $pem = str_replace( array("\n","\r","\t"), '', trim($pem));
+        $pem = preg_replace('/\-+BEGIN RSA PRIVATE KEY\-+/', '', $pem);
+        $pem = preg_replace('/\-+END RSA PRIVATE KEY\-+/', '', $pem);
+        $pem = str_replace(array("\n", "\r", "\t"), '', trim($pem));
         return $pem;
     }
 

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