From 37ac9457c9a6739eaff4818e47d09ed9a95652ec Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 20 May 2017 08:30:04 +0200 Subject: [PATCH] [ExpressionLanguage] remove deprecated features --- src/Symfony/Bridge/Doctrine/CHANGELOG.md | 5 + .../DoctrineParserCache.php | 56 ------- .../DoctrineParserCacheTest.php | 64 -------- .../Component/ExpressionLanguage/CHANGELOG.md | 8 + .../ExpressionLanguage/ExpressionLanguage.php | 13 +- .../ParserCache/ArrayParserCache.php | 45 ------ .../ParserCache/ParserCacheAdapter.php | 120 --------------- .../ParserCache/ParserCacheInterface.php | 41 ----- .../Tests/ExpressionLanguageTest.php | 41 ----- .../ParserCache/ParserCacheAdapterTest.php | 140 ------------------ 10 files changed, 14 insertions(+), 519 deletions(-) delete mode 100644 src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php delete mode 100644 src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php delete mode 100644 src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php delete mode 100644 src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheAdapter.php delete mode 100644 src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php delete mode 100644 src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md index 3dcb8770ec8cc..2cfb583d81884 100644 --- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md +++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +4.0.0 +----- + + * removed the `DoctrineParserCache` class + 3.1.0 ----- diff --git a/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php b/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php deleted file mode 100644 index e2eb6e664557b..0000000000000 --- a/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php +++ /dev/null @@ -1,56 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\Doctrine\ExpressionLanguage; - -@trigger_error('The '.__NAMESPACE__.'\DoctrineParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\DoctrineAdapter class instead.', E_USER_DEPRECATED); - -use Doctrine\Common\Cache\Cache; -use Symfony\Component\ExpressionLanguage\ParsedExpression; -use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface; - -/** - * @author Adrien Brault - * - * @deprecated DoctrineParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\DoctrineAdapter class instead. - */ -class DoctrineParserCache implements ParserCacheInterface -{ - /** - * @var Cache - */ - private $cache; - - public function __construct(Cache $cache) - { - $this->cache = $cache; - } - - /** - * {@inheritdoc} - */ - public function fetch($key) - { - if (false === $value = $this->cache->fetch($key)) { - return; - } - - return $value; - } - - /** - * {@inheritdoc} - */ - public function save($key, ParsedExpression $expression) - { - $this->cache->save($key, $expression); - } -} diff --git a/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php b/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php deleted file mode 100644 index 394b1b0dfe9a2..0000000000000 --- a/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php +++ /dev/null @@ -1,64 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\Doctrine\Tests\ExpressionLanguage; - -use PHPUnit\Framework\TestCase; -use Symfony\Bridge\Doctrine\ExpressionLanguage\DoctrineParserCache; - -/** - * @group legacy - */ -class DoctrineParserCacheTest extends TestCase -{ - public function testFetch() - { - $doctrineCacheMock = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock(); - $parserCache = new DoctrineParserCache($doctrineCacheMock); - - $doctrineCacheMock->expects($this->once()) - ->method('fetch') - ->will($this->returnValue('bar')); - - $result = $parserCache->fetch('foo'); - - $this->assertEquals('bar', $result); - } - - public function testFetchUnexisting() - { - $doctrineCacheMock = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock(); - $parserCache = new DoctrineParserCache($doctrineCacheMock); - - $doctrineCacheMock - ->expects($this->once()) - ->method('fetch') - ->will($this->returnValue(false)); - - $this->assertNull($parserCache->fetch('')); - } - - public function testSave() - { - $doctrineCacheMock = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock(); - $parserCache = new DoctrineParserCache($doctrineCacheMock); - - $expression = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParsedExpression') - ->disableOriginalConstructor() - ->getMock(); - - $doctrineCacheMock->expects($this->once()) - ->method('save') - ->with('foo', $expression); - - $parserCache->save('foo', $expression); - } -} diff --git a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md index d00d17c776dc2..6c50b2ea424df 100644 --- a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md +++ b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md @@ -1,6 +1,14 @@ CHANGELOG ========= +4.0.0 +----- + + * the first argument of the `ExpressionLanguage` constructor must be an instance + of `CacheItemPoolInterface` + * removed the `ArrayParserCache` and `ParserCacheAdapter` classes + * removed the `ParserCacheInterface` + 2.6.0 ----- diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php index 9aeefce672c59..64f4dd17371d5 100644 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php +++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php @@ -13,8 +13,6 @@ use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\ArrayAdapter; -use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheAdapter; -use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface; /** * Allows to compile and evaluate expressions written in your own DSL. @@ -37,17 +35,8 @@ class ExpressionLanguage * @param CacheItemPoolInterface $cache * @param ExpressionFunctionProviderInterface[] $providers */ - public function __construct($cache = null, array $providers = array()) + public function __construct(CacheItemPoolInterface $cache = null, array $providers = array()) { - if (null !== $cache) { - if ($cache instanceof ParserCacheInterface) { - @trigger_error(sprintf('Passing an instance of %s as constructor argument for %s is deprecated as of 3.2 and will be removed in 4.0. Pass an instance of %s instead.', ParserCacheInterface::class, self::class, CacheItemPoolInterface::class), E_USER_DEPRECATED); - $cache = new ParserCacheAdapter($cache); - } elseif (!$cache instanceof CacheItemPoolInterface) { - throw new \InvalidArgumentException(sprintf('Cache argument has to implement %s.', CacheItemPoolInterface::class)); - } - } - $this->cache = $cache ?: new ArrayAdapter(); $this->registerFunctions(); foreach ($providers as $provider) { diff --git a/src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php b/src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php deleted file mode 100644 index 777de421703f7..0000000000000 --- a/src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php +++ /dev/null @@ -1,45 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\ExpressionLanguage\ParserCache; - -@trigger_error('The '.__NAMESPACE__.'\ArrayParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.', E_USER_DEPRECATED); - -use Symfony\Component\ExpressionLanguage\ParsedExpression; - -/** - * @author Adrien Brault - * - * @deprecated ArrayParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead. - */ -class ArrayParserCache implements ParserCacheInterface -{ - /** - * @var array - */ - private $cache = array(); - - /** - * {@inheritdoc} - */ - public function fetch($key) - { - return isset($this->cache[$key]) ? $this->cache[$key] : null; - } - - /** - * {@inheritdoc} - */ - public function save($key, ParsedExpression $expression) - { - $this->cache[$key] = $expression; - } -} diff --git a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheAdapter.php b/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheAdapter.php deleted file mode 100644 index 2867aa3d4841b..0000000000000 --- a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheAdapter.php +++ /dev/null @@ -1,120 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\ExpressionLanguage\ParserCache; - -use Psr\Cache\CacheItemInterface; -use Psr\Cache\CacheItemPoolInterface; -use Symfony\Component\Cache\CacheItem; - -/** - * @author Alexandre GESLIN - * - * @internal This class should be removed in Symfony 4.0. - */ -class ParserCacheAdapter implements CacheItemPoolInterface -{ - private $pool; - private $createCacheItem; - - public function __construct(ParserCacheInterface $pool) - { - $this->pool = $pool; - - $this->createCacheItem = \Closure::bind( - function ($key, $value, $isHit) { - $item = new CacheItem(); - $item->key = $key; - $item->value = $value; - $item->isHit = $isHit; - - return $item; - }, - null, - CacheItem::class - ); - } - - /** - * {@inheritdoc} - */ - public function getItem($key) - { - $value = $this->pool->fetch($key); - $f = $this->createCacheItem; - - return $f($key, $value, null !== $value); - } - - /** - * {@inheritdoc} - */ - public function save(CacheItemInterface $item) - { - $this->pool->save($item->getKey(), $item->get()); - } - - /** - * {@inheritdoc} - */ - public function getItems(array $keys = array()) - { - throw new \BadMethodCallException('Not implemented'); - } - - /** - * {@inheritdoc} - */ - public function hasItem($key) - { - throw new \BadMethodCallException('Not implemented'); - } - - /** - * {@inheritdoc} - */ - public function clear() - { - throw new \BadMethodCallException('Not implemented'); - } - - /** - * {@inheritdoc} - */ - public function deleteItem($key) - { - throw new \BadMethodCallException('Not implemented'); - } - - /** - * {@inheritdoc} - */ - public function deleteItems(array $keys) - { - throw new \BadMethodCallException('Not implemented'); - } - - /** - * {@inheritdoc} - */ - public function saveDeferred(CacheItemInterface $item) - { - throw new \BadMethodCallException('Not implemented'); - } - - /** - * {@inheritdoc} - */ - public function commit() - { - throw new \BadMethodCallException('Not implemented'); - } -} diff --git a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php b/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php deleted file mode 100644 index 1e10cb419a485..0000000000000 --- a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php +++ /dev/null @@ -1,41 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\ExpressionLanguage\ParserCache; - -@trigger_error('The '.__NAMESPACE__.'\ParserCacheInterface interface is deprecated since version 3.2 and will be removed in 4.0. Use Psr\Cache\CacheItemPoolInterface instead.', E_USER_DEPRECATED); - -use Symfony\Component\ExpressionLanguage\ParsedExpression; - -/** - * @author Adrien Brault - * - * @deprecated since version 3.2, to be removed in 4.0. Use Psr\Cache\CacheItemPoolInterface instead. - */ -interface ParserCacheInterface -{ - /** - * Saves an expression in the cache. - * - * @param string $key The cache key - * @param ParsedExpression $expression A ParsedExpression instance to store in the cache - */ - public function save($key, ParsedExpression $expression); - - /** - * Fetches an expression from the cache. - * - * @param string $key The cache key - * - * @return ParsedExpression|null - */ - public function fetch($key); -} diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php index 82f1c439b9f47..085acbf370a9a 100644 --- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php +++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php @@ -63,47 +63,6 @@ public function testCachedParse() $this->assertSame($savedParsedExpression, $parsedExpression); } - /** - * @group legacy - */ - public function testCachedParseWithDeprecatedParserCacheInterface() - { - $cacheMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - - $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock(); - $savedParsedExpression = null; - $expressionLanguage = new ExpressionLanguage($cacheMock); - - $cacheMock - ->expects($this->exactly(1)) - ->method('fetch') - ->with('1%20%2B%201%2F%2F') - ->willReturn($savedParsedExpression) - ; - - $cacheMock - ->expects($this->exactly(1)) - ->method('save') - ->with('1%20%2B%201%2F%2F', $this->isInstanceOf(ParsedExpression::class)) - ->will($this->returnCallback(function ($key, $expression) use (&$savedParsedExpression) { - $savedParsedExpression = $expression; - })) - ; - - $parsedExpression = $expressionLanguage->parse('1 + 1', array()); - $this->assertSame($savedParsedExpression, $parsedExpression); - } - - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Cache argument has to implement Psr\Cache\CacheItemPoolInterface. - */ - public function testWrongCacheImplementation() - { - $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemSpoolInterface')->getMock(); - $expressionLanguage = new ExpressionLanguage($cacheMock); - } - public function testConstantFunction() { $expressionLanguage = new ExpressionLanguage(); diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php deleted file mode 100644 index 447316111b840..0000000000000 --- a/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php +++ /dev/null @@ -1,140 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\ExpressionLanguage\Tests; - -use PHPUnit\Framework\TestCase; -use Symfony\Component\ExpressionLanguage\ParsedExpression; -use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheAdapter; -use Symfony\Component\ExpressionLanguage\Node\Node; - -/** - * @group legacy - */ -class ParserCacheAdapterTest extends TestCase -{ - public function testGetItem() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - - $key = 'key'; - $value = 'value'; - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - - $poolMock - ->expects($this->once()) - ->method('fetch') - ->with($key) - ->willReturn($value) - ; - - $cacheItem = $parserCacheAdapter->getItem($key); - - $this->assertEquals($cacheItem->get(), $value); - $this->assertEquals($cacheItem->isHit(), true); - } - - public function testSave() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock(); - $key = 'key'; - $value = new ParsedExpression('1 + 1', new Node(array(), array())); - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - - $poolMock - ->expects($this->once()) - ->method('save') - ->with($key, $value) - ; - - $cacheItemMock - ->expects($this->once()) - ->method('getKey') - ->willReturn($key) - ; - - $cacheItemMock - ->expects($this->once()) - ->method('get') - ->willReturn($value) - ; - - $cacheItem = $parserCacheAdapter->save($cacheItemMock); - } - - public function testGetItems() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class); - - $parserCacheAdapter->getItems(); - } - - public function testHasItem() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - $key = 'key'; - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class); - - $parserCacheAdapter->hasItem($key); - } - - public function testClear() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class); - - $parserCacheAdapter->clear(); - } - - public function testDeleteItem() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - $key = 'key'; - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class); - - $parserCacheAdapter->deleteItem($key); - } - - public function testDeleteItems() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - $keys = array('key'); - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class); - - $parserCacheAdapter->deleteItems($keys); - } - - public function testSaveDeferred() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock(); - $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class); - - $parserCacheAdapter->saveDeferred($cacheItemMock); - } - - public function testCommit() - { - $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); - $parserCacheAdapter = new ParserCacheAdapter($poolMock); - $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class); - - $parserCacheAdapter->commit(); - } -} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy