summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION2
-rw-r--r--composer.json2
-rw-r--r--php-twig.spec15
3 files changed, 13 insertions, 6 deletions
diff --git a/REFLECTION b/REFLECTION
index 6e1f6da..3416d97 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #69 twig version 1.26.1 ] {
+Extension [ <persistent> extension #70 twig version 1.27.0 ] {
- Functions {
Function [ <internal:twig> function twig_template_get_attributes ] {
diff --git a/composer.json b/composer.json
index 350381c..afe30b0 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.26-dev"
+ "dev-master": "1.27-dev"
}
}
}
diff --git a/php-twig.spec b/php-twig.spec
index bc00ee0..e0182a9 100644
--- a/php-twig.spec
+++ b/php-twig.spec
@@ -34,8 +34,8 @@
%global github_owner twigphp
%global github_name Twig
-%global github_version 1.26.1
-%global github_commit a09d8ee17ac1cfea29ed60c83960ad685c6a898d
+%global github_version 1.27.0
+%global github_commit 3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%if "%{php_version}" < "7"
@@ -295,7 +295,7 @@ sed -e 's/function testGetAttributeWithTemplateAsObject/function skip_testGetAtt
%endif
: Test suite without extension
-# remirepo:11
+# remirepo:15
run=0
ret=0
if which php56; then
@@ -306,6 +306,10 @@ if which php71; then
php71 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Twig/autoload.php || ret=1
run=1
fi
+if php -r 'exit (version_compare(PHP_VERSION, "7.1", "gt") ? 0 : 1);' ; then
+ : Skip test with 7.1
+ run=1
+fi
if [ $run -eq 0 ]; then
%{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Twig/autoload.php --verbose
# remirepo:1
@@ -349,10 +353,13 @@ rm -rf %{buildroot}
%changelog
+* Wed Oct 26 2016 Remi Collet <remi@fedoraproject.org> - 1.27.0-1
+- Update to 1.27.0
+
* Thu Oct 6 2016 Remi Collet <remi@fedoraproject.org> - 1.26.1-1
- Update to 1.26.1
-* Mon Oct 2 2016 Remi Collet <remi@fedoraproject.org> - 1.26.0-1
+* Mon Oct 3 2016 Remi Collet <remi@fedoraproject.org> - 1.26.0-1
- Update to 1.26.0
* Thu Sep 22 2016 Remi Collet <remi@fedoraproject.org> - 1.25.0-1