FIX: sf4 compatibility

Author: PastisD

Command/PhpfastcacheCommand.php

@@ -17,7 +17,7 @@
 namespace Phpfastcache\Bundle\Command;
 
 use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
-use Phpfastcache\Exceptions\phpFastCacheDriverCheckException;
+use Phpfastcache\Exceptions\PhpfastcacheDriverCheckException;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -58,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
                     $output->writeln("<fg=green>Cache instance {$name} cleared</>");
                 }
-            }catch (phpFastCacheDriverCheckException $e){
+            }catch (PhpfastcacheDriverCheckException $e){
                 $failedInstances[] = $name;
                 if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
                     $output->writeln("<fg=red>Cache instance {$name} not cleared, got exception: " . "<bg=red;options=bold>" . $e->getMessage() ."</>");

DataCollector/CacheCollector.php

@@ -27,7 +27,7 @@
 class CacheCollector extends DataCollector
 {
     /**
-     * @var \phpFastCache\Bundle\Service\Cache
+     * @var \Phpfastcache\Bundle\Service\Cache
      */
     private $cache;
 
@@ -39,7 +39,7 @@ class CacheCollector extends DataCollector
     /**
      * CacheCollector constructor.
      *
-     * @param \phpFastCache\Bundle\Service\Cache $cache
+     * @param \Phpfastcache\Bundle\Service\Cache $cache
      */
     public function __construct(Cache $cache)
     {

DependencyInjection/PhpfastcacheExtension.php

@@ -16,7 +16,7 @@
 
 namespace Phpfastcache\Bundle\DependencyInjection;
 
-use Phpfastcache\Exceptions\phpFastCacheDriverException;
+use Phpfastcache\Exceptions\PhpfastcacheDriverException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -31,8 +31,8 @@ class PhpfastcacheExtension extends Extension
     /**
      * {@inheritDoc}
      *
-     * @throws \phpFastCache\Exceptions\phpFastCacheDriverCheckException
-     * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
+     * @throws \Phpfastcache\Exceptions\PhpfastcacheDriverCheckException
+     * @throws \Phpfastcache\Exceptions\PhpfastcacheDriverException
      * @throws \Exception
      * @throws \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
      * @throws \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
@@ -55,10 +55,10 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         foreach ($config['drivers'] as $name => $driver) {
-            $class = "phpFastCache\\Drivers\\" . $driver['type'] . '\Driver';
+            $class = "Phpfastcache\\Drivers\\" . $driver['type'] . '\Driver';
             foreach ($driver['parameters'] as $parameter_name => $parameter) {
                 if (!$class::isValidOption($parameter_name, $parameter)) {
-                    throw new phpFastCacheDriverException("Option $parameter_name in driver {$driver['type']} doesn't exists");
+                    throw new PhpfastcacheDriverException("Option $parameter_name in driver {$driver['type']} doesn't exists");
                 }
             }
         }

Docs/Example/Controller/DefaultController.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use Phpfastcache\Exceptions\phpFastCacheDriverCheckException;
+use Phpfastcache\Exceptions\PhpfastcacheDriverCheckException;
 
 class DefaultController extends Controller
 {
@@ -31,7 +31,7 @@ public function indexAction(Request $request)
         try{
             $cache9 = $this->get('phpfastcache')->get('apccache');
             $cache10 = $this->get('phpfastcache')->get('apcucache');
-        }catch(phpFastCacheDriverCheckException $e){
+        }catch(PhpfastcacheDriverCheckException $e){
             $cache11 = $this->get('phpfastcache')->get('xcachecache');
         }
 

Docs/Example/app/AppKernel.php

@@ -19,7 +19,7 @@ public function registerBundles()
             /**
              * PhpFastCache Bundle
              */
-          new phpFastCache\Bundle\phpFastCacheBundle(),
+          new Phpfastcache\Bundle\phpFastCacheBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

README.md

@@ -33,7 +33,7 @@ php_fast_cache:
 #### :wrench: Step 3: Setup your AppKernel.php by adding the phpFastCache Bundle
 
 ```php
-$bundles[] = new phpFastCache\Bundle\phpFastCacheBundle();
+$bundles[] = new Phpfastcache\Bundle\phpFastCacheBundle();
 ```
 
 * See the file Docs/Example/app/AppKernel.php for more information.

Resources/config/services.yml

@@ -1,13 +1,14 @@
 parameters:
-    php_fast_cache.cache.class: phpFastCache\Bundle\Service\Cache
-    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
+    php_fast_cache.cache.class: Phpfastcache\Bundle\Service\Cache
+    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:
-        class: "%php_fast_cache.cache.class%"
+    Phpfastcache\Bundle\Service\Cache:
+        autowire: true
+        public: false
         arguments:
             - "%phpfastcache%"
             - "@?debug.stopwatch"
@@ -17,7 +18,7 @@ services:
             - { name: twig.extension }
     phpfastcache.twig_cache_driver_provider:
         class: "%php_fast_cache.cache.class%"
-        factory: [ "@phpfastcache", "getTwigCacheInstance" ]
+        factory: 'Phpfastcache\Bundle\Service\Cache:getTwigCacheInstance'
     phpfastcache.twig_cache_provider:
         class: "%php_fast_cache.twig_cache_provider.class%"
         arguments:
@@ -33,4 +34,4 @@ services:
         arguments:
           - "@phpfastcache.twig_cache_stategy"
         tags:
-         - { name: twig.extension }
+         - { name: twig.extension }

Resources/config/services_dev.yml

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

Resources/views/data_collector/template.html.twig

@@ -14,7 +14,7 @@
 
 {% block toolbar %}
     {% set icon %}
-        <span class="icon">{{ include('@phpFastCache/data_collector/icon.svg') }}</span>
+        <span class="icon">{{ include('@Phpfastcache/data_collector/icon.svg') }}</span>
         <span class="sf-toolbar-value">{{ collector.size|sizeFormat(1) }}</span>
     {% endset %}
 
@@ -68,7 +68,7 @@
 
 {% block menu %}
     <span class="label{% if collector.stats|length == 0 %} disabled{% endif %}">
-        <span class="icon">{{ include('@phpFastCache/data_collector/icon.svg') }}</span>
+        <span class="icon">{{ include('@Phpfastcache/data_collector/icon.svg') }}</span>
         <strong>PhpFastCache</strong>
         {% if collector.stats|length > 0 %}
             <span class="count">

Service/Cache.php

@@ -17,7 +17,7 @@
 
 use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
 use Phpfastcache\CacheManager;
-use Phpfastcache\Exceptions\phpFastCacheDriverException;
+use Phpfastcache\Exceptions\PhpfastcacheDriverException;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -39,7 +39,7 @@ class Cache
     /**
      * Contains all cache instances
      *
-     * @var \phpFastCache\Cache\ExtendedCacheItemPoolInterface[]
+     * @var \Phpfastcache\Cache\ExtendedCacheItemPoolInterface[]
      */
     private $cacheInstances = [];
 
@@ -49,7 +49,7 @@ class Cache
      * @param array $config
      * @param Stopwatch $stopwatch
      *
-     * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
+     * @throws \Phpfastcache\Exceptions\phpFastCacheDriverException
      */
     public function __construct($config, Stopwatch $stopwatch = null)
     {
@@ -63,12 +63,12 @@ public function __construct($config, Stopwatch $stopwatch = null)
      * @param string $name
      * @param ExtendedCacheItemPoolInterface $instance
      *
-     * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
+     * @throws \Phpfastcache\Exceptions\phpFastCacheDriverException
      */
     public function createInstance($name, ExtendedCacheItemPoolInterface $instance)
     {
         if (array_key_exists($name, $this->cacheInstances) && $this->cacheInstances[ $name ] instanceof ExtendedCacheItemPoolInterface) {
-            throw new phpFastCacheDriverException("Cache instance '{$name}' already exists");
+            throw new PhpfastcacheDriverException("Cache instance '{$name}' already exists");
         }
         $this->cacheInstances[ $name ] = $instance;
     }
@@ -78,9 +78,9 @@ public function createInstance($name, ExtendedCacheItemPoolInterface $instance)
      *
      * @param string $name Name of configured driver
      *
-     * @return \phpFastCache\Cache\ExtendedCacheItemPoolInterface
+     * @return \Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface
      *
-     * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
+     * @throws \Phpfastcache\Exceptions\phpFastCacheDriverException
      */
     public function get($name)
     {
@@ -92,10 +92,10 @@ public function get($name)
             if (array_key_exists($name, $this->config[ 'drivers' ])) {
                 $this->createInstance($name, CacheManager::getInstance($this->config[ 'drivers' ][ $name ][ 'type' ], $this->config[ 'drivers' ][ $name ][ 'parameters' ]));
                 if (!$this->cacheInstances[ $name ] instanceof ExtendedCacheItemPoolInterface) {
-                    throw new phpFastCacheDriverException("Cache instance '{$name}' does not implements ExtendedCacheItemPoolInterface");
+                    throw new PhpfastcacheDriverException("Cache instance '{$name}' does not implements ExtendedCacheItemPoolInterface");
                 }
             } else {
-                throw new phpFastCacheDriverException("Cache instance '{$name}' not exists, check your config.yml");
+                throw new PhpfastcacheDriverException("Cache instance '{$name}' not exists, check your config.yml");
             }
         }
 
@@ -106,7 +106,7 @@ public function get($name)
     }
 
     /**
-     * @return \phpFastCache\Cache\ExtendedCacheItemPoolInterface
+     * @return \Phpfastcache\Cache\ExtendedCacheItemPoolInterface
      */
     public function getTwigCacheInstance()
     {
@@ -126,7 +126,7 @@ public function getConfig()
     /**
      * Return all cache instances
      *
-     * @return \phpFastCache\Cache\ExtendedCacheItemPoolInterface[]
+     * @return \Phpfastcache\Cache\ExtendedCacheItemPoolInterface[]
      */
     public function getInstances()
     {

Twig/CacheExtension/CacheStrategy/LifetimeCacheStrategy.php

@@ -43,19 +43,19 @@ class LifetimeCacheStrategy implements CacheStrategyInterface
     private $config = [];
 
     /**
-     * @var \phpFastCache\Bundle\Twig\CacheExtension\CacheProviderInterface
+     * @var \Phpfastcache\Bundle\Twig\CacheExtension\CacheProviderInterface
      */
     private $cache;
 
     /**
-     * @var \phpFastCache\Bundle\DataCollector\CacheCollector
+     * @var \Phpfastcache\Bundle\DataCollector\CacheCollector
      */
     private $cacheCollector;
 
     /**
      * LifetimeCacheStrategy constructor.
-     * @param \phpFastCache\Bundle\Twig\CacheExtension\CacheProviderInterface $cache
-     * @param \phpFastCache\Bundle\DataCollector\CacheCollector $cacheCollector
+     * @param \Phpfastcache\Bundle\Twig\CacheExtension\CacheProviderInterface $cache
+     * @param \Phpfastcache\Bundle\DataCollector\CacheCollector $cacheCollector
      * @param array $config
      */
     public function __construct(CacheProviderInterface $cache, CacheCollector $cacheCollector = null, $config)

Twig/CacheExtension/Node/CacheNode.php

@@ -46,7 +46,7 @@ public function compile(\Twig_Compiler $compiler)
         $i = self::$cacheCount++;
 
         if (version_compare(\Twig_Environment::VERSION, '1.26.0', '>=')) {
-            $extension = 'phpFastCache\Bundle\Twig\CacheExtension\Extension';
+            $extension = 'Phpfastcache\Bundle\Twig\CacheExtension\Extension';
         } else {
             $extension = 'phpfastcache_cache';
         }