geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-17 21:07:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

deprecated function/test/filter/tag overriding

Browse Source
This commit is contained in:
Fabien Potencier
2016-12-17 22:01:48 +01:00
parent 9dd38e29e3
commit 7ffb188710
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+2 -1
View File
@@ -1,5 +1,6 @@
* 1.29.1 (2017-XX-XX) * 1.30.0 (2017-XX-XX)
* deprecated function/test/filter/tag overriding
* deprecated the "disable_c_ext" attribute on Twig_Node_Expression_GetAttr * deprecated the "disable_c_ext" attribute on Twig_Node_Expression_GetAttr
* 1.29.0 (2016-12-13) * 1.29.0 (2016-12-13)
composer.json
+1 -1
View File
@@ -40,7 +40,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.29-dev" "dev-master": "1.30-dev"
} }
} }
} }
ext/twig/php_twig.h
+1 -1
View File
@@ -15,7 +15,7 @@
#ifndef PHP_TWIG_H #ifndef PHP_TWIG_H
#define PHP_TWIG_H #define PHP_TWIG_H
#define PHP_TWIG_VERSION "1.29.1-DEV" #define PHP_TWIG_VERSION "1.30.0-DEV"
#include "php.h" #include "php.h"
lib/Twig/Environment.php
+4 -4
View File
@@ -16,11 +16,11 @@
*/ */
class Twig_Environment class Twig_Environment
{ {
const VERSION = '1.29.1-DEV'; const VERSION = '1.30.0-DEV';
const VERSION_ID = 12901; const VERSION_ID = 13000;
const MAJOR_VERSION = 1; const MAJOR_VERSION = 1;
const MINOR_VERSION = 29; const MINOR_VERSION = 30;
const RELEASE_VERSION = 1; const RELEASE_VERSION = 0;
const EXTRA_VERSION = 'DEV'; const EXTRA_VERSION = 'DEV';
protected $charset; protected $charset;
lib/Twig/Extension/Staging.php
+17 -1
View File
@@ -29,6 +29,10 @@ class Twig_Extension_Staging extends Twig_Extension
public function addFunction($name, $function) public function addFunction($name, $function)
{ {
if (isset($this->functions[$name])) {
@trigger_error(sprintf('Overriding function "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
}
$this->functions[$name] = $function; $this->functions[$name] = $function;
} }
@@ -39,6 +43,10 @@ class Twig_Extension_Staging extends Twig_Extension
public function addFilter($name, $filter) public function addFilter($name, $filter)
{ {
if (isset($this->filters[$name])) {
@trigger_error(sprintf('Overriding filter "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
}
$this->filters[$name] = $filter; $this->filters[$name] = $filter;
} }
@@ -59,7 +67,11 @@ class Twig_Extension_Staging extends Twig_Extension
public function addTokenParser(Twig_TokenParserInterface $parser) public function addTokenParser(Twig_TokenParserInterface $parser)
{ {
$this->tokenParsers[] = $parser; if (isset($this->tokenParsers[$parser->getTag()])) {
@trigger_error(sprintf('Overriding tag "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $parser->getTag()), E_USER_DEPRECATED);
}
$this->tokenParsers[$parser->getTag()] = $parser;
} }
public function getTokenParsers() public function getTokenParsers()
@@ -79,6 +91,10 @@ class Twig_Extension_Staging extends Twig_Extension
public function addTest($name, $test) public function addTest($name, $test)
{ {
if (isset($this->tests[$name])) {
@trigger_error(sprintf('Overriding test "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
}
$this->tests[$name] = $test; $this->tests[$name] = $test;
} }