8000 [HttpKernel] Added mock objects for Memcache(d) and Redis · symfony/symfony@1f6c8d5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1f6c8d5

Browse files
pulzarraiderpulzarraider
committed
[HttpKernel] Added mock objects for Memcache(d) and Redis
1 parent e17217b commit 1f6c8d5

‎phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<groups>
2323
<exclude>
2424
<group>benchmark</group>
25-
<group>memcached</group>
2625
</exclude>
2726
</groups>
2827

‎src/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,16 @@ protected function getMemcache()
5050
return $this->memcache;
5151
}
5252

53+
/**
54+
* Set instance of the Memcache
55+
*
56+
* @param Memcache $memcache
57+
*/
58+
public function setMemcache($memcache)
59+
{
60+
$this->memcache = $memcache;
61+
}
62+
5363
/**
5464
* {@inheritdoc}
5565
*/

‎src/Symfony/Component/HttpKernel/Profiler/MemcachedProfilerStorage.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@ protected function getMemcached()
5454
return $this->memcached;
5555
}
5656

57+
/**
58+
* Set instance of the Memcached
59+
*
60+
* @param Memcached $memcached
61+
*/
62+
public function setMemcached($memcached)
63+
{
64+
$this->memcached = $memcached;
65+
}
66+
5767
/**
5868
* {@inheritdoc}
5969
*/

‎src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,16 @@ protected function getRedis()
211211
return $this->redis;
212212
}
213213

214+
/**
215+
* Set instance of the Redis
216+
*
217+
* @param Redis $redis
218+
*/
219+
public function setRedis($redis)
220+
{
221+
$this->redis = $redis;
222+
}
223+
214224
private function createProfileFromData($token, $data, $parent = null)
215225
{
216226
$profile = new Profile($token);

‎src/Symfony/Component/HttpKernel/Tests/Profiler/MemcacheProfilerStorageTest.php

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,30 @@
1212
namespace Symfony\Component\HttpKernel\Tests\Profiler;
1313

1414
use Symfony\Component\HttpKernel\Profiler\MemcacheProfilerStorage;
15+
use Symfony\Component\HttpKernel\Tests\Profiler\Mock\MemcacheMock;
1516

16-
class DummyMemcacheProfilerStorage extends MemcacheProfilerStorage
17-
{
18-
public function getMemcache()
19-
{
20-
return parent::getMemcache();
21-
}
22-
}
23-
24-
/**
25-
* @group memcached
26-
*/
2717
class MemcacheProfilerStorageTest extends AbstractProfilerStorageTest
2818
{
2919
protected static $storage;
3020

31-
public static function tearDownAfterClass()
21+
protected function setUp()
3222
{
23+
$memcacheMock = new MemcacheMock();
24+
$memcacheMock->addServer('127.0.0.1', 11211);
25+
26+
self::$storage = new MemcacheProfilerStorage('memcache://127.0.0.1:11211', '', '', 86400);
27+
self::$storage->setMemcache($memcacheMock);
28+
3329
if (self::$storage) {
3430
self::$storage->purge();
3531
}
3632
}
3733

38-
protected function setUp()
34+
protected function tearDown()
3935
{
40-
if (!extension_loaded('memcache')) {
41-
$this->markTestSkipped('MemcacheProfilerStorageTest requires that the extension memcache is loaded');
42-
}
43-
44-
self::$storage = new DummyMemcacheProfilerStorage('memcache://127.0.0.1:11211', '', '', 86400);
45-
try {
46-
self::$storage->getMemcache();
47-
$stats = self::$storage->getMemcache()->getExtendedStats();
48-
if (!isset($stats['127.0.0.1:11211']) || $stats['127.0.0.1:11211'] === false) {
49-
throw new \Exception();
50-
}
51-
} catch (\Exception $e) {
52-
$this->markTestSkipped('MemcacheProfilerStorageTest requires that there is a Memcache server present on localhost');
53-
}
54-
5536
if (self::$storage) {
5637
self::$storage->purge();
38+
self::$storage = false;
5739
}
5840
}
5941

‎src/Symfony/Component/HttpKernel/Tests/Profiler/MemcachedProfilerStorageTest.php

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,30 @@
1212
namespace Symfony\Component\HttpKernel\Tests\Profiler;
1313

1414
use Symfony\Component\HttpKernel\Profiler\MemcachedProfilerStorage;
15+
use Symfony\Component\HttpKernel\Tests\Profiler\Mock\MemcachedMock;
1516

16-
class DummyMemcachedProfilerStorage extends MemcachedProfilerStorage
17-
{
18-
public function getMemcached()
19-
{
20-
return parent::getMemcached();
21-
}
22-
}
23-
24-
/**
25-
* @group memcached
26-
*/
2717
class MemcachedProfilerStorageTest extends AbstractProfilerStorageTest
2818
{
2919
protected static $storage;
3020

31-
public static function tearDownAfterClass()
21+
protected function setUp()
3222
{
23+
$memcachedMock = new MemcachedMock();
24+
$memcachedMock->addServer('127.0.0.1', 11211);
25+
26+
self::$storage = new MemcachedProfilerStorage('memcached://127.0.0.1:11211', '', '', 86400);
27+
self::$storage->setMemcached($memcachedMock);
28+
3329
if (self::$storage) {
3430
self::$storage->purge();
3531
}
3632
}
3733

38-
protected function setUp()
34+
protected function tearDown()
3935
{
40-
if (!extension_loaded('memcached')) {
41-
$this->markTestSkipped('MemcachedProfilerStorageTest requires that the extension memcached is loaded');
42-
}
43-
44-
self::$storage = new DummyMemcachedProfilerStorage('memcached://127.0.0.1:11211', '', '', 86400);
45-
try {
46-
self::$storage->getMemcached();
47-
} catch (\Exception $e) {
48-
$this->markTestSkipped('MemcachedProfilerStorageTest requires that there is a Memcache server present on localhost');
49-
}
50-
5136
if (self::$storage) {
5237
self::$storage->purge();
38+
self::$storage = false;
5339
}
5440
}
5541

0 commit comments

Comments
 (0)
0