diff --git a/CHANGELOG b/CHANGELOG index cc3a168de..f4bd1d9d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -* 1.42.0 (2019-XX-XX) +* 1.42.0 (2019-05-31) * fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator (\SimpleXmlElement for instance) * fixed a PHP fatal error when calling a macro imported in a block in a nested block diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 780679369..b5f392ad7 100644 --- a/ext/twig/php_twig.h +++ b/ext/twig/php_twig.h @@ -15,7 +15,7 @@ #ifndef PHP_TWIG_H #define PHP_TWIG_H -#define PHP_TWIG_VERSION "1.41.2-DEV" +#define PHP_TWIG_VERSION "1.42.0" #include "php.h" diff --git a/src/Environment.php b/src/Environment.php index be42d517e..ba63f944a 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -41,12 +41,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - const VERSION = '1.42.0-DEV'; + const VERSION = '1.42.0'; const VERSION_ID = 14200; const MAJOR_VERSION = 1; const MINOR_VERSION = 42; const RELEASE_VERSION = 0; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; protected $charset; protected $loader;