summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-12-18 10:16:24 +0100
committerRemi Collet <remi@remirepo.net>2018-12-18 10:16:24 +0100
commit9b16477a0e95fd0f4f5ce1f84824ca7a583b758c (patch)
tree795670baeb73eac198f6a99ffeffae6093105478
parent219a1b9b88e5d01c51a5ebeb22aa2d89e32b1c3b (diff)
v1.36.0
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION2
-rw-r--r--composer.json4
-rw-r--r--php-twig.spec7
4 files changed, 9 insertions, 6 deletions
diff --git a/PHPINFO b/PHPINFO
index 012644b..f5ee2b8 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,4 +1,4 @@
twig
-Version => 1.35.4
+Version => 1.36.0
diff --git a/REFLECTION b/REFLECTION
index 4e4bef0..903baca 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #79 twig version 1.35.4 ] {
+Extension [ <persistent> extension #81 twig version 1.36.0 ] {
- Functions {
Function [ <internal:twig> function twig_template_get_attributes ] {
diff --git a/composer.json b/composer.json
index 0a1728f..d1256eb 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "symfony/phpunit-bridge": "^3.3",
+ "symfony/phpunit-bridge": "^3.4.19|^4.1.8",
"symfony/debug": "^2.7",
"psr/container": "^1.0"
},
@@ -45,7 +45,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.35-dev"
+ "dev-master": "1.36-dev"
}
}
}
diff --git a/php-twig.spec b/php-twig.spec
index 389c32c..d7d10d1 100644
--- a/php-twig.spec
+++ b/php-twig.spec
@@ -30,8 +30,8 @@
%global github_owner twigphp
%global github_name Twig
-%global github_version 1.35.4
-%global github_commit 7e081e98378a1e78c29cc9eba4aefa5d78a05d2a
+%global github_version 1.36.0
+%global github_commit 730c9c4471b5152d23061feb02b03382264c8a15
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%if "%{php_version}" < "7"
@@ -353,6 +353,9 @@ exit $ret
%changelog
+* Tue Dec 18 2018 Remi Collet <remi@remirepo.net> - 1.36.0-1
+- update to 1.36.0
+
* Fri Jul 13 2018 Remi Collet <remi@remirepo.net> - 1.35.4-1
- update to 1.35.4