diff options
Diffstat (limited to 'php-doctrine-dbal.spec')
| -rw-r--r-- | php-doctrine-dbal.spec | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec index 60efd55..19dc7cb 100644 --- a/php-doctrine-dbal.spec +++ b/php-doctrine-dbal.spec @@ -13,26 +13,23 @@ %global github_owner doctrine %global github_name dbal -%global github_version 2.9.2 -%global github_commit 22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9 +%global github_version 2.10.0 +%global github_commit 0c9a646775ef549eb0a213a4f9bd4381d9b4d934 %global composer_vendor doctrine %global composer_project dbal -# "php": "^7.1" -%global php_min_ver 7.1 +# "php": "^7.2" +%global php_min_ver 7.2 # "doctrine/cache": "^1.0" %global doctrine_cache_min_ver 1.0 %global doctrine_cache_max_ver 2 # "doctrine/event-manager": "^1.0" %global doctrine_event_min_ver 1.0 %global doctrine_event_max_ver 2 -# "symfony/console": "^2.0.5|^3.0|^4.0" +# "symfony/console": "^2.0.5|^3.0|^4.0|^5.0" %global symfony_console_min_ver 2.0.5 %global symfony_console_max_ver 5 -# "symfony/phpunit-bridge": "^3.4.5|^4.0.5" -%global symfony_phpunit_min_ver 4.0.5 -%global symfony_phpunit_max_ver 5.0 %{!?phpdir: %global phpdir %{_datadir}/php} @@ -60,7 +57,7 @@ Patch0: %{name}-bin.patch BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: phpunit7 >= 7.4 +BuildRequires: phpunit8 >= 8.4.1 ## composer.json BuildRequires: php(language) >= %{php_min_ver} # remirepo:1 @@ -69,14 +66,12 @@ BuildRequires:(php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with ph BuildRequires:(php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_cache_max_ver}) ## composer.json (optional) BuildRequires:(php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver}) -BuildRequires:(php-composer(symfony/phpunit-bridge) >= %{symfony_phpunit_min_ver} with php-composer(symfony/phpunit-bridge) < %{symfony_phpunit_max_ver}) -# remirepo:10 +# remirepo:9 %else BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} BuildRequires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} BuildRequires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver} -BuildRequires: php-symfony4-phpunit-bridge ## composer.json (optional) BuildRequires: php-composer(symfony/console) >= %{symfony_console_min_ver} BuildRequires: php-composer(symfony/console) < %{symfony_console_max_ver} @@ -191,8 +186,6 @@ install -pm 0755 bin/doctrine-dbal.php %{buildroot}/%{_bindir}/doctrine-dbal %if %{with_tests} cat > bs.php <<'BOOTSTRAP' <?php -# load SF4 before main autoloader which load SF3 -require_once '%{phpdir}/Symfony4/Bridge/PhpUnit/autoload.php'; require_once '%{buildroot}/%{phpdir}/Doctrine/DBAL/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4( 'Doctrine\\Tests\\', @@ -202,9 +195,10 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php php71 php72 php73; do +for PHP_EXEC in php php72 php73 php74; do + rm -f /tmp/test_nesting.sqlite if which $PHP_EXEC; then - $PHP_EXEC %{_bindir}/phpunit7 \ + $PHP_EXEC %{_bindir}/phpunit8 \ --bootstrap bs.php \ --verbose || RETURN_CODE=1 fi @@ -225,6 +219,11 @@ exit $RETURN_CODE %changelog +* Mon Nov 4 2019 Remi Collet <remi@remirepo.net> - 2.10.0-1 +- update to 2.10.0 +- raise dependencies on PHP 7.2 +- switch to phpunit8 + * Wed Jan 2 2019 Remi Collet <remi@remirepo.net> - 2.9.2-1 - update to 2.9.2 |