Merge branch '3.5' into 3.6

This commit is contained in:
Daniel Hensby 2017-12-14 15:25:36 +00:00
commit 7b0500982e
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -113,7 +113,7 @@ class SessionTest extends SapphireTest {
// Verify a started session resets our values (initiated by $_SESSION object) // Verify a started session resets our values (initiated by $_SESSION object)
/** @var Session $s3 */ /** @var Session $s3 */
$s3 = Injector::inst()->create('Session', []); $s3 = Injector::inst()->create('Session', array());
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$s3->inst_set($key, $value); $s3->inst_set($key, $value);
} }