Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 8f27bf6

Browse files
weierophinneyweierophinney
committed
Merge pull request #98 from marc-mabe/fix97
fixed #97 by adding underline names to plugin manager
2 parents 2461937 + fd0d002 commit 8f27bf6

30 files changed

+367
-53
lines changed

‎src/Storage/AdapterPluginManager.php‎

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,55 @@
2424
class AdapterPluginManager extends AbstractPluginManager
2525
{
2626
protected $aliases = [
27-
'apc' => Adapter\Apc::class,
28-
'Apc' => Adapter\Apc::class,
29-
'apcu' => Adapter\Apcu::class,
30-
'ApcU' => Adapter\Apcu::class,
31-
'Apcu' => Adapter\Apcu::class,
32-
'APCu' => Adapter\Apcu::class,
33-
'blackhole' => Adapter\BlackHole::class,
34-
'blackHole' => Adapter\BlackHole::class,
35-
'BlackHole' => Adapter\BlackHole::class,
36-
'dba' => Adapter\Dba::class,
37-
'Dba' => Adapter\Dba::class,
38-
'filesystem' => Adapter\Filesystem::class,
39-
'Filesystem' => Adapter\Filesystem::class,
40-
'memcache' => Adapter\Memcache::class,
41-
'Memcache' => Adapter\Memcache::class,
42-
'memcached' => Adapter\Memcached::class,
43-
'Memcached' => Adapter\Memcached::class,
44-
'memory' => Adapter\Memory::class,
45-
'Memory' => Adapter\Memory::class,
46-
'mongodb' => Adapter\MongoDb::class,
47-
'mongoDb' => Adapter\MongoDb::class,
48-
'MongoDb' => Adapter\MongoDb::class,
49-
'redis' => Adapter\Redis::class,
50-
'Redis' => Adapter\Redis::class,
51-
'session' => Adapter\Session::class,
52-
'Session' => Adapter\Session::class,
53-
'xcache' => Adapter\XCache::class,
54-
'xCache' => Adapter\XCache::class,
55-
'XCache' => Adapter\XCache::class,
56-
'wincache' => Adapter\WinCache::class,
57-
'winCache' => Adapter\WinCache::class,
58-
'WinCache' => Adapter\WinCache::class,
59-
'zendserverdisk' => Adapter\ZendServerDisk::class,
60-
'zendServerDisk' => Adapter\ZendServerDisk::class,
61-
'ZendServerDisk' => Adapter\ZendServerDisk::class,
62-
'zendservershm' => Adapter\ZendServerShm::class,
63-
'zendServerShm' => Adapter\ZendServerShm::class,
64-
'ZendServerShm' => Adapter\ZendServerShm::class,
27+
'apc' => Adapter\Apc::class,
28+
'Apc' => Adapter\Apc::class,
29+
'APC' => Adapter\Apc::class,
30+
'apcu' => Adapter\Apcu::class,
31+
'ApcU' => Adapter\Apcu::class,
32+
'Apcu' => Adapter\Apcu::class,
33+
'APCu' => Adapter\Apcu::class,
34+
'black_hole' => Adapter\BlackHole::class,
35+
'blackhole' => Adapter\BlackHole::class,
36+
'blackHole' => Adapter\BlackHole::class,
37+
'BlackHole' => Adapter\BlackHole::class,
38+
'dba' => Adapter\Dba::class,
39+
'Dba' => Adapter\Dba::class,
40+
'DBA' => Adapter\Dba::class,
41+
'filesystem' => Adapter\Filesystem::class,
42+
'Filesystem' => Adapter\Filesystem::class,
43+
'memcache' => Adapter\Memcache::class,
44+
'Memcache' => Adapter\Memcache::class,
45+
'memcached' => Adapter\Memcached::class,
46+
'Memcached' => Adapter\Memcached::class,
47+
'memory' => Adapter\Memory::class,
48+
'Memory' => Adapter\Memory::class,
49+
'mongo_db' => Adapter\MongoDb::class,
50+
'mongodb' => Adapter\MongoDb::class,
51+
'MongoDb' => Adapter\MongoDb::class,
52+
'MongoDB' => Adapter\MongoDb::class,
53+
'mongoDb' => Adapter\MongoDb::class,
54+
'mongoDB' => Adapter\MongoDb::class,
55+
'redis' => Adapter\Redis::class,
56+
'Redis' => Adapter\Redis::class,
57+
'session' => Adapter\Session::class,
58+
'Session' => Adapter\Session::class,
59+
'xcache' => Adapter\XCache::class,
60+
'xCache' => Adapter\XCache::class,
61+
'XCache' => Adapter\XCache::class,
62+
'win_cache' => Adapter\WinCache::class,
63+
'wincache' => Adapter\WinCache::class,
64+
'winCache' => Adapter\WinCache::class,
65+
'WinCache' => Adapter\WinCache::class,
66+
'zend_server_disk' => Adapter\ZendServerDisk::class,
67+
'zendserverdisk' => Adapter\ZendServerDisk::class,
68+
'zendServerDisk' => Adapter\ZendServerDisk::class,
69+
'ZendServerDisk' => Adapter\ZendServerDisk::class,
70+
'zend_server_shm' => Adapter\ZendServerShm::class,
71+
'zendservershm' => Adapter\ZendServerShm::class,
72+
'zendServerShm' => Adapter\ZendServerShm::class,
73+
'zendServerSHM' => Adapter\ZendServerShm::class,
74+
'ZendServerShm' => Adapter\ZendServerShm::class,
75+
'ZendServerSHM' => Adapter\ZendServerShm::class,
6576
];
6677

6778
protected $factories = [

‎src/Storage/PluginManager.php‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,24 @@
2424
class PluginManager extends AbstractPluginManager
2525
{
2626
protected $aliases = [
27-
'clearexpiredbyfactor' => Plugin\ClearExpiredByFactor::class,
28-
'clearExpiredByFactor' => Plugin\ClearExpiredByFactor::class,
29-
'ClearExpiredByFactor' => Plugin\ClearExpiredByFactor::class,
30-
'exceptionhandler' => Plugin\ExceptionHandler::class,
31-
'exceptionHandler' => Plugin\ExceptionHandler::class,
32-
'ExceptionHandler' => Plugin\ExceptionHandler::class,
33-
'ignoreuserabort' => Plugin\IgnoreUserAbort::class,
34-
'ignoreUserAbort' => Plugin\IgnoreUserAbort::class,
35-
'IgnoreUserAbort' => Plugin\IgnoreUserAbort::class,
36-
'optimizebyfactor' => Plugin\OptimizeByFactor::class,
37-
'optimizeByFactor' => Plugin\OptimizeByFactor::class,
38-
'OptimizeByFactor' => Plugin\OptimizeByFactor::class,
39-
'serializer' => Plugin\Serializer::class,
40-
'Serializer' => Plugin\Serializer::class
27+
'clear_expired_by_factor' => Plugin\ClearExpiredByFactor::class,
28+
'clearexpiredbyfactor' => Plugin\ClearExpiredByFactor::class,
29+
'clearExpiredByFactor' => Plugin\ClearExpiredByFactor::class,
30+
'ClearExpiredByFactor' => Plugin\ClearExpiredByFactor::class,
31+
'exception_handler' => Plugin\ExceptionHandler::class,
32+
'exceptionhandler' => Plugin\ExceptionHandler::class,
33+
'exceptionHandler' => Plugin\ExceptionHandler::class,
34+
'ExceptionHandler' => Plugin\ExceptionHandler::class,
35+
'ignore_user_abort' => Plugin\IgnoreUserAbort::class,
36+
'ignoreuserabort' => Plugin\IgnoreUserAbort::class,
37+
'ignoreUserAbort' => Plugin\IgnoreUserAbort::class,
38+
'IgnoreUserAbort' => Plugin\IgnoreUserAbort::class,
39+
'optimize_by_factor' => Plugin\OptimizeByFactor::class,
40+
'optimizebyfactor' => Plugin\OptimizeByFactor::class,
41+
'optimizeByFactor' => Plugin\OptimizeByFactor::class,
42+
'OptimizeByFactor' => Plugin\OptimizeByFactor::class,
43+
'serializer' => Plugin\Serializer::class,
44+
'Serializer' => Plugin\Serializer::class
4145
];
4246

4347
protected $factories = [

‎test/Pattern/CallbackCacheTest.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ public function tearDown()
8282
parent::tearDown();
8383
}
8484

85+
public function getCommonPatternNamesProvider()
86+
{
87+
return [
88+
['callback'],
89+
['Callback'],
90+
];
91+
}
92+
8593
public function testCallEnabledCacheOutputByDefault()
8694
{
8795
$this->_testCall(

‎test/Pattern/CaptureCacheTest.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ protected function _removeRecursive($dir)
8282
}
8383
}
8484

85+
public function getCommonPatternNamesProvider()
86+
{
87+
return [
88+
['capture'],
89+
['Capture'],
90+
];
91+
}
92+
8593
public function testSetThrowsLogicExceptionOnMissingPublicDir()
8694
{
8795
$captureCache = new Cache\Pattern\CaptureCache();

‎test/Pattern/ClassCacheTest.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ public function tearDown()
6666
parent::tearDown();
6767
}
6868

69+
public function getCommonPatternNamesProvider()
70+
{
71+
return [
72+
['class'],
73+
['Class'],
74+
];
75+
}
76+
6977
public function testCallEnabledCacheOutputByDefault()
7078
{
7179
$this->_testCall(

‎test/Pattern/CommonPatternTest.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
namespace ZendTest\Cache\Pattern;
1111

12+
use Zend\ServiceManager\ServiceManager;
13+
use Zend\Cache\PatternPluginManager;
14+
1215
/**
1316
* @group Zend_Cache
1417
* @covers Zend\Cache\Pattern\PatternOptions<extended>
@@ -34,6 +37,23 @@ public function tearDown()
3437
unset($this->_pattern);
3538
}
3639

40+
/**
41+
* A data provider for common pattern names
42+
*/
43+
abstract public function getCommonPatternNamesProvider();
44+
45+
/**
46+
* @dataProvider getCommonPatternNamesProvider
47+
*/
48+
public function testPatternPluginManagerWithCommonNames($commonPatternName)
49+
{
50+
$pluginManager = new PatternPluginManager(new ServiceManager);
51+
$this->assertTrue(
52+
$pluginManager->has($commonPatternName),
53+
"Pattern name '{$commonPatternName}' not found in PatternPluginManager"
54+
);
55+
}
56+
3757
public function testOptionNamesValid()
3858
{
3959
$options = $this->_pattern->getOptions();

‎test/Pattern/ObjectCacheTest.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ public function tearDown()
7474
parent::tearDown();
7575
}
7676

77+
public function getCommonPatternNamesProvider()
78+
{
79+
return [
80+
['object'],
81+
['Object'],
82+
];
83+
}
84+
7785
public function testCallEnabledCacheOutputByDefault()
7886
{
7987
$this->_testCall(

‎test/Pattern/OutputCacheTest.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ public function tearDown()
6363
parent::tearDown();
6464
}
6565

66+
public function getCommonPatternNamesProvider()
67+
{
68+
return [
69+
['output'],
70+
['Output'],
71+
];
72+
}
73+
6674
public function testStartEndCacheMiss()
6775
{
6876
$output = 'foobar';

‎test/Storage/Adapter/AbstractDbaTest.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,13 @@ public function tearDown()
6262

6363
parent::tearDown();
6464
}
65+
66+
public function getCommonAdapterNamesProvider()
67+
{
68+
return [
69+
['dba'],
70+
['Dba'],
71+
['DBA'],
72+
];
73+
}
6574
}

‎test/Storage/Adapter/ApcTest.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,12 @@ public function tearDown()
5858

5959
parent::tearDown();
6060
}
61+
62+
public function getCommonAdapterNamesProvider()
63+
{
64+
return [
65+
['apc'],
66+
['Apc'],
67+
];
68+
}
6169
}

0 commit comments

Comments
 (0)