Updated project structure by putting all sources in "src" directory

Author: Geolim4

composer.json

@@ -28,9 +28,14 @@
         ],
     "require": {
         "symfony/framework-bundle": "^3.4|^4.0",
+        "symfony/console": "^3.4|^4.0",
+        "symfony/dependency-injection": "^3.4|^4.0",
         "phpfastcache/phpfastcache": "^7.0"
     },
+    "suggest": {
+        "symfony/web-profiler-bundle": "To use the data collector."
+    },
     "autoload": {
-        "psr-4": { "Phpfastcache\\Bundle\\": "" }
+        "psr-4": { "Phpfastcache\\Bundle\\": "src/" }
     }
 }

Command/PhpfastcacheCommand.php renamed to src/Command/PhpfastcacheCommand.php

@@ -16,9 +16,9 @@
 
 namespace Phpfastcache\Bundle\DataCollector;
 
-use Phpfastcache\Api as phpFastCacheApi;
-use Phpfastcache\Bundle\phpFastCacheBundle;
-use Phpfastcache\Bundle\Service\Cache;
+use Phpfastcache\Api as PhpfastcacheApi;
+use Phpfastcache\Bundle\PhpfastcacheBundle;
+use Phpfastcache\Bundle\Service\Phpfastcache;
 use Phpfastcache\CacheManager;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -27,7 +27,7 @@
 class CacheCollector extends DataCollector
 {
     /**
-     * @var \Phpfastcache\Bundle\Service\Cache
+     * @var \Phpfastcache\Bundle\Service\Phpfastcache
      */
     private $cache;
 
@@ -39,9 +39,9 @@ class CacheCollector extends DataCollector
     /**
      * CacheCollector constructor.
      *
-     * @param \Phpfastcache\Bundle\Service\Cache $cache
+     * @param \Phpfastcache\Bundle\Service\Phpfastcache $cache
      */
-    public function __construct(Cache $cache)
+    public function __construct(Phpfastcache $cache)
     {
         $this->cache = $cache;
     }
@@ -66,16 +66,17 @@ public function collect(Request $request, Response $response, \Exception $except
             $stats[ $instanceName ] = $cache->getStats();
             $instances[ $instanceName ] = [
               'driverName' => $cache->getDriverName(),
-              'driverConfig' => $cache->getConfig(),
+              'driverConfig' => $cache->getConfig()->toArray(),
             ];
             $driverUsed[ $cache->getDriverName() ] = get_class($cache);
         }
 
         $this->data = [
           'twigCacheBlocks' => $this->twig_cache_blocks,
-          'apiVersion' => phpFastCacheApi::getVersion(),
+          'apiVersion' => PhpfastcacheApi::getVersion(),
+          'pfcVersion' => PhpfastcacheApi::getPhpFastCacheVersion(),
           'bundleVersion' => phpFastCacheBundle::VERSION,
-          'apiChangelog' => phpFastCacheApi::getChangelog(),
+          'apiChangelog' => PhpfastcacheApi::getChangelog(),
           'driverUsed' => $driverUsed,
           'instances' => $instances,
           'stats' => $stats,
@@ -85,7 +86,8 @@ public function collect(Request $request, Response $response, \Exception $except
             'write' => (int) CacheManager::$WriteHits,
           ],
           'coreConfig' => [
-            'namespacePath' => CacheManager::getNamespacePath(),
+            'driverList' => CacheManager::getDriverList(true),
+            'namespacePath (deprecated)' => CacheManager::getNamespacePath(true),
           ],
           'projectConfig' => [
             'twig_driver' => $this->cache->getConfig()['twig_driver'],
@@ -158,6 +160,14 @@ public function getApiVersion()
         return $this->data[ 'apiVersion' ];
     }
 
+    /**
+     * @return mixed
+     */
+    public function getPfcVersion()
+    {
+        return $this->data[ 'pfcVersion' ];
+    }
+
     /**
      * @return mixed
      */

DataCollector/CacheCollector.php renamed to src/DataCollector/CacheCollector.php

@@ -23,5 +23,5 @@
  */
 class PhpfastcacheBundle extends Bundle
 {
-    const VERSION = '1.0.4';
+    const VERSION = '3.0.0-alpha';
 }

DependencyInjection/Configuration.php renamed to src/DependencyInjection/Configuration.php

@@ -0,0 +1,32 @@
+Because the V3 is not backward compatible with the V2 we will help you to migrate your code:
+
+
+### Configuration name:
+
+#### :clock1: Then:
+```yaml
+# PhpFastCache configuration
+php_fast_cache:
+    twig_driver: "filecache" # This option must be a valid declared driver, in our example: "filecache"
+    twig_block_debug: true # This option will wrap CACHE/ENDCACHE blocks with block debug as HTML comment
+    drivers:
+        filecache:
+            type: Files
+            parameters:
+                path: "%kernel.cache_dir%/phpfastcache/"
+```
+
+#### :alarm_clock: Now:
+
+```yaml
+# PhpFastCache configuration
+phpfastcache:
+    twig_driver: "filecache" # This option must be a valid declared driver, in our example: "filecache"
+    twig_block_debug: true # This option will wrap CACHE/ENDCACHE blocks with block debug as HTML comment
+    drivers:
+        filecache:
+            type: Files
+            parameters:
+                path: "%kernel.cache_dir%/phpfastcache/"
+```
+Notice the change from "php_fast_cache" to "phpfastcache".

DependencyInjection/PhpfastcacheExtension.php renamed to src/DependencyInjection/PhpfastcacheExtension.php

@@ -0,0 +1,37 @@
+parameters:
+    php_fast_cache.phpfastcache.class: Phpfastcache\Bundle\Service\Phpfastcache
+    php_fast_cache.human_readable.class: Phpfastcache\Bundle\Twig\HumanReadableExtension\Extension
+    php_fast_cache.twig_cache.class: Phpfastcache\Bundle\Twig\CacheExtension\Extension
+    php_fast_cache.twig_cache_stategy.class: Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategy\LifetimeCacheStrategy
+    php_fast_cache.twig_cache_provider.class: Phpfastcache\Bundle\Twig\CacheExtension\CacheProvider\PsrCacheAdapter
+
+services:
+    Phpfastcache\Bundle\Service\Phpfastcache:
+        autowire: true
+        public: false
+        arguments:
+            - "%phpfastcache%"
+            - "@?debug.stopwatch"
+    phpfastcache.human_readable_size:
+        class: "%php_fast_cache.human_readable.class%"
+        tags:
+            - { name: twig.extension }
+    phpfastcache.twig_cache_driver_provider:
+        class: "%php_fast_cache.phpfastcache.class%"
+        factory: 'Phpfastcache\Bundle\Service\Phpfastcache:getTwigCacheInstance'
+    phpfastcache.twig_cache_provider:
+        class: "%php_fast_cache.twig_cache_provider.class%"
+        arguments:
+             - "@phpfastcache.twig_cache_driver_provider"
+    phpfastcache.twig_cache_stategy:
+        class: "%php_fast_cache.twig_cache_stategy.class%"
+        arguments:
+            - "@phpfastcache.twig_cache_provider"
+            - "@?phpfastcache.request_collector"
+            - "%phpfastcache%"
+    twig.extension.cache:
+        class: "%php_fast_cache.twig_cache.class%"
+        arguments:
+          - "@phpfastcache.twig_cache_stategy"
+        tags:
+         - { name: twig.extension }

PhpfastcacheBundle.php renamed to src/PhpfastcacheBundle.php

@@ -0,0 +1,15 @@
+parameters:
+    php_fast_cache.data_collector.class: Phpfastcache\Bundle\DataCollector\CacheCollector
+
+services:
+    data_collector.phpfastcache:
+        class: "%php_fast_cache.data_collector.class%"
+        arguments:
+            - '@Phpfastcache\Bundle\Service\Phpfastcache'
+        public: false
+        tags:
+            -
+                name:     data_collector
+                template: "@Phpfastcache/Collector/cache.html.twig"
+                id:       'phpfastcache'
+                priority: 300