smarcet / JOSE4PHP

src/jwe/impl/specs/JWE_ParamsSpecification.php

Spacing +3 added lines, -3 removed lines

@@ -63,13 +63,13 @@
      * @throws JWEInvalidPayloadException
      * @throws JWEInvalidRecipientKeyException
      */
-    public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload,  JsonValue $zip = null)
+    public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload, JsonValue $zip = null)
     {
 
-        if(is_null($key))
+        if (is_null($key))
             throw new JWEInvalidRecipientKeyException();
 
-        if(is_null($payload))
+        if (is_null($payload))
             throw new JWEInvalidPayloadException('missing payload');
 
         $this->key     = $key;

Braces +6 added lines, -4 removed lines

@@ -66,11 +66,13 @@
     public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload,  JsonValue $zip = null)
     {
 
-        if(is_null($key))
-            throw new JWEInvalidRecipientKeyException();
+        if(is_null($key)) {
+                    throw new JWEInvalidRecipientKeyException();
+        }
 
-        if(is_null($payload))
-            throw new JWEInvalidPayloadException('missing payload');
+        if(is_null($payload)) {
+                    throw new JWEInvalidPayloadException('missing payload');
+        }
 
         $this->key     = $key;
         $this->alg     = $alg;

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwe/impl/_ContentEncryptionKey.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      * @param string $format
      * @param string $value
      */
-    public function __construct($alg, $format, $value){
+    public function __construct($alg, $format, $value) {
         $this->alg    = $alg;
         $this->format = $format;
         $this->value  = $value;

src/jwe/RegisteredJWEJOSEHeaderNames.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
     const CompressionAlgorithm = 'zip';
 
 
-    public static $registered_basic_headers_set = array (
+    public static $registered_basic_headers_set = array(
         self::Algorithm,
         self::EncryptionAlgorithm,
         self::KeyID,
@@ -73,8 +73,8 @@ 
         self::ContentType,
     );
 
-    public static $registered_basic_headers_set_types = array (
-        self::Algorithm            => JsonTypes::StringOrURI ,
+    public static $registered_basic_headers_set_types = array(
+        self::Algorithm            => JsonTypes::StringOrURI,
         self::Type                 => JsonTypes::StringOrURI,
         self::ContentType          => JsonTypes::StringOrURI,
         self::KeyID                => JsonTypes::JsonValue,

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwe/KeyManagementModeValues.php

Spacing +2 added lines, -2 removed lines

@@ -24,9 +24,9 @@
 
     const KeyWrapping = 'wrap';
 
-    const DirectKeyAgreement ='agree';
+    const DirectKeyAgreement = 'agree';
 
-    const KeyAgreementWithKeyWrapping ='agree_wrap';
+    const KeyAgreementWithKeyWrapping = 'agree_wrap';
 
     const DirectEncryption = 'dir';
 }
\ No newline at end of file

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

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

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

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

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

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));
+        }
     }
 
     /**

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

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

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;