summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-03 14:26:59 +0200
committerRemi Collet <remi@remirepo.net>2019-06-03 14:26:59 +0200
commitad504424b001770c5d1f74e522d3adab982965d8 (patch)
tree734d6112418137d1dd02b9fcf8b781440d7f2d5d
parent488e26a549e018f5413dd7e5a06c900c0c1b9ad0 (diff)
v1.42.0
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION2
-rw-r--r--composer.json4
-rw-r--r--php-twig.spec21
4 files changed, 10 insertions, 19 deletions
diff --git a/PHPINFO b/PHPINFO
index 28c5030..63fdbf8 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,4 +1,4 @@
twig
-Version => 1.41.0
+Version => 1.42.0
diff --git a/REFLECTION b/REFLECTION
index bdeab50..6ad8f31 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #81 twig version 1.41.0 ] {
+Extension [ <persistent> extension #81 twig version 1.42.0 ] {
- Functions {
Function [ <internal:twig> function twig_template_get_attributes ] {
diff --git a/composer.json b/composer.json
index 4b99372..2f10465 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "symfony/phpunit-bridge": "^3.4.19|^4.1.8",
+ "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0",
"symfony/debug": "^2.7",
"psr/container": "^1.0"
},
@@ -42,7 +42,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.41-dev"
+ "dev-master": "1.42-dev"
}
}
}
diff --git a/php-twig.spec b/php-twig.spec
index 304a81b..c307157 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.41.0
-%global github_commit 575cd5028362da591facde1ef5d7b94553c375c9
+%global github_version 1.42.0
+%global github_commit 2983fcf2e20a4afe95f07e61d89a7590b3c8df2e
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%if "%{php_version}" < "7"
@@ -159,18 +159,6 @@ Obsoletes: php55w-%{ext_name} <= %{version}
Obsoletes: php56u-%{ext_name} <= %{version}
Obsoletes: php56w-%{ext_name} <= %{version}
%endif
-%if "%{php_version}" > "7.0"
-Obsoletes: php70u-%{ext_name} <= %{version}
-Obsoletes: php70w-%{ext_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.1"
-Obsoletes: php71u-%{ext_name} <= %{version}
-Obsoletes: php71w-%{ext_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.2"
-Obsoletes: php72u-%{ext_name} <= %{version}
-Obsoletes: php72w-%{ext_name} <= %{version}
-%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -316,7 +304,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml
: Test suite without extension
ret=0
-for cmd in php php71 php72 php73; do
+for cmd in php php71 php72 php73 php74; do
if which $cmd; then
$cmd %{_bindir}/phpunit --verbose || ret=1
fi
@@ -353,6 +341,9 @@ exit $ret
%changelog
+* Mon Jun 3 2019 Remi Collet <remi@remirepo.net> - 1.42.0-1
+- update to 1.42.0
+
* Wed May 15 2019 Remi Collet <remi@remirepo.net> - 1.41.0-1
- update to 1.41.0