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

Commit f4fc1d9

Browse files
Geolim4Geolim4
committed
Preparing namespaces to pfc v7
1 parent 2fd3b46 commit f4fc1d9

23 files changed

+434
-243
lines changed

‎Command/phpFastCacheCommand.php renamed to ‎Command/PhpfastcacheCommand.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
*
1515
*/
1616

17-
namespace phpFastCache\Bundle\Command;
17+
namespace Phpfastcache\Bundle\Command;
1818

19-
use phpFastCache\Cache\ExtendedCacheItemPoolInterface;
20-
use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
19+
use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
20+
use Phpfastcache\Exceptions\phpFastCacheDriverCheckException;
2121
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
2222
use Symfony\Component\Console\Input\InputArgument;
2323
use Symfony\Component\Console\Input\InputInterface;
2424
use Symfony\Component\Console\Output\OutputInterface;
2525
use Symfony\Component\Console\Style\SymfonyStyle;
2626

27-
class phpFastCacheCommand extends ContainerAwareCommand
27+
class PhpfastcacheCommand extends ContainerAwareCommand
2828
{
2929
protected function configure()
3030
{

‎DataCollector/CacheCollector.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
*
1515
*/
1616

17-
namespace phpFastCache\Bundle\DataCollector;
17+
namespace Phpfastcache\Bundle\DataCollector;
1818

19-
use phpFastCache\Api as phpFastCacheApi;
20-
use phpFastCache\Bundle\phpFastCacheBundle;
21-
use phpFastCache\Bundle\Service\Cache;
22-
use phpFastCache\CacheManager;
19+
use Phpfastcache\Api as phpFastCacheApi;
20+
use Phpfastcache\Bundle\phpFastCacheBundle;
21+
use Phpfastcache\Bundle\Service\Cache;
22+
use Phpfastcache\CacheManager;
2323
use Symfony\Component\HttpFoundation\Request;
2424
use Symfony\Component\HttpFoundation\Response;
2525
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
@@ -206,4 +206,9 @@ public function getName()
206206
{
207207
return 'phpfastcache';
208208
}
209+
210+
public function reset()
211+
{
212+
// TODO: Implement reset() method.
213+
}
209214
}

‎DependencyInjection/Configuration.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
*
1515
*/
1616

17-
namespace phpFastCache\Bundle\DependencyInjection;
17+
namespace Phpfastcache\Bundle\DependencyInjection;
1818

19-
use phpFastCache\CacheManager;
19+
use Phpfastcache\CacheManager;
2020
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
2121
use Symfony\Component\Config\Definition\ConfigurationInterface;
2222

2323
/**
2424
* Class Configuration
25-
* @package phpFastCache\Bundle\DependencyInjection
25+
* @package Phpfastcache\Bundle\DependencyInjection
2626
*/
2727
class Configuration implements ConfigurationInterface
2828
{

‎DependencyInjection/phpFastCacheExtension.php renamed to ‎DependencyInjection/PhpfastcacheExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
*
1515
*/
1616

17-
namespace phpFastCache\Bundle\DependencyInjection;
17+
namespace Phpfastcache\Bundle\DependencyInjection;
1818

19-
use phpFastCache\Exceptions\phpFastCacheDriverException;
19+
use Phpfastcache\Exceptions\phpFastCacheDriverException;
2020
use Symfony\Component\DependencyInjection\ContainerBuilder;
2121
use Symfony\Component\Config\FileLocator;
2222
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
2323
use Symfony\Component\DependencyInjection\Loader;
2424

2525
/**
2626
* Class phpFastCacheExtension
27-
* @package phpFastCache\Bundle\DependencyInjection
27+
* @package Phpfastcache\Bundle\DependencyInjection
2828
*/
29-
class phpFastCacheExtension extends Extension
29+
class PhpfastcacheExtension extends Extension
3030
{
3131
/**
3232
* {@inheritDoc}

‎Docs/Example/Controller/DefaultController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Symfony\Component\Routing\Annotation\Route;
66
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
77
use Symfony\Component\HttpFoundation\Request;
8-
use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
8+
use Phpfastcache\Exceptions\phpFastCacheDriverCheckException;
99

1010
class DefaultController extends Controller
1111
{

‎phpFastCacheBundle.php renamed to ‎PhpfastcacheBundle.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
*
1414
*/
1515

16-
namespace phpFastCache\Bundle;
16+
namespace Phpfastcache\Bundle;
1717

1818
use Symfony\Component\HttpKernel\Bundle\Bundle;
1919

2020
/**
21-
* Class phpFastCacheBundle
22-
* @package phpFastCache\Bundle
21+
* Class PhpfastcacheBundle
22+
* @package Phpfastcache\Bundle
2323
*/
24-
class phpFastCacheBundle extends Bundle
24+
class PhpfastcacheBundle extends Bundle
2525
{
2626
const VERSION = '1.0.4';
2727
}

‎Service/Cache.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
*
1414
*/
1515

16-
namespace phpFastCache\Bundle\Service;
16+
namespace Phpfastcache\Bundle\Service;
1717

18-
use phpFastCache\Cache\ExtendedCacheItemPoolInterface;
19-
use phpFastCache\CacheManager;
20-
use phpFastCache\Exceptions\phpFastCacheDriverException;
18+
use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
19+
use Phpfastcache\CacheManager;
20+
use Phpfastcache\Exceptions\phpFastCacheDriverException;
2121
use Symfony\Component\Stopwatch\Stopwatch;
2222

2323
/**
2424
* Class Cache
25-
* @package phpFastCache\Bundle\Service
25+
* @package Phpfastcache\Bundle\Service
2626
*/
2727
class Cache
2828
{

‎Twig/CacheExtension/CacheProvider/PsrCacheAdapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\CacheProvider;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\CacheProvider;
1919

20-
use phpFastCache\Bundle\Twig\CacheExtension\CacheProviderInterface;
20+
use Phpfastcache\Bundle\Twig\CacheExtension\CacheProviderInterface;
2121
use Psr\Cache\CacheItemPoolInterface;
2222

2323
/**

‎Twig/CacheExtension/CacheProviderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension;
1919

2020
/**
2121
* Cache provider interface.

‎Twig/CacheExtension/CacheStrategy/LifetimeCacheStrategy.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\CacheStrategy;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategy;
1919

20-
use phpFastCache\Bundle\Twig\CacheExtension\CacheProviderInterface;
21-
use phpFastCache\Bundle\Twig\CacheExtension\CacheStrategyInterface;
22-
use phpFastCache\Bundle\Twig\CacheExtension\Exception\InvalidCacheLifetimeException;
23-
use phpFastCache\Bundle\DataCollector\CacheCollector;
20+
use Phpfastcache\Bundle\Twig\CacheExtension\CacheProviderInterface;
21+
use Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategyInterface;
22+
use Phpfastcache\Bundle\Twig\CacheExtension\Exception\InvalidCacheLifetimeException;
23+
use Phpfastcache\Bundle\DataCollector\CacheCollector;
2424

2525
/**
2626
* Strategy for caching with a pre-defined lifetime.

‎Twig/CacheExtension/CacheStrategyInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension;
1919

2020
/**
2121
* Cache strategy interface.

‎Twig/CacheExtension/Exception/BaseException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
1919

2020
/**
2121
* @todo Replace \RuntimeException with \InvalidArgumentException at version 2.0

‎Twig/CacheExtension/Exception/InvalidCacheKeyException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
1919

2020
class InvalidCacheKeyException extends BaseException
2121
{

‎Twig/CacheExtension/Exception/InvalidCacheLifetimeException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
1919

2020
class InvalidCacheLifetimeException extends BaseException
2121
{

‎Twig/CacheExtension/Exception/NonExistingStrategyException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
1919

2020
class NonExistingStrategyException extends BaseException
2121
{

‎Twig/CacheExtension/Exception/NonExistingStrategyKeyException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\Exception;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\Exception;
1919

2020
class NonExistingStrategyKeyException extends BaseException
2121
{

‎Twig/CacheExtension/Extension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension;
1919

2020
/**
2121
* Extension for caching template blocks with twig.

‎Twig/CacheExtension/Node/CacheNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\Node;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\Node;
1919

2020
/**
2121
* Cache twig node.

‎Twig/CacheExtension/TokenParser/Cache.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
*/
1717

18-
namespace phpFastCache\Bundle\Twig\CacheExtension\TokenParser;
18+
namespace Phpfastcache\Bundle\Twig\CacheExtension\TokenParser;
1919

20-
use phpFastCache\Bundle\Twig\CacheExtension\Node\CacheNode;
20+
use Phpfastcache\Bundle\Twig\CacheExtension\Node\CacheNode;
2121

2222
/**
2323
* Parser for cache/endcache blocks.

‎Twig/HumanReadableExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
*
1414
*/
1515

16-
namespace phpFastCache\Bundle\Twig;
16+
namespace Phpfastcache\Bundle\Twig;
1717

1818
/**
1919
* Class HumanReadableExtension
20-
* @package phpFastCache\Bundle\Twig
20+
* @package Phpfastcache\Bundle\Twig
2121
*/
2222
class HumanReadableExtension extends \Twig_Extension
2323
{

‎Twig/HumanReadableExtension/Extension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
*
1515
*/
1616

17-
namespace phpFastCache\Bundle\Twig\HumanReadableExtension;
17+
namespace Phpfastcache\Bundle\Twig\HumanReadableExtension;
1818

1919
/**
2020
* Class HumanReadableExtension
21-
* @package phpFastCache\Bundle\Twig
21+
* @package Phpfastcache\Bundle\Twig
2222
*/
2323
class Extension extends \Twig_Extension
2424
{

‎composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@
55
"keywords": ["cache", "phpfastcache", "symfony", "php", "bundle"],
66
"homepage": "http://www.phpfastcache.com",
77
"license": "MIT",
8-
"minimum-stability": "stable",
8+
"minimum-stability": "rc",
99
"authors": [
10-
{
11-
"name": "Khoa Bui",
12-
"email": "[email protected]",
13-
"homepage": "http://www.phpfastcache.com",
14-
"role": "Developer"
15-
},
1610
{
1711
"name": "Georges.L",
1812
"email": "[email protected]",
@@ -24,13 +18,19 @@
2418
"email": "[email protected]",
2519
"homepage": "https://github.com/PastisD",
2620
"role": "Developer"
21+
},
22+
{
23+
"name": "Khoa Bui",
24+
"email": "[email protected]",
25+
"homepage": "http://www.phpfastcache.com",
26+
"role": "Former developer"
2727
}
2828
],
2929
"require": {
30-
"symfony/symfony": "^2.8|3.*",
31-
"phpFastCache/phpFastCache": "^5.0"
30+
"symfony/symfony": "^3.3|^4.0",
31+
"phpFastCache/phpFastCache": "^7.0"
3232
},
3333
"autoload": {
34-
"psr-4": { "phpFastCache\\Bundle\\": "" }
34+
"psr-4": { "Phpfastcache\\Bundle\\": "" }
3535
}
3636
}

0 commit comments

Comments
 (0)