marked Twig_Node_Module as final via an annotation (will be final in 3.0)

This commit is contained in:
Fabien Potencier
2017-05-22 07:58:06 +02:00
parent fa1a84ec0b
commit 3810368b3b
4 changed files with 13 additions and 7 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
* 2.3.3 (2017-XX-XX)
* 2.4.0 (2017-XX-XX)
* n/a
* marked Twig_Node_Module as final via the @final annotation
* 2.3.2 (2017-04-20)
+1 -1
View File
@@ -47,7 +47,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
"dev-master": "2.4-dev"
}
}
}
+4 -4
View File
@@ -16,11 +16,11 @@
*/
class Twig_Environment
{
const VERSION = '2.3.3-DEV';
const VERSION_ID = 20303;
const VERSION = '2.4.0-DEV';
const VERSION_ID = 20400;
const MAJOR_VERSION = 2;
const MINOR_VERSION = 3;
const RELEASE_VERSION = 3;
const MINOR_VERSION = 4;
const RELEASE_VERSION = 0;
const EXTRA_VERSION = 'DEV';
private $charset;
+6
View File
@@ -18,6 +18,8 @@
* display_end, constructor_start, constructor_end, and class_end.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since 2.4.0
*/
class Twig_Node_Module extends Twig_Node
{
@@ -25,6 +27,10 @@ class Twig_Node_Module extends Twig_Node
public function __construct(Twig_Node $body, Twig_Node_Expression $parent = null, Twig_Node $blocks, Twig_Node $macros, Twig_Node $traits, $embeddedTemplates, Twig_Source $source)
{
if (__CLASS__ !== get_class($this)) {
@trigger_error('Overriding '.__CLASS__.' is deprecated since version 2.4.0 and the class will be final in 3.0.', E_USER_DEPRECATED);
}
$this->source = $source;
$nodes = array(