smarcet / JOSE4PHP

src/utils/json_types/JsonValue.php

Spacing +2 added lines, -2 removed lines

@@ -29,14 +29,14 @@
     /**
      * @param int|string|array|bool|IJsonObject $value
      */
-    public function __construct($value){
+    public function __construct($value) {
         $this->value = $value;
     }
 
     /**
      * @return int|string|array|bool|IJsonObject
      */
-    public function getValue(){
+    public function getValue() {
         return $this->value;
     }
 

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/utils/json_types/StringOrURI.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
  */
 class StringOrURI extends JsonValue {
 
-    public function getString(){
+    public function getString() {
         return (string)$this->value;
     }
 
@@ -33,11 +33,11 @@ 
      * @throws \RuntimeException
      * @return string
      */
-    public function getUri(){
+    public function getUri() {
 
-        if($this->isString())
+        if ($this->isString())
             throw new \RuntimeException('current value is not an uri!');
-        if(filter_var($this->value, FILTER_VALIDATE_URL) === false)
+        if (filter_var($this->value, FILTER_VALIDATE_URL) === false)
             throw new \RuntimeException('current value is not an uri!');
 
         return (string)$this->value;
@@ -46,21 +46,21 @@ 
     /**
      * @return bool
      */
-    public function isString(){
+    public function isString() {
         return !$this->isUri();
     }
 
     /**
      * @return bool
      */
-    public function isUri(){
+    public function isUri() {
         return !(strstr($this->value, ':') === false);
     }
 
     /**
      * @return string
      */
-    public function getValue(){
+    public function getValue() {
         return $this->isUri() ? $this->getUri() : $this->getString();
     }
 }
\ No newline at end of file

Braces +6 added lines, -4 removed lines

@@ -35,10 +35,12 @@
      */
     public function getUri(){
 
-        if($this->isString())
-            throw new \RuntimeException('current value is not an uri!');
-        if(filter_var($this->value, FILTER_VALIDATE_URL) === false)
-            throw new \RuntimeException('current value is not an uri!');
+        if($this->isString()) {
+                    throw new \RuntimeException('current value is not an uri!');
+        }
+        if(filter_var($this->value, FILTER_VALIDATE_URL) === false) {
+                    throw new \RuntimeException('current value is not an uri!');
+        }
 
         return (string)$this->value;
     }

src/utils/json_types/JsonArray.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  */
 class JsonArray extends JsonValue implements \ArrayAccess {
 
-    public function __construct(array $values){
+    public function __construct(array $values) {
         parent::__construct($values);
     }
 
@@ -45,7 +45,7 @@ 
             unset($this->value[$offset]);
     }
 
-    public function append($value){
+    public function append($value) {
         array_push($this->value, $value);
     }
 

Braces +3 added lines, -2 removed lines

@@ -41,8 +41,9 @@
 
     public function offsetUnset($offset)
     {
-        if ($this->offsetExists($offset))
-            unset($this->value[$offset]);
+        if ($this->offsetExists($offset)) {
+                    unset($this->value[$offset]);
+        }
     }
 
     public function append($value){

src/utils/json_types/JsonObject.php

Spacing +10 added lines, -10 removed lines

@@ -57,11 +57,11 @@ 
     {
         $input = $this->toArray();
         $json  = json_encode($input);
-        $json  = str_replace('\/','/', $json);
+        $json  = str_replace('\/', '/', $json);
 
         if (function_exists('json_last_error') && $errno = json_last_error()) {
             self::handleJsonError($errno);
-        } elseif ($json === 'null' ) {
+        } elseif ($json === 'null') {
             throw new JsonParseException('Null resul with non-null input');
         }
         return $json;
@@ -81,7 +81,7 @@ 
         throw new JsonParseException(
             isset($messages[$errno])
                 ? $messages[$errno]
-                : 'Unknown JSON error: ' . $errno
+                : 'Unknown JSON error: '.$errno
         );
     }
 
@@ -92,12 +92,12 @@ 
     {
        $res = array();
 
-       foreach($this->set as $key => $val){
-           if($val instanceof JsonValue){
+       foreach ($this->set as $key => $val) {
+           if ($val instanceof JsonValue) {
                $res[$key] = $val->getValue();
-               if($res[$key] instanceof JsonObject)
+               if ($res[$key] instanceof JsonObject)
                    $res[$key] = $res[$key]->toArray();
-               if(is_array($res[$key])){
+               if (is_array($res[$key])) {
                    $res[$key] = $this->processArray($res[$key]);
                }
 
@@ -106,10 +106,10 @@ 
        return $res;
     }
 
-    private function processArray($original){
+    private function processArray($original) {
         $temp = array();
-        foreach($original as $k => $val){
-            if($val instanceof JsonObject)
+        foreach ($original as $k => $val) {
+            if ($val instanceof JsonObject)
                 $val = $val->toArray();
             $temp[$k] = $val;
         }

Braces +6 added lines, -4 removed lines

@@ -95,8 +95,9 @@ 
        foreach($this->set as $key => $val){
            if($val instanceof JsonValue){
                $res[$key] = $val->getValue();
-               if($res[$key] instanceof JsonObject)
-                   $res[$key] = $res[$key]->toArray();
+               if($res[$key] instanceof JsonObject) {
+                                  $res[$key] = $res[$key]->toArray();
+               }
                if(is_array($res[$key])){
                    $res[$key] = $this->processArray($res[$key]);
                }
@@ -109,8 +110,9 @@ 
     private function processArray($original){
         $temp = array();
         foreach($original as $k => $val){
-            if($val instanceof JsonObject)
-                $val = $val->toArray();
+            if($val instanceof JsonObject) {
+                            $val = $val->toArray();
+            }
             $temp[$k] = $val;
         }
         return $temp;

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/utils/ByteUtil.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
      * @param int $byte_len
      * @return int
      */
-    static public function bitLength($byte_len){
+    static public function bitLength($byte_len) {
         return $byte_len * 8;
     }
 
@@ -32,7 +32,7 @@ 
      * @param int $byte_len
      * @return String
      */
-    static public function randomBytes($byte_len){
+    static public function randomBytes($byte_len) {
         return crypt_random_string($byte_len);
     }
 
@@ -40,10 +40,10 @@ 
      * @param array $oct
      * @return string
      */
-    static public function convertHalfWordArrayToBin(array $oct){
+    static public function convertHalfWordArrayToBin(array $oct) {
         $hex = '';
-        foreach($oct as $b){
-            $hex .= str_pad(dechex($b),2,'0',STR_PAD_LEFT);
+        foreach ($oct as $b) {
+            $hex .= str_pad(dechex($b), 2, '0', STR_PAD_LEFT);
         }
         return self::hex2bin($hex);
     }
@@ -52,15 +52,15 @@ 
      * @param int $nbr
      * @return string
      */
-    static public function convert2UnsignedLongBE($nbr){
-        $hex = str_pad(dechex($nbr),16,'0',STR_PAD_LEFT);
+    static public function convert2UnsignedLongBE($nbr) {
+        $hex = str_pad(dechex($nbr), 16, '0', STR_PAD_LEFT);
         return self::hex2bin($hex);
     }
 
-    static public function hex2bin($hex_string){
-        if ( function_exists( 'hex2bin' ) ){
+    static public function hex2bin($hex_string) {
+        if (function_exists('hex2bin')) {
             return hex2bin($hex_string);
         }
-        return pack("H*" , $hex_string);
+        return pack("H*", $hex_string);
     }
 }
\ No newline at end of file

src/utils/Base64UrlRepresentation.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * Class Base64UrlRepresentation
  * @package utils
  */
-final class Base64UrlRepresentation implements IObjectRepresentation{
+final class Base64UrlRepresentation implements IObjectRepresentation {
 
     const Padding = 4;
     /**

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/JWEJOSEHeaderFactory.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
  */
 final class JWEJOSEHeaderFactory {
 
-    static protected function getProductClass(){
+    static protected function getProductClass() {
         return  '\jwe\impl\JWEJOSEHeader';
     }
 
@@ -31,16 +31,16 @@ 
      * @param array $raw_headers
      * @return IJWEJOSEHeader
      */
-    public static function build(array $raw_headers){
+    public static function build(array $raw_headers) {
 
         $args = array();
 
-        foreach(RegisteredJWEJOSEHeaderNames::$registered_basic_headers_set as $header_name){
+        foreach (RegisteredJWEJOSEHeaderNames::$registered_basic_headers_set as $header_name) {
             $value = isset($raw_headers[$header_name]) ? $raw_headers[$header_name] : null;
             $type  = @RegisteredJWEJOSEHeaderNames::$registered_basic_headers_set_types[$header_name];
-            if(!is_null($value))
+            if (!is_null($value))
             {
-                if(is_null($type)) continue;
+                if (is_null($type)) continue;
                 $class    = new \ReflectionClass($type);
                 $value    = $class->newInstanceArgs(array($value));
             }
@@ -54,7 +54,7 @@ 
 
         // unregistered headers
 
-        foreach($raw_headers as $k => $v){
+        foreach ($raw_headers as $k => $v) {
             $basic_header->addHeader(new JOSEHeaderParam($k, new JsonValue($v)));
         }
 

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
             $type  = @RegisteredJWEJOSEHeaderNames::$registered_basic_headers_set_types[$header_name];
             if(!is_null($value))
             {
-                if(is_null($type)) continue;
+                if(is_null($type)) {
+                 continue;
+                }
                 $class    = new \ReflectionClass($type);
                 $value    = $class->newInstanceArgs(array($value));
             }

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/JWEJOSEHeader.php

Spacing +2 added lines, -3 removed lines

@@ -36,8 +36,7 @@ 
      * @param StringOrURI|null $type
      * @param StringOrURI|null $cty
      */
-    public function __construct
-    (
+    public function __construct(
         StringOrURI $alg,
         StringOrURI $enc,
         JsonValue   $kid  = null,
@@ -50,7 +49,7 @@ 
 
         $this->set[RegisteredJWEJOSEHeaderNames::EncryptionAlgorithm] = $enc;
 
-        if(!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue()))
+        if (!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue()))
             $this->set[RegisteredJWEJOSEHeaderNames::CompressionAlgorithm] = $zip;
     }
 

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 
         $this->set[RegisteredJWEJOSEHeaderNames::EncryptionAlgorithm] = $enc;
 
-        if(!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue()))
-            $this->set[RegisteredJWEJOSEHeaderNames::CompressionAlgorithm] = $zip;
+        if(!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue())) {
+                    $this->set[RegisteredJWEJOSEHeaderNames::CompressionAlgorithm] = $zip;
+        }
     }
 
     /**

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/JWESerializer.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         return sprintf('%s.%s.%s.%s.%s', $header, $enc_cek, $iv, $cipher_text, $tag);
     }
 
-    static public function deserialize($input){
+    static public function deserialize($input) {
         $parts = explode(IBasicJWT::SegmentSeparator, $input);
         if (count($parts) !== 5) throw new JWEInvalidCompactFormatException;
 

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 
     static public function deserialize($input){
         $parts = explode(IBasicJWT::SegmentSeparator, $input);
-        if (count($parts) !== 5) throw new JWEInvalidCompactFormatException;
+        if (count($parts) !== 5) {
+         throw new JWEInvalidCompactFormatException;
+        }
 
         $header = JWEJOSEHeaderSerializer::deserialize($parts[0]);
         $enc_cek = JWTRawSerializer::deserialize($parts[1]);

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;