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

src/jwe/compression_algorithms/CompressionAlgorithms_Registry.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
 
     private $algorithms = array();
 
-    private function __construct(){
+    private function __construct() {
 
         $this->algorithms[CompressionAlgorithmsNames::Deflate] = new Deflate;
         $this->algorithms[CompressionAlgorithmsNames::GZip]    = new GZip;
@@ -39,13 +39,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;
@@ -55,7 +55,7 @@ 
      * @param string $alg
      * @return bool
      */
-    public function isSupported($alg){
+    public function isSupported($alg) {
         return array_key_exists($alg, $this->algorithms);
     }
 
@@ -63,8 +63,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

Spacing +5 added lines, -5 removed lines

@@ -33,11 +33,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));
     }
 
@@ -57,9 +57,9 @@ 
     public function getEncoded()
     {
         $pem = $this->rsa_imp->getPrivateKey(CRYPT_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/rsa/_RSAPublicKeyPEMFornat.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,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->rsa_imp->publicExponent;
     }
@@ -62,9 +62,9 @@ 
     public function getEncoded()
     {
         $pem = $this->rsa_imp->getPublicKey(CRYPT_RSA_PUBLIC_FORMAT_PKCS8);
-        $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;
     }
 

src/security/rsa/RSAFacade.php

Spacing +11 added lines, -11 removed lines

@@ -33,17 +33,17 @@ 
      */
     private $rsa_imp;
 
-    private function __construct(){
+    private function __construct() {
         $this->rsa_imp = new \Crypt_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;
@@ -53,12 +53,12 @@ 
      * @param $bits
      * @return KeyPair
      */
-    public function buildKeyPair($bits){
+    public function buildKeyPair($bits) {
         $this->rsa_imp->setPrivateKeyFormat(CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
         $this->rsa_imp->setPublicKeyFormat(CRYPT_RSA_PUBLIC_FORMAT_PKCS1);
 
         $list = $this->rsa_imp->createKey($bits);
-        return new KeyPair( new _RSAPublicKeyPEMFornat($list['publickey']), new _RSAPrivateKeyPEMFornat($list['privatekey']));
+        return new KeyPair(new _RSAPublicKeyPEMFornat($list['publickey']), new _RSAPrivateKeyPEMFornat($list['privatekey']));
     }
 
     /**
@@ -66,7 +66,7 @@ 
      * @param \Math_BigInteger $e
      * @return RSAPublicKey
      */
-    public function buildPublicKey(\Math_BigInteger $n, \Math_BigInteger $e){
+    public function buildPublicKey(\Math_BigInteger $n, \Math_BigInteger $e) {
         $public_key_pem = $this->rsa_imp->_convertPublicKey($n, $e);
         return new _RSAPublicKeyPEMFornat($public_key_pem);
     }
@@ -76,7 +76,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();
@@ -101,7 +101,7 @@ 
                                     \Math_BigInteger $q,
                                     \Math_BigInteger $dp,
                                     \Math_BigInteger $dq,
-                                    \Math_BigInteger $qi){
+                                    \Math_BigInteger $qi) {
 
         $private_key_pem = $this->rsa_imp->_convertPrivateKey(
             $n,
@@ -120,7 +120,7 @@ 
      * @return RSAPrivateKey
      * @throws RSABadPEMFormat
      */
-    public function buildPrivateKeyFromPEM($private_key_pem, $password = null){
+    public function buildPrivateKeyFromPEM($private_key_pem, $password = null) {
        return new _RSAPrivateKeyPEMFornat($private_key_pem, $password);
     }
 
@@ -129,7 +129,7 @@ 
      * @return RSAPublicKey
      * @throws RSABadPEMFormat
      */
-    public function buildPublicKeyFromPEM($public_key_pem){
+    public function buildPublicKeyFromPEM($public_key_pem) {
         return new _RSAPublicKeyPEMFornat($public_key_pem);
     }
 

src/security/rsa/_AbstractRSAKeyPEMFornat.php

Spacing +3 added lines, -3 removed lines

@@ -43,17 +43,17 @@
      * @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 \Crypt_RSA();
 
-        if(!empty($password))
+        if (!empty($password))
             $this->rsa_imp->setPassword($password);
 
         $res = $this->rsa_imp->loadKey($this->pem_format, CRYPT_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->n = $this->rsa_imp->modulus;
     }

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