@@ -8,25 +8,25 @@ |
||
| 8 | 8 | |
| 9 | 9 | class HybridSessionMiddleware implements HTTPMiddleware |
| 10 | 10 | { |
| 11 | - public function process(HTTPRequest $request, callable $delegate) |
|
| 12 | - { |
|
| 13 | - try { |
|
| 14 | - // Start session and execute |
|
| 15 | - $request->getSession()->init($request); |
|
| 11 | + public function process(HTTPRequest $request, callable $delegate) |
|
| 12 | + { |
|
| 13 | + try { |
|
| 14 | + // Start session and execute |
|
| 15 | + $request->getSession()->init($request); |
|
| 16 | 16 | |
| 17 | - // Generate output |
|
| 18 | - $response = $delegate($request); |
|
| 19 | - } finally { |
|
| 20 | - // Save session data, even if there was an exception |
|
| 21 | - // Note that save() will start/resume the session if required. |
|
| 22 | - $request->getSession()->save($request); |
|
| 17 | + // Generate output |
|
| 18 | + $response = $delegate($request); |
|
| 19 | + } finally { |
|
| 20 | + // Save session data, even if there was an exception |
|
| 21 | + // Note that save() will start/resume the session if required. |
|
| 22 | + $request->getSession()->save($request); |
|
| 23 | 23 | |
| 24 | - if (HybridSession::is_enabled()) { |
|
| 25 | - // Close the session |
|
| 26 | - session_write_close(); |
|
| 27 | - } |
|
| 28 | - } |
|
| 24 | + if (HybridSession::is_enabled()) { |
|
| 25 | + // Close the session |
|
| 26 | + session_write_close(); |
|
| 27 | + } |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - return $response; |
|
| 31 | - } |
|
| 30 | + return $response; |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -9,12 +9,12 @@ |
||
| 9 | 9 | |
| 10 | 10 | class ConfigurationTest extends SapphireTest |
| 11 | 11 | { |
| 12 | - public function testHybridSessionsSessionMiddlewareReplacesCore() |
|
| 13 | - { |
|
| 14 | - $this->assertInstanceOf( |
|
| 15 | - HybridSessionMiddleware::class, |
|
| 16 | - Injector::inst()->get(SessionMiddleware::class), |
|
| 17 | - 'HybridSession\'s middleware should replace the default SessionMiddleware' |
|
| 18 | - ); |
|
| 19 | - } |
|
| 12 | + public function testHybridSessionsSessionMiddlewareReplacesCore() |
|
| 13 | + { |
|
| 14 | + $this->assertInstanceOf( |
|
| 15 | + HybridSessionMiddleware::class, |
|
| 16 | + Injector::inst()->get(SessionMiddleware::class), |
|
| 17 | + 'HybridSession\'s middleware should replace the default SessionMiddleware' |
|
| 18 | + ); |
|
| 19 | + } |
|
| 20 | 20 | } |