Preparing namespaces to pfc v7

Geolim4 · Geolim4 · commit f4fc1d9650fc · 2018-05-02T00:20:19.000+02:00
diff --git a/Command/PhpfastcacheCommand.php b/Command/PhpfastcacheCommand.php
@@ -14,17 +14,17 @@
  *
  */
 
-namespace phpFastCache\Bundle\Command;
+namespace Phpfastcache\Bundle\Command;
 
-use phpFastCache\Cache\ExtendedCacheItemPoolInterface;
-use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
+use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
+use Phpfastcache\Exceptions\phpFastCacheDriverCheckException;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
-class phpFastCacheCommand extends ContainerAwareCommand
+class PhpfastcacheCommand extends ContainerAwareCommand
 {
     protected function configure()
     {
diff --git a/DataCollector/CacheCollector.php b/DataCollector/CacheCollector.php
@@ -14,12 +14,12 @@
  *
  */
 
-namespace phpFastCache\Bundle\DataCollector;
+namespace Phpfastcache\Bundle\DataCollector;
 
-use phpFastCache\Api as phpFastCacheApi;
-use phpFastCache\Bundle\phpFastCacheBundle;
-use phpFastCache\Bundle\Service\Cache;
-use phpFastCache\CacheManager;
+use Phpfastcache\Api as phpFastCacheApi;
+use Phpfastcache\Bundle\phpFastCacheBundle;
+use Phpfastcache\Bundle\Service\Cache;
+use Phpfastcache\CacheManager;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
@@ -206,4 +206,9 @@ public function getName()
     {
         return 'phpfastcache';
     }
+
+    public function reset()
+    {
+        // TODO: Implement reset() method.
+    }
 }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -14,15 +14,15 @@
  *
  */
 
-namespace phpFastCache\Bundle\DependencyInjection;
+namespace Phpfastcache\Bundle\DependencyInjection;
 
-use phpFastCache\CacheManager;
+use Phpfastcache\CacheManager;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
  * Class Configuration
- * @package phpFastCache\Bundle\DependencyInjection
+ * @package Phpfastcache\Bundle\DependencyInjection
  */
 class Configuration implements ConfigurationInterface
 {
diff --git a/DependencyInjection/PhpfastcacheExtension.php b/DependencyInjection/PhpfastcacheExtension.php
@@ -14,19 +14,19 @@
  *
  */
 
-namespace phpFastCache\Bundle\DependencyInjection;
+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;
 use Symfony\Component\DependencyInjection\Loader;
 
 /**
  * Class phpFastCacheExtension
- * @package phpFastCache\Bundle\DependencyInjection
+ * @package Phpfastcache\Bundle\DependencyInjection
  */
-class phpFastCacheExtension extends Extension
+class PhpfastcacheExtension extends Extension
 {
     /**
      * {@inheritDoc}
diff --git a/Docs/Example/Controller/DefaultController.php b/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
 {
diff --git a/PhpfastcacheBundle.php b/PhpfastcacheBundle.php
@@ -13,15 +13,15 @@
  *
  */
 
-namespace phpFastCache\Bundle;
+namespace Phpfastcache\Bundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class phpFastCacheBundle
- * @package phpFastCache\Bundle
+ * Class PhpfastcacheBundle
+ * @package Phpfastcache\Bundle
  */
-class phpFastCacheBundle extends Bundle
+class PhpfastcacheBundle extends Bundle
 {
     const VERSION = '1.0.4';
 }
diff --git a/Service/Cache.php b/Service/Cache.php
@@ -13,16 +13,16 @@
  *
  */
 
-namespace phpFastCache\Bundle\Service;
+namespace Phpfastcache\Bundle\Service;
 
-use phpFastCache\Cache\ExtendedCacheItemPoolInterface;
-use phpFastCache\CacheManager;
-use phpFastCache\Exceptions\phpFastCacheDriverException;
+use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
+use Phpfastcache\CacheManager;
+use Phpfastcache\Exceptions\phpFastCacheDriverException;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * Class Cache
- * @package phpFastCache\Bundle\Service
+ * @package Phpfastcache\Bundle\Service
  */
 class Cache
 {
diff --git a/Twig/CacheExtension/CacheProvider/PsrCacheAdapter.php b/Twig/CacheExtension/CacheProvider/PsrCacheAdapter.php
@@ -15,9 +15,9 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\CacheProvider;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\CacheProvider;
 
-use phpFastCache\Bundle\Twig\CacheExtension\CacheProviderInterface;
+use Phpfastcache\Bundle\Twig\CacheExtension\CacheProviderInterface;
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
diff --git a/Twig/CacheExtension/CacheProviderInterface.php b/Twig/CacheExtension/CacheProviderInterface.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension;
+namespace Phpfastcache\Bundle\Twig\CacheExtension;
 
 /**
  * Cache provider interface.
diff --git a/Twig/CacheExtension/CacheStrategy/LifetimeCacheStrategy.php b/Twig/CacheExtension/CacheStrategy/LifetimeCacheStrategy.php
@@ -15,12 +15,12 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\CacheStrategy;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategy;
 
-use phpFastCache\Bundle\Twig\CacheExtension\CacheProviderInterface;
-use phpFastCache\Bundle\Twig\CacheExtension\CacheStrategyInterface;
-use phpFastCache\Bundle\Twig\CacheExtension\Exception\InvalidCacheLifetimeException;
-use phpFastCache\Bundle\DataCollector\CacheCollector;
+use Phpfastcache\Bundle\Twig\CacheExtension\CacheProviderInterface;
+use Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategyInterface;
+use Phpfastcache\Bundle\Twig\CacheExtension\Exception\InvalidCacheLifetimeException;
+use Phpfastcache\Bundle\DataCollector\CacheCollector;
 
 /**
  * Strategy for caching with a pre-defined lifetime.
diff --git a/Twig/CacheExtension/CacheStrategyInterface.php b/Twig/CacheExtension/CacheStrategyInterface.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension;
+namespace Phpfastcache\Bundle\Twig\CacheExtension;
 
 /**
  * Cache strategy interface.
diff --git a/Twig/CacheExtension/Exception/BaseException.php b/Twig/CacheExtension/Exception/BaseException.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
 
 /**
  * @todo Replace \RuntimeException with \InvalidArgumentException at version 2.0
diff --git a/Twig/CacheExtension/Exception/InvalidCacheKeyException.php b/Twig/CacheExtension/Exception/InvalidCacheKeyException.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
 
 class InvalidCacheKeyException extends BaseException
 {
diff --git a/Twig/CacheExtension/Exception/InvalidCacheLifetimeException.php b/Twig/CacheExtension/Exception/InvalidCacheLifetimeException.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
 
 class InvalidCacheLifetimeException extends BaseException
 {
diff --git a/Twig/CacheExtension/Exception/NonExistingStrategyException.php b/Twig/CacheExtension/Exception/NonExistingStrategyException.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
 
 class NonExistingStrategyException extends BaseException
 {
diff --git a/Twig/CacheExtension/Exception/NonExistingStrategyKeyException.php b/Twig/CacheExtension/Exception/NonExistingStrategyKeyException.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
 
 class NonExistingStrategyKeyException extends BaseException
 {
diff --git a/Twig/CacheExtension/Extension.php b/Twig/CacheExtension/Extension.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension;
+namespace Phpfastcache\Bundle\Twig\CacheExtension;
 
 /**
  * Extension for caching template blocks with twig.
diff --git a/Twig/CacheExtension/Node/CacheNode.php b/Twig/CacheExtension/Node/CacheNode.php
@@ -15,7 +15,7 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\Node;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\Node;
 
 /**
  * Cache twig node.
diff --git a/Twig/CacheExtension/TokenParser/Cache.php b/Twig/CacheExtension/TokenParser/Cache.php
@@ -15,9 +15,9 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\CacheExtension\TokenParser;
+namespace Phpfastcache\Bundle\Twig\CacheExtension\TokenParser;
 
-use phpFastCache\Bundle\Twig\CacheExtension\Node\CacheNode;
+use Phpfastcache\Bundle\Twig\CacheExtension\Node\CacheNode;
 
 /**
  * Parser for cache/endcache blocks.
diff --git a/Twig/HumanReadableExtension.php b/Twig/HumanReadableExtension.php
@@ -13,11 +13,11 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig;
+namespace Phpfastcache\Bundle\Twig;
 
 /**
  * Class HumanReadableExtension
- * @package phpFastCache\Bundle\Twig
+ * @package Phpfastcache\Bundle\Twig
  */
 class HumanReadableExtension extends \Twig_Extension
 {
diff --git a/Twig/HumanReadableExtension/Extension.php b/Twig/HumanReadableExtension/Extension.php
@@ -14,11 +14,11 @@
  *
  */
 
-namespace phpFastCache\Bundle\Twig\HumanReadableExtension;
+namespace Phpfastcache\Bundle\Twig\HumanReadableExtension;
 
 /**
  * Class HumanReadableExtension
- * @package phpFastCache\Bundle\Twig
+ * @package Phpfastcache\Bundle\Twig
  */
 class Extension extends \Twig_Extension
 {
diff --git a/composer.json b/composer.json
@@ -5,14 +5,8 @@
     "keywords": ["cache", "phpfastcache", "symfony", "php", "bundle"],
     "homepage": "http://www.phpfastcache.com",
     "license": "MIT",
-    "minimum-stability": "stable",
+    "minimum-stability": "rc",
     "authors": [
-            {
-                "name": "Khoa Bui",
-                "email": "khoaofgod@gmail.com",
-                "homepage": "http://www.phpfastcache.com",
-                "role": "Developer"
-            },
             {
                 "name": "Georges.L",
                 "email": "contact@geolim4.com",
@@ -24,13 +18,19 @@
                 "email": "PastisD@gmail.com",
                 "homepage": "https://github.com/PastisD",
                 "role": "Developer"
+            },
+            {
+                "name": "Khoa Bui",
+                "email": "khoaofgod@gmail.com",
+                "homepage": "http://www.phpfastcache.com",
+                "role": "Former developer"
             }
         ],
     "require": {
-        "symfony/symfony": "^2.8|3.*",
-        "phpFastCache/phpFastCache": "^5.0"
+        "symfony/symfony": "^3.3|^4.0",
+        "phpFastCache/phpFastCache": "^7.0"
     },
     "autoload": {
-        "psr-4": { "phpFastCache\\Bundle\\": "" }
+        "psr-4": { "Phpfastcache\\Bundle\\": "" }
     }
 }
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -14,17 +14,17 @@`
`14`	`14`	`*`
`15`	`15`	`*/`
`16`	`16`
`17`		`-namespace phpFastCache\Bundle\Command;`
	`17`	`+namespace Phpfastcache\Bundle\Command;`
`18`	`18`
`19`		`-use phpFastCache\Cache\ExtendedCacheItemPoolInterface;`
`20`		`-use phpFastCache\Exceptions\phpFastCacheDriverCheckException;`
	`19`	`+use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;`
	`20`	`+use Phpfastcache\Exceptions\phpFastCacheDriverCheckException;`
`21`	`21`	`use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;`
`22`	`22`	`use Symfony\Component\Console\Input\InputArgument;`
`23`	`23`	`use Symfony\Component\Console\Input\InputInterface;`
`24`	`24`	`use Symfony\Component\Console\Output\OutputInterface;`
`25`	`25`	`use Symfony\Component\Console\Style\SymfonyStyle;`
`26`	`26`
`27`		`-class phpFastCacheCommand extends ContainerAwareCommand`
	`27`	`+class PhpfastcacheCommand extends ContainerAwareCommand`
`28`	`28`	`{`
`29`	`29`	`protected function configure()`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Symfony\Component\Routing\Annotation\Route;`
`6`	`6`	`use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
`7`	`7`	`use Symfony\Component\HttpFoundation\Request;`
`8`		`-use phpFastCache\Exceptions\phpFastCacheDriverCheckException;`
	`8`	`+use Phpfastcache\Exceptions\phpFastCacheDriverCheckException;`
`9`	`9`
`10`	`10`	`class DefaultController extends Controller`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,15 @@`
`13`	`13`	`*`
`14`	`14`	`*/`
`15`	`15`
`16`		`-namespace phpFastCache\Bundle;`
	`16`	`+namespace Phpfastcache\Bundle;`
`17`	`17`
`18`	`18`	`use Symfony\Component\HttpKernel\Bundle\Bundle;`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * Class phpFastCacheBundle`
`22`		`- * @package phpFastCache\Bundle`
	`21`	`+ * Class PhpfastcacheBundle`
	`22`	`+ * @package Phpfastcache\Bundle`
`23`	`23`	`*/`
`24`		`-class phpFastCacheBundle extends Bundle`
	`24`	`+class PhpfastcacheBundle extends Bundle`
`25`	`25`	`{`
`26`	`26`	`const VERSION = '1.0.4';`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-namespace phpFastCache\Bundle\Twig\CacheExtension\CacheProvider;`
	`18`	`+namespace Phpfastcache\Bundle\Twig\CacheExtension\CacheProvider;`
`19`	`19`
`20`		`-use phpFastCache\Bundle\Twig\CacheExtension\CacheProviderInterface;`
	`20`	`+use Phpfastcache\Bundle\Twig\CacheExtension\CacheProviderInterface;`
`21`	`21`	`use Psr\Cache\CacheItemPoolInterface;`
`22`	`22`
`23`	`23`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-namespace phpFastCache\Bundle\Twig\CacheExtension;`
	`18`	`+namespace Phpfastcache\Bundle\Twig\CacheExtension;`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* Cache provider interface.`