@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class JsonArray extends JsonValue implements \ArrayAccess { |
| 22 | 22 | |
| 23 | - public function __construct(array $values){ |
|
| 23 | + public function __construct(array $values) { |
|
| 24 | 24 | parent::__construct($values); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | unset($this->value[$offset]); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - public function append($value){ |
|
| 48 | + public function append($value) { |
|
| 49 | 49 | array_push($this->value, $value); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -41,8 +41,9 @@ |
||
| 41 | 41 | |
| 42 | 42 | public function offsetUnset($offset) |
| 43 | 43 | { |
| 44 | - if ($this->offsetExists($offset)) |
|
| 45 | - unset($this->value[$offset]); |
|
| 44 | + if ($this->offsetExists($offset)) { |
|
| 45 | + unset($this->value[$offset]); |
|
| 46 | + } |
|
| 46 | 47 | } |
| 47 | 48 | |
| 48 | 49 | public function append($value){ |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | { |
| 58 | 58 | $input = $this->toArray(); |
| 59 | 59 | $json = json_encode($input); |
| 60 | - $json = str_replace('\/','/', $json); |
|
| 60 | + $json = str_replace('\/', '/', $json); |
|
| 61 | 61 | |
| 62 | 62 | if (function_exists('json_last_error') && $errno = json_last_error()) { |
| 63 | 63 | self::handleJsonError($errno); |
| 64 | - } elseif ($json === 'null' ) { |
|
| 64 | + } elseif ($json === 'null') { |
|
| 65 | 65 | throw new JsonParseException('Null resul with non-null input'); |
| 66 | 66 | } |
| 67 | 67 | return $json; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | throw new JsonParseException( |
| 82 | 82 | isset($messages[$errno]) |
| 83 | 83 | ? $messages[$errno] |
| 84 | - : 'Unknown JSON error: ' . $errno |
|
| 84 | + : 'Unknown JSON error: '.$errno |
|
| 85 | 85 | ); |
| 86 | 86 | } |
| 87 | 87 | |
@@ -92,12 +92,12 @@ discard block |
||
| 92 | 92 | { |
| 93 | 93 | $res = array(); |
| 94 | 94 | |
| 95 | - foreach($this->set as $key => $val){ |
|
| 96 | - if($val instanceof JsonValue){ |
|
| 95 | + foreach ($this->set as $key => $val) { |
|
| 96 | + if ($val instanceof JsonValue) { |
|
| 97 | 97 | $res[$key] = $val->getValue(); |
| 98 | - if($res[$key] instanceof JsonObject) |
|
| 98 | + if ($res[$key] instanceof JsonObject) |
|
| 99 | 99 | $res[$key] = $res[$key]->toArray(); |
| 100 | - if(is_array($res[$key])){ |
|
| 100 | + if (is_array($res[$key])) { |
|
| 101 | 101 | $res[$key] = $this->processArray($res[$key]); |
| 102 | 102 | } |
| 103 | 103 | |
@@ -106,10 +106,10 @@ discard block |
||
| 106 | 106 | return $res; |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - private function processArray($original){ |
|
| 109 | + private function processArray($original) { |
|
| 110 | 110 | $temp = array(); |
| 111 | - foreach($original as $k => $val){ |
|
| 112 | - if($val instanceof JsonObject) |
|
| 111 | + foreach ($original as $k => $val) { |
|
| 112 | + if ($val instanceof JsonObject) |
|
| 113 | 113 | $val = $val->toArray(); |
| 114 | 114 | $temp[$k] = $val; |
| 115 | 115 | } |
@@ -95,8 +95,9 @@ discard block |
||
| 95 | 95 | foreach($this->set as $key => $val){ |
| 96 | 96 | if($val instanceof JsonValue){ |
| 97 | 97 | $res[$key] = $val->getValue(); |
| 98 | - if($res[$key] instanceof JsonObject) |
|
| 99 | - $res[$key] = $res[$key]->toArray(); |
|
| 98 | + if($res[$key] instanceof JsonObject) { |
|
| 99 | + $res[$key] = $res[$key]->toArray(); |
|
| 100 | + } |
|
| 100 | 101 | if(is_array($res[$key])){ |
| 101 | 102 | $res[$key] = $this->processArray($res[$key]); |
| 102 | 103 | } |
@@ -109,8 +110,9 @@ discard block |
||
| 109 | 110 | private function processArray($original){ |
| 110 | 111 | $temp = array(); |
| 111 | 112 | foreach($original as $k => $val){ |
| 112 | - if($val instanceof JsonObject) |
|
| 113 | - $val = $val->toArray(); |
|
| 113 | + if($val instanceof JsonObject) { |
|
| 114 | + $val = $val->toArray(); |
|
| 115 | + } |
|
| 114 | 116 | $temp[$k] = $val; |
| 115 | 117 | } |
| 116 | 118 | return $temp; |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | * Class Base64UrlRepresentation |
| 19 | 19 | * @package utils |
| 20 | 20 | */ |
| 21 | -final class Base64UrlRepresentation implements IObjectRepresentation{ |
|
| 21 | +final class Base64UrlRepresentation implements IObjectRepresentation { |
|
| 22 | 22 | |
| 23 | 23 | const Padding = 4; |
| 24 | 24 | /** |
@@ -40,7 +40,9 @@ |
||
| 40 | 40 | $type = @RegisteredJWEJOSEHeaderNames::$registered_basic_headers_set_types[$header_name]; |
| 41 | 41 | if(!is_null($value)) |
| 42 | 42 | { |
| 43 | - if(is_null($type)) continue; |
|
| 43 | + if(is_null($type)) { |
|
| 44 | + continue; |
|
| 45 | + } |
|
| 44 | 46 | $class = new \ReflectionClass($type); |
| 45 | 47 | $value = $class->newInstanceArgs(array($value)); |
| 46 | 48 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | final class JWEJOSEHeaderFactory { |
| 23 | 23 | |
| 24 | - static protected function getProductClass(){ |
|
| 24 | + static protected function getProductClass() { |
|
| 25 | 25 | return '\jwe\impl\JWEJOSEHeader'; |
| 26 | 26 | } |
| 27 | 27 | |
@@ -30,16 +30,16 @@ discard block |
||
| 30 | 30 | * @return IJWEJOSEHeader |
| 31 | 31 | * @throws \ReflectionException |
| 32 | 32 | */ |
| 33 | - public static function build(array $raw_headers){ |
|
| 33 | + public static function build(array $raw_headers) { |
|
| 34 | 34 | |
| 35 | 35 | $args = array(); |
| 36 | 36 | |
| 37 | - foreach(RegisteredJWEJOSEHeaderNames::$registered_basic_headers_set as $header_name){ |
|
| 37 | + foreach (RegisteredJWEJOSEHeaderNames::$registered_basic_headers_set as $header_name) { |
|
| 38 | 38 | $value = isset($raw_headers[$header_name]) ? $raw_headers[$header_name] : null; |
| 39 | 39 | $type = @RegisteredJWEJOSEHeaderNames::$registered_basic_headers_set_types[$header_name]; |
| 40 | - if(!is_null($value)) |
|
| 40 | + if (!is_null($value)) |
|
| 41 | 41 | { |
| 42 | - if(is_null($type)) continue; |
|
| 42 | + if (is_null($type)) continue; |
|
| 43 | 43 | $class = new \ReflectionClass($type); |
| 44 | 44 | $value = $class->newInstanceArgs(array($value)); |
| 45 | 45 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | // unregistered headers |
| 55 | 55 | |
| 56 | - foreach($raw_headers as $k => $v){ |
|
| 56 | + foreach ($raw_headers as $k => $v) { |
|
| 57 | 57 | $basic_header->addHeader(new JOSEHeaderParam($k, new JsonValue($v))); |
| 58 | 58 | } |
| 59 | 59 | |
@@ -36,8 +36,7 @@ discard block |
||
| 36 | 36 | * @param StringOrURI|null $type |
| 37 | 37 | * @param StringOrURI|null $cty |
| 38 | 38 | */ |
| 39 | - public function __construct |
|
| 40 | - ( |
|
| 39 | + public function __construct( |
|
| 41 | 40 | StringOrURI $alg, |
| 42 | 41 | StringOrURI $enc, |
| 43 | 42 | JsonValue $kid = null, |
@@ -50,7 +49,7 @@ discard block |
||
| 50 | 49 | |
| 51 | 50 | $this->set[RegisteredJWEJOSEHeaderNames::EncryptionAlgorithm] = $enc; |
| 52 | 51 | |
| 53 | - if(!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue())) |
|
| 52 | + if (!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue())) |
|
| 54 | 53 | $this->set[RegisteredJWEJOSEHeaderNames::CompressionAlgorithm] = $zip; |
| 55 | 54 | } |
| 56 | 55 | |
@@ -50,8 +50,9 @@ |
||
| 50 | 50 | |
| 51 | 51 | $this->set[RegisteredJWEJOSEHeaderNames::EncryptionAlgorithm] = $enc; |
| 52 | 52 | |
| 53 | - if(!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue())) |
|
| 54 | - $this->set[RegisteredJWEJOSEHeaderNames::CompressionAlgorithm] = $zip; |
|
| 53 | + if(!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue())) { |
|
| 54 | + $this->set[RegisteredJWEJOSEHeaderNames::CompressionAlgorithm] = $zip; |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | |
| 57 | 58 | /** |
@@ -63,13 +63,13 @@ |
||
| 63 | 63 | * @throws JWEInvalidPayloadException |
| 64 | 64 | * @throws JWEInvalidRecipientKeyException |
| 65 | 65 | */ |
| 66 | - public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload, JsonValue $zip = null) |
|
| 66 | + public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload, JsonValue $zip = null) |
|
| 67 | 67 | { |
| 68 | 68 | |
| 69 | - if(is_null($key)) |
|
| 69 | + if (is_null($key)) |
|
| 70 | 70 | throw new JWEInvalidRecipientKeyException(); |
| 71 | 71 | |
| 72 | - if(is_null($payload)) |
|
| 72 | + if (is_null($payload)) |
|
| 73 | 73 | throw new JWEInvalidPayloadException('missing payload'); |
| 74 | 74 | |
| 75 | 75 | $this->key = $key; |
@@ -66,11 +66,13 @@ |
||
| 66 | 66 | public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload, JsonValue $zip = null) |
| 67 | 67 | { |
| 68 | 68 | |
| 69 | - if(is_null($key)) |
|
| 70 | - throw new JWEInvalidRecipientKeyException(); |
|
| 69 | + if(is_null($key)) { |
|
| 70 | + throw new JWEInvalidRecipientKeyException(); |
|
| 71 | + } |
|
| 71 | 72 | |
| 72 | - if(is_null($payload)) |
|
| 73 | - throw new JWEInvalidPayloadException('missing payload'); |
|
| 73 | + if(is_null($payload)) { |
|
| 74 | + throw new JWEInvalidPayloadException('missing payload'); |
|
| 75 | + } |
|
| 74 | 76 | |
| 75 | 77 | $this->key = $key; |
| 76 | 78 | $this->alg = $alg; |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | * @param string $format |
| 45 | 45 | * @param string $value |
| 46 | 46 | */ |
| 47 | - public function __construct($alg, $format, $value){ |
|
| 47 | + public function __construct($alg, $format, $value) { |
|
| 48 | 48 | $this->alg = $alg; |
| 49 | 49 | $this->format = $format; |
| 50 | 50 | $this->value = $value; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | const CompressionAlgorithm = 'zip'; |
| 65 | 65 | |
| 66 | 66 | |
| 67 | - public static $registered_basic_headers_set = array ( |
|
| 67 | + public static $registered_basic_headers_set = array( |
|
| 68 | 68 | self::Algorithm, |
| 69 | 69 | self::EncryptionAlgorithm, |
| 70 | 70 | self::KeyID, |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | self::ContentType, |
| 74 | 74 | ); |
| 75 | 75 | |
| 76 | - public static $registered_basic_headers_set_types = array ( |
|
| 77 | - self::Algorithm => JsonTypes::StringOrURI , |
|
| 76 | + public static $registered_basic_headers_set_types = array( |
|
| 77 | + self::Algorithm => JsonTypes::StringOrURI, |
|
| 78 | 78 | self::Type => JsonTypes::StringOrURI, |
| 79 | 79 | self::ContentType => JsonTypes::StringOrURI, |
| 80 | 80 | self::KeyID => JsonTypes::JsonValue, |
@@ -24,9 +24,9 @@ |
||
| 24 | 24 | |
| 25 | 25 | const KeyWrapping = 'wrap'; |
| 26 | 26 | |
| 27 | - const DirectKeyAgreement ='agree'; |
|
| 27 | + const DirectKeyAgreement = 'agree'; |
|
| 28 | 28 | |
| 29 | - const KeyAgreementWithKeyWrapping ='agree_wrap'; |
|
| 29 | + const KeyAgreementWithKeyWrapping = 'agree_wrap'; |
|
| 30 | 30 | |
| 31 | 31 | const DirectEncryption = 'dir'; |
| 32 | 32 | } |
| 33 | 33 | \ No newline at end of file |