Skip to content

Commit e13c456

Browse files
xabbuhxabbuh
committed
minor #54785 Remove calls to TestCase::iniSet() and calls to deprecated methods of MockBuilder (alexandre-daubois)
This PR was merged into the 5.4 branch. Discussion ---------- Remove calls to `TestCase::iniSet()` and calls to deprecated methods of `MockBuilder` | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Last round (before new deprecations 🙂). All deprecations [listed here](https://github.com/sebastianbergmann/phpunit/blob/main/DEPRECATIONS.md) should be gone. Commits ------- 4d5065ddd9 Remove calls to `TestCase::iniSet()` and calls to deprecated methods of `MockBuilder`
2 parents b4a91a1 + a2622e3 commit e13c456

File tree

2 files changed

+49
-24
lines changed

2 files changed

+49
-24
lines changed

‎Tests/Session/Storage/NativeSessionStorageTest.php

Lines changed: 41 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ class NativeSessionStorageTest extends TestCase
3434
{
3535
private $savePath;
3636

37+
private $initialSessionSaveHandler;
38+
private $initialSessionSavePath;
39+
3740
protected function setUp(): void
3841
{
39-
$this->iniSet('session.save_handler', 'files');
40-
$this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');
42+
$this->initialSessionSaveHandler = ini_set('session.save_handler', 'files');
43+
$this->initialSessionSavePath = ini_set('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');
44+
4145
if (!is_dir($this->savePath)) {
4246
mkdir($this->savePath);
4347
}
@@ -52,6 +56,8 @@ protected function tearDown(): void
5256
}
5357

5458
$this->savePath = null;
59+
ini_set('session.save_handler', $this->initialSessionSaveHandler);
60+
ini_set('session.save_path', $this->initialSessionSavePath);
5561
}
5662

5763
protected function getStorage(array $options = []): NativeSessionStorage
@@ -154,18 +160,26 @@ public function testRegenerationFailureDoesNotFlagStorageAsStarted()
154160

155161
public function testDefaultSessionCacheLimiter()
156162
{
157-
$this->iniSet('session.cache_limiter', 'nocache');
163+
$initialLimiter = ini_set('session.cache_limiter', 'nocache');
158164

159-
new NativeSessionStorage();
160-
$this->assertEquals('', \ini_get('session.cache_limiter'));
165+
try {
166+
new NativeSessionStorage();
167+
$this->assertEquals('', \ini_get('session.cache_limiter'));
168+
} finally {
169+
ini_set('session.cache_limiter', $initialLimiter);
170+
}
161171
}
162172

163173
public function testExplicitSessionCacheLimiter()
164174
{
165-
$this->iniSet('session.cache_limiter', 'nocache');
175+
$initialLimiter = ini_set('session.cache_limiter', 'nocache');
166176

167-
new NativeSessionStorage(['cache_limiter' => 'public']);
168-
$this->assertEquals('public', \ini_get('session.cache_limiter'));
177+
try {
178+
new NativeSessionStorage(['cache_limiter' => 'public']);
179+
$this->assertEquals('public', \ini_get('session.cache_limiter'));
180+
} finally {
181+
ini_set('session.cache_limiter', $initialLimiter);
182+
}
169183
}
170184

171185
public function testCookieOptions()
@@ -208,20 +222,25 @@ public function testSessionOptions()
208222

209223
public function testSetSaveHandler()
210224
{
211-
$this->iniSet('session.save_handler', 'files');
212-
$storage = $this->getStorage();
213-
$storage->setSaveHandler();
214-
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
215-
$storage->setSaveHandler(null);
216-
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
217-
$storage->setSaveHandler(new SessionHandlerProxy(new NativeFileSessionHandler()));
218-
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
219-
$storage->setSaveHandler(new NativeFileSessionHandler());
220-
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
221-
$storage->setSaveHandler(new SessionHandlerProxy(new NullSessionHandler()));
222-
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
223-
$storage->setSaveHandler(new NullSessionHandler());
224-
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
225+
$initialSaveHandler = ini_set('session.save_handler', 'files');
226+
227+
try {
228+
$storage = $this->getStorage();
229+
$storage->setSaveHandler();
230+
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
231+
$storage->setSaveHandler(null);
232+
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
233+
$storage->setSaveHandler(new SessionHandlerProxy(new NativeFileSessionHandler()));
234+
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
235+
$storage->setSaveHandler(new NativeFileSessionHandler());
236+
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
237+
$storage->setSaveHandler(new SessionHandlerProxy(new NullSessionHandler()));
238+
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
239+
$storage->setSaveHandler(new NullSessionHandler());
240+
$this->assertInstanceOf(SessionHandlerProxy::class, $storage->getSaveHandler());
241+
} finally {
242+
ini_set('session.save_handler', $initialSaveHandler);
243+
}
225244
}
226245

227246
public function testStarted()

‎Tests/Session/Storage/PhpBridgeSessionStorageTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ class PhpBridgeSessionStorageTest extends TestCase
3030
{
3131
private $savePath;
3232

33+
private $initialSessionSaveHandler;
34+
private $initialSessionSavePath;
35+
3336
protected function setUp(): void
3437
{
35-
$this->iniSet('session.save_handler', 'files');
36-
$this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');
38+
$this->initialSessionSaveHandler = ini_set('session.save_handler', 'files');
39+
$this->initialSessionSavePath = ini_set('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');
40+
3741
if (!is_dir($this->savePath)) {
3842
mkdir($this->savePath);
3943
}
@@ -48,6 +52,8 @@ protected function tearDown(): void
4852
}
4953

5054
$this->savePath = null;
55+
ini_set('session.save_handler', $this->initialSessionSaveHandler);
56+
ini_set('session.save_path', $this->initialSessionSavePath);
5157
}
5258

5359
protected function getStorage(): PhpBridgeSessionStorage

0 commit comments

Comments
 (0)