diff --git a/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php b/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php index 11d8084a57..517c22b161 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php @@ -1,5 +1,14 @@ + * + * 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 Symfony\Bridge\Doctrine\ExpressionLanguage\DoctrineParserCache; diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php index dbab8ba08f..b0f0b39526 100644 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php +++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php @@ -24,17 +24,16 @@ class ExpressionLanguage /** * @var ParserCacheInterface */ - private $parserCache; - + private $cache; private $lexer; private $parser; private $compiler; protected $functions; - public function __construct(ParserCacheInterface $parserCache = null) + public function __construct(ParserCacheInterface $cache = null) { - $this->parserCache = $parserCache ?: new ArrayParserCache(); + $this->cache = $cache ?: new ArrayParserCache(); $this->functions = array(); $this->registerFunctions(); } @@ -80,11 +79,11 @@ class ExpressionLanguage $key = $expression.'//'.implode('-', $names); - if (null === $parsedExpression = $this->parserCache->fetch($key)) { + if (null === $parsedExpression = $this->cache->fetch($key)) { $nodes = $this->getParser()->parse($this->getLexer()->tokenize((string) $expression), $names); $parsedExpression = new ParsedExpression((string) $expression, $nodes); - $this->parserCache->save($key, $parsedExpression); + $this->cache->save($key, $parsedExpression); } return $parsedExpression; diff --git a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php b/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php index 888b522645..d268a9970f 100644 --- a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php +++ b/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php @@ -19,13 +19,18 @@ use Symfony\Component\ExpressionLanguage\ParsedExpression; interface ParserCacheInterface { /** - * @param string $key - * @param ParsedExpression $data + * Saves an expression in the cache. + * + * @param string $key The cache key + * @param ParsedExpression $data A ParsedExpression instance to store in the cache */ public function save($key, ParsedExpression $expression); /** - * @param string $key + * 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 0ef42bb0ca..170ac40d0a 100644 --- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php +++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php @@ -1,5 +1,14 @@ + * + * 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 Symfony\Component\ExpressionLanguage\ExpressionLanguage;