diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 17 | ||||
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-twig.spec | 20 |
5 files changed, 19 insertions, 33 deletions
@@ -1,2 +1,9 @@ +clog +package-*.xml *.tgz +*.tar.bz2 +*.tar.gz +*.tar.xz +*.tar.xz.asc *.src.rpm +*/*rpm diff --git a/PHPINFO b/PHPINFO deleted file mode 100644 index bf96a77..0000000 --- a/PHPINFO +++ /dev/null @@ -1,4 +0,0 @@ - -twig - -Version => 1.42.2 diff --git a/REFLECTION b/REFLECTION deleted file mode 100644 index faeac61..0000000 --- a/REFLECTION +++ /dev/null @@ -1,17 +0,0 @@ -Extension [ <persistent> extension #79 twig version 1.42.2 ] { - - - Functions { - Function [ <internal:twig> function twig_template_get_attributes ] { - - - Parameters [6] { - Parameter #0 [ <required> $template ] - Parameter #1 [ <required> $object ] - Parameter #2 [ <required> $item ] - Parameter #3 [ <required> $arguments ] - Parameter #4 [ <required> $type ] - Parameter #5 [ <required> $isDefinedTest ] - } - } - } -} - diff --git a/composer.json b/composer.json index d4e096d..46b0fc7 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ } ], "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { @@ -46,7 +46,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.43-dev" + "dev-master": "1.44-dev" } } } diff --git a/php-twig.spec b/php-twig.spec index bc2d5e8..a165809 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -16,16 +16,16 @@ %global github_owner twigphp %global github_name Twig -%global github_version 1.43.1 -%global github_commit 2311602f6a208715252febe682fa7c38e56a3373 +%global github_version 1.44.0 +%global github_commit e7c93a4af5eba2b0b3cf51d540e0a131187d7410 %global github_short %(c=%{github_commit}; echo ${c:0:7}) # Lib %global composer_vendor twig %global composer_project twig -# "php": ">=7.1.3" -%global php_min_ver 7.1.3 +# "php": ">=7.2.5" +%global php_min_ver 7.2.5 %{!?phpdir: %global phpdir %{_datadir}/php} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} @@ -41,7 +41,8 @@ Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: makesrc.sh BuildArch: noarch -BuildRequires: php-devel >= %{php_min_ver} +# as we use phpunit9 (for assertFileDoesNotExist) +BuildRequires: php-devel >= 7.3 # Tests %if %{with tests} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -167,11 +168,6 @@ ret=0 for SCL in "php %{phpunit}" php73 php74 php80; do if which $SCL; then set $SCL - SKIP="--filter '^((?!(testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnObject|testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnFunction)).)*$'" - - VER=$($1 -r 'echo PHP_VERSION_ID;') - [ $VER -ge 80000 ] && SKIP="--filter '^((?!(testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnObject|testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnFunction|testIntegration)).)*$'" - $1 ${2:-%{_bindir}/phpunit9} $SKIP \ --verbose || RETURN_CODE=1 fi @@ -191,6 +187,10 @@ exit $RETURN_CODE %changelog +* Wed Oct 21 2020 Remi Collet <remi@remirepo.net> - 1.44.0-1 +- update to 1.44.0 +- raise dependency on PHP 7.2.5 + * Tue Aug 11 2020 Remi Collet <remi@remirepo.net> - 1.43.1-1 - update to 1.43.1 - switch to phpunit9 |