@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | use chillerlan\OAuth\Core\AccessToken; |
16 | 16 | use chillerlan\Settings\SettingsContainerInterface; |
17 | 17 | |
18 | -class SessionStorage extends OAuthStorageAbstract{ |
|
18 | +class SessionStorage extends OAuthStorageAbstract { |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @var string |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * |
33 | 33 | * @param \chillerlan\Settings\SettingsContainerInterface|null $options |
34 | 34 | */ |
35 | - public function __construct(SettingsContainerInterface $options = null){ |
|
35 | + public function __construct(SettingsContainerInterface $options = null) { |
|
36 | 36 | parent::__construct($options); |
37 | 37 | |
38 | 38 | $this->sessionVar = $this->options->sessionTokenVar; |
@@ -40,15 +40,15 @@ discard block |
||
40 | 40 | |
41 | 41 | // Determine if the session has started. |
42 | 42 | // @link http://stackoverflow.com/a/18542272/1470961 |
43 | - if($this->options->sessionStart && !(session_status() !== PHP_SESSION_NONE)){ |
|
43 | + if ($this->options->sessionStart && !(session_status() !== PHP_SESSION_NONE)) { |
|
44 | 44 | session_start(); |
45 | 45 | } |
46 | 46 | |
47 | - if(!isset($_SESSION[$this->sessionVar])){ |
|
47 | + if (!isset($_SESSION[$this->sessionVar])) { |
|
48 | 48 | $_SESSION[$this->sessionVar] = []; |
49 | 49 | } |
50 | 50 | |
51 | - if(!isset($_SESSION[$this->stateVar])){ |
|
51 | + if (!isset($_SESSION[$this->stateVar])) { |
|
52 | 52 | $_SESSION[$this->stateVar] = []; |
53 | 53 | } |
54 | 54 | |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | * |
60 | 60 | * @codeCoverageIgnore |
61 | 61 | */ |
62 | - public function __destruct(){ |
|
63 | - if($this->options->sessionStart){ |
|
62 | + public function __destruct() { |
|
63 | + if ($this->options->sessionStart) { |
|
64 | 64 | session_write_close(); |
65 | 65 | } |
66 | 66 | } |
@@ -74,10 +74,10 @@ discard block |
||
74 | 74 | public function storeAccessToken(string $service, AccessToken $token):OAuthStorageInterface{ |
75 | 75 | $data = $this->toStorage($token); |
76 | 76 | |
77 | - if(isset($_SESSION[$this->sessionVar]) && is_array($_SESSION[$this->sessionVar])){ |
|
77 | + if (isset($_SESSION[$this->sessionVar]) && is_array($_SESSION[$this->sessionVar])) { |
|
78 | 78 | $_SESSION[$this->sessionVar][$service] = $data; |
79 | 79 | } |
80 | - else{ |
|
80 | + else { |
|
81 | 81 | $_SESSION[$this->sessionVar] = [$service => $data]; |
82 | 82 | } |
83 | 83 | |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function getAccessToken(string $service):AccessToken{ |
94 | 94 | |
95 | - if($this->hasAccessToken($service)){ |
|
95 | + if ($this->hasAccessToken($service)) { |
|
96 | 96 | return $this->fromStorage($_SESSION[$this->sessionVar][$service]); |
97 | 97 | } |
98 | 98 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | */ |
116 | 116 | public function clearAccessToken(string $service):OAuthStorageInterface{ |
117 | 117 | |
118 | - if(array_key_exists($service, $_SESSION[$this->sessionVar])){ |
|
118 | + if (array_key_exists($service, $_SESSION[$this->sessionVar])) { |
|
119 | 119 | unset($_SESSION[$this->sessionVar][$service]); |
120 | 120 | } |
121 | 121 | |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | */ |
128 | 128 | public function clearAllAccessTokens():OAuthStorageInterface{ |
129 | 129 | |
130 | - foreach(array_keys($_SESSION[$this->sessionVar]) as $service){ |
|
130 | + foreach (array_keys($_SESSION[$this->sessionVar]) as $service) { |
|
131 | 131 | unset($_SESSION[$this->sessionVar][$service]); |
132 | 132 | } |
133 | 133 | |
@@ -144,10 +144,10 @@ discard block |
||
144 | 144 | */ |
145 | 145 | public function storeCSRFState(string $service, string $state):OAuthStorageInterface{ |
146 | 146 | |
147 | - if(isset($_SESSION[$this->stateVar]) && is_array($_SESSION[$this->stateVar])){ |
|
147 | + if (isset($_SESSION[$this->stateVar]) && is_array($_SESSION[$this->stateVar])) { |
|
148 | 148 | $_SESSION[$this->stateVar][$service] = $state; |
149 | 149 | } |
150 | - else{ |
|
150 | + else { |
|
151 | 151 | $_SESSION[$this->stateVar] = [$service => $state]; |
152 | 152 | } |
153 | 153 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | */ |
163 | 163 | public function getCSRFState(string $service):string{ |
164 | 164 | |
165 | - if($this->hasCSRFState($service)){ |
|
165 | + if ($this->hasCSRFState($service)) { |
|
166 | 166 | return $_SESSION[$this->stateVar][$service]; |
167 | 167 | } |
168 | 168 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | */ |
186 | 186 | public function clearCSRFState(string $service):OAuthStorageInterface{ |
187 | 187 | |
188 | - if(array_key_exists($service, $_SESSION[$this->stateVar])){ |
|
188 | + if (array_key_exists($service, $_SESSION[$this->stateVar])) { |
|
189 | 189 | unset($_SESSION[$this->stateVar][$service]); |
190 | 190 | } |
191 | 191 |
@@ -76,8 +76,7 @@ discard block |
||
76 | 76 | |
77 | 77 | if(isset($_SESSION[$this->sessionVar]) && is_array($_SESSION[$this->sessionVar])){ |
78 | 78 | $_SESSION[$this->sessionVar][$service] = $data; |
79 | - } |
|
80 | - else{ |
|
79 | + } else{ |
|
81 | 80 | $_SESSION[$this->sessionVar] = [$service => $data]; |
82 | 81 | } |
83 | 82 | |
@@ -146,8 +145,7 @@ discard block |
||
146 | 145 | |
147 | 146 | if(isset($_SESSION[$this->stateVar]) && is_array($_SESSION[$this->stateVar])){ |
148 | 147 | $_SESSION[$this->stateVar][$service] = $state; |
149 | - } |
|
150 | - else{ |
|
148 | + } else{ |
|
151 | 149 | $_SESSION[$this->stateVar] = [$service => $state]; |
152 | 150 | } |
153 | 151 |
@@ -30,7 +30,7 @@ |
||
30 | 30 | * @param \chillerlan\Settings\SettingsContainerInterface|null $options |
31 | 31 | * @param \Psr\Log\LoggerInterface|null $logger |
32 | 32 | */ |
33 | - public function __construct(SettingsContainerInterface $options = null, LoggerInterface $logger = null){ |
|
33 | + public function __construct(SettingsContainerInterface $options = null, LoggerInterface $logger = null) { |
|
34 | 34 | $this->options = $options ?? new OAuthOptions; |
35 | 35 | |
36 | 36 | $this->setLogger($logger ?? new NullLogger); |
@@ -34,7 +34,7 @@ |
||
34 | 34 | ]; |
35 | 35 | |
36 | 36 | /** @var \chillerlan\Settings\SettingsContainerInterface $options */ |
37 | -$options = new class($options_arr) extends OAuthOptions{ |
|
37 | +$options = new class($options_arr) extends OAuthOptions { |
|
38 | 38 | protected $sleep; // testHTTPClient |
39 | 39 | }; |
40 | 40 |