@@ -32,18 +32,18 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | private $services = array(); |
| 34 | 34 | |
| 35 | - private function __construct(){ |
|
| 35 | + private function __construct() { |
|
| 36 | 36 | |
| 37 | 37 | $this->services[self::RandomNumberGeneratorService] = new RandomNumberGeneratorService; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - private function __clone(){} |
|
| 40 | + private function __clone() {} |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * @return Utils_Registry |
| 44 | 44 | */ |
| 45 | - public static function getInstance(){ |
|
| 46 | - if(!is_object(self::$instance)){ |
|
| 45 | + public static function getInstance() { |
|
| 46 | + if (!is_object(self::$instance)) { |
|
| 47 | 47 | self::$instance = new Utils_Registry(); |
| 48 | 48 | } |
| 49 | 49 | return self::$instance; |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | * @param string $service_name |
| 54 | 54 | * @return null|IService |
| 55 | 55 | */ |
| 56 | - public function get($service_name){ |
|
| 57 | - if(!array_key_exists($service_name, $this->services)) |
|
| 56 | + public function get($service_name) { |
|
| 57 | + if (!array_key_exists($service_name, $this->services)) |
|
| 58 | 58 | throw new \InvalidArgumentException('unknown service!'); |
| 59 | 59 | |
| 60 | 60 | return $this->services[$service_name]; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @param IService $service |
| 66 | 66 | * @return $this |
| 67 | 67 | */ |
| 68 | - public function add($service_name, IService $service){ |
|
| 68 | + public function add($service_name, IService $service) { |
|
| 69 | 69 | $this->services[$service_name] = $service; |
| 70 | 70 | return $this; |
| 71 | 71 | } |
@@ -42,18 +42,18 @@ |
||
| 42 | 42 | $segments = explode(IBasicJWT::SegmentSeparator, $compact_serialization); |
| 43 | 43 | // JWSs have three segments separated by two period ('.') characters. |
| 44 | 44 | // JWEs have five segments separated by four period ('.') characters. |
| 45 | - switch(count($segments)) |
|
| 45 | + switch (count($segments)) |
|
| 46 | 46 | { |
| 47 | 47 | case 3: |
| 48 | 48 | // JWS or unsecured one |
| 49 | 49 | $header = JOSEHeaderSerializer::deserialize($segments[0]); |
| 50 | - if($header->getAlgorithm()->getString() === 'none' && empty($segments[2])) |
|
| 50 | + if ($header->getAlgorithm()->getString() === 'none' && empty($segments[2])) |
|
| 51 | 51 | return UnsecuredJWT::fromCompactSerialization($compact_serialization); |
| 52 | - return JWSFactory::build( new JWS_CompactFormatSpecification($compact_serialization) ); |
|
| 52 | + return JWSFactory::build(new JWS_CompactFormatSpecification($compact_serialization)); |
|
| 53 | 53 | break; |
| 54 | 54 | case 5: |
| 55 | 55 | // JWE |
| 56 | - return JWEFactory::build( new JWE_CompactFormatSpecification($compact_serialization) ); |
|
| 56 | + return JWEFactory::build(new JWE_CompactFormatSpecification($compact_serialization)); |
|
| 57 | 57 | break; |
| 58 | 58 | default: |
| 59 | 59 | throw new InvalidCompactSerializationException; |
@@ -29,14 +29,14 @@ |
||
| 29 | 29 | /** |
| 30 | 30 | * @param int|string|array|bool|IJsonObject $value |
| 31 | 31 | */ |
| 32 | - public function __construct($value){ |
|
| 32 | + public function __construct($value) { |
|
| 33 | 33 | $this->value = $value; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * @return int|string|array|bool|IJsonObject |
| 38 | 38 | */ |
| 39 | - public function getValue(){ |
|
| 39 | + public function getValue() { |
|
| 40 | 40 | return $this->value; |
| 41 | 41 | } |
| 42 | 42 | |
@@ -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 | |
@@ -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 | } |
@@ -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 | /** |
@@ -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 | |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | * @param $size |
| 27 | 27 | * @return string |
| 28 | 28 | */ |
| 29 | - static public function build($size){ |
|
| 29 | + static public function build($size) { |
|
| 30 | 30 | |
| 31 | 31 | $generator = Utils_Registry::getInstance()->get(Utils_Registry::RandomNumberGeneratorService); |
| 32 | 32 | return $generator->invoke($size / 8); |
@@ -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; |