Permalink
Browse files

Restructure cache.doctrine sources to have composer automatically built.

  • Loading branch information...
1 parent 7e7e5a6 commit a04c85e7b8a5a4428f657a01d6bb842f536cb3f6 @cdujeu cdujeu committed May 27, 2016
Showing with 13 additions and 17 deletions.
  1. +1 −3 core/src/plugins/cache.doctrine/class.DoctrineCacheDriver.php
  2. +1 −1 core/src/plugins/cache.doctrine/{doctrine → }/composer.json
  3. 0 core/src/plugins/cache.doctrine/{doctrine → }/composer.lock
  4. 0 core/src/plugins/cache.doctrine/{ext → src}/PatternClearableCache.php
  5. +0 −1 core/src/plugins/cache.doctrine/{ext → src}/PydioApcuCache.php
  6. +0 −1 core/src/plugins/cache.doctrine/{ext → src}/PydioRedisCache.php
  7. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/autoload.php
  8. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/composer/ClassLoader.php
  9. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/composer/LICENSE
  10. +3 −3 core/src/plugins/cache.doctrine/{doctrine → }/vendor/composer/autoload_classmap.php
  11. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/composer/autoload_namespaces.php
  12. +1 −1 core/src/plugins/cache.doctrine/{doctrine → }/vendor/composer/autoload_psr4.php
  13. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/composer/autoload_real.php
  14. +4 −4 core/src/plugins/cache.doctrine/{doctrine → }/vendor/composer/autoload_static.php
  15. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/composer/installed.json
  16. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/.coveralls.yml
  17. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/.gitignore
  18. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/.travis.yml
  19. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/LICENSE
  20. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/README.md
  21. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/UPGRADE.md
  22. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/build.properties
  23. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/build.xml
  24. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/composer.json
  25. 0 ...plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
  26. 0 ...lugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php
  27. 0 ...ugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
  28. 0 ...rc/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php
  29. 0 ...ns/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
  30. 0 ...ugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ChainCache.php
  31. 0 ...s/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php
  32. 0 ...s/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CouchbaseCache.php
  33. 0 ...lugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php
  34. 0 .../cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php
  35. 0 ...s/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php
  36. 0 ...ns/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php
  37. 0 ...s/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
  38. 0 ...ins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php
  39. 0 ...ns/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiGetCache.php
  40. 0 ...ns/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiPutCache.php
  41. 0 ...ins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php
  42. 0 ...gins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
  43. 0 ...ugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
  44. 0 ...lugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php
  45. 0 ...ins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php
  46. 0 .../plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php
  47. 0 ...lugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php
  48. 0 ...ns/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
  49. 0 ...gins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php
  50. 0 ...ns/cache.doctrine/{doctrine → }/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php
  51. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/phpunit.xml.dist
  52. 0 ...e.doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php
  53. 0 ....doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcuCacheTest.php
  54. 0 ...doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php
  55. 0 ...trine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/BaseFileCacheTest.php
  56. 0 ...trine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CacheProviderTest.php
  57. 0 ...ache.doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CacheTest.php
  58. 0 ...doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ChainCacheTest.php
  59. 0 ...rine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php
  60. +3 −3 ....doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/FileCacheTest.php
  61. 0 ...ine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/FilesystemCacheTest.php
  62. 0 ...trine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MemcacheCacheTest.php
  63. 0 ...rine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MemcachedCacheTest.php
  64. 0 ...ctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MongoDBCacheTest.php
  65. 0 ...ctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/PhpFileCacheTest.php
  66. 0 ...octrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/PredisCacheTest.php
  67. 0 ...doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/RedisCacheTest.php
  68. 0 ....doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/RiakCacheTest.php
  69. 0 ...ctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/SQLite3CacheTest.php
  70. 0 ....doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/VoidCacheTest.php
  71. 0 ...trine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/WinCacheCacheTest.php
  72. 0 ...octrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php
  73. 0 ...trine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ZendDataCacheTest.php
  74. 0 ...gins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/tests/Doctrine/Tests/DoctrineTestCase.php
  75. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/tests/travis/php.ini
  76. 0 core/src/plugins/cache.doctrine/{doctrine → }/vendor/doctrine/cache/tests/travis/phpunit.travis.xml
@@ -21,7 +21,7 @@
defined('AJXP_EXEC') or die( 'Access not allowed');
-require __DIR__ . "/doctrine/vendor/autoload.php";
+require __DIR__ . "/vendor/autoload.php";
define('APC_EXTENSION_LOADED', extension_loaded('apc') || extension_loaded('apcu'));
define('MEMCACHE_EXTENSION_LOADED', extension_loaded('memcache'));
@@ -152,7 +152,6 @@ private function initCacheWithNamespace($namespace){
public function _apc_init($options) {
if (extension_loaded('apcu')) {
- require_once ("ext/PydioApcuCache.php");
$cacheDriver = new Ext\PydioApcuCache();
} else {
$cacheDriver = new Cache\ApcCache();
@@ -188,7 +187,6 @@ public function _redis_init($options) {
if (! $running) return null;
- require_once "ext/PydioRedisCache.php";
$cacheDriver = new Ext\PydioRedisCache();
$cacheDriver->setRedis($redis);
return $cacheDriver;
@@ -4,7 +4,7 @@
},
"autoload": {
"psr-4": {
- "Pydio\\Plugins\\Cache\\Doctrine\\Ext\\": "../ext"
+ "Pydio\\Plugins\\Cache\\Doctrine\\Ext\\": "./src"
}
}
}
@@ -21,7 +21,6 @@
namespace Pydio\Plugins\Cache\Doctrine\Ext;
defined('AJXP_EXEC') or die('Access not allowed');
-require_once "PatternClearableCache.php";
class PydioApcuCache extends \Doctrine\Common\Cache\ApcuCache implements PatternClearableCache
{
@@ -21,7 +21,6 @@
namespace Pydio\Plugins\Cache\Doctrine\Ext;
defined('AJXP_EXEC') or die('Access not allowed');
-require_once "PatternClearableCache.php";
use Redis;
@@ -32,7 +32,7 @@
'Doctrine\\Common\\Cache\\WinCacheCache' => $vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php',
'Doctrine\\Common\\Cache\\XcacheCache' => $vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php',
'Doctrine\\Common\\Cache\\ZendDataCache' => $vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php',
- 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PatternClearableCache' => $baseDir . '/../ext/PatternClearableCache.php',
- 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PydioApcuCache' => $baseDir . '/../ext/PydioApcuCache.php',
- 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PydioRedisCache' => $baseDir . '/../ext/PydioRedisCache.php',
+ 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PatternClearableCache' => $baseDir . '/src/PatternClearableCache.php',
+ 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PydioApcuCache' => $baseDir . '/src/PydioApcuCache.php',
+ 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PydioRedisCache' => $baseDir . '/src/PydioRedisCache.php',
);
@@ -6,6 +6,6 @@
$baseDir = dirname($vendorDir);
return array(
- 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\' => array($baseDir . '/../ext'),
+ 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\' => array($baseDir . '/src'),
'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache'),
);
@@ -20,7 +20,7 @@ class ComposerStaticInit4bc137430010115d1364cb6bdd1d28d7
public static $prefixDirsPsr4 = array (
'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\' =>
array (
- 0 => __DIR__ . '/../..' . '/../ext',
+ 0 => __DIR__ . '/../..' . '/src',
),
'Doctrine\\Common\\Cache\\' =>
array (
@@ -55,9 +55,9 @@ class ComposerStaticInit4bc137430010115d1364cb6bdd1d28d7
'Doctrine\\Common\\Cache\\WinCacheCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php',
'Doctrine\\Common\\Cache\\XcacheCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php',
'Doctrine\\Common\\Cache\\ZendDataCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php',
- 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PatternClearableCache' => __DIR__ . '/../..' . '/../ext/PatternClearableCache.php',
- 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PydioApcuCache' => __DIR__ . '/../..' . '/../ext/PydioApcuCache.php',
- 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PydioRedisCache' => __DIR__ . '/../..' . '/../ext/PydioRedisCache.php',
+ 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PatternClearableCache' => __DIR__ . '/../..' . '/src/PatternClearableCache.php',
+ 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PydioApcuCache' => __DIR__ . '/../..' . '/src/PydioApcuCache.php',
+ 'Pydio\\Plugins\\Cache\\Doctrine\\Ext\\PydioRedisCache' => __DIR__ . '/../..' . '/src/PydioRedisCache.php',
);
public static function getInitializer(ClassLoader $loader)
@@ -73,7 +73,7 @@ public function testFileExtensionSlashCorrectlyEscaped()
$driver = $this->getMock(
'Doctrine\Common\Cache\FileCache',
array('doFetch', 'doContains', 'doSave'),
- array(__DIR__ . '/../', DIRECTORY_SEPARATOR . basename(__FILE__))
+ array(__DIR__ . '/Common/', DIRECTORY_SEPARATOR . basename(__FILE__))
);
$doGetStats = new \ReflectionMethod($driver, 'doGetStats');
@@ -98,7 +98,7 @@ public function testNonIntUmaskThrowsInvalidArgumentException()
public function testGetDirectoryReturnsRealpathDirectoryString()
{
- $directory = __DIR__ . '/../';
+ $directory = __DIR__ . '/Common/';
$driver = $this->getMock(
'Doctrine\Common\Cache\FileCache',
array('doFetch', 'doContains', 'doSave'),
@@ -115,7 +115,7 @@ public function testGetDirectoryReturnsRealpathDirectoryString()
public function testGetExtensionReturnsExtensionString()
{
- $directory = __DIR__ . '/../';
+ $directory = __DIR__ . '/Common/';
$extension = DIRECTORY_SEPARATOR . basename(__FILE__);
$driver = $this->getMock(
'Doctrine\Common\Cache\FileCache',

0 comments on commit a04c85e

Please sign in to comment.