diff options
| author | Remi Collet <remi@remirepo.net> | 2020-12-08 12:14:12 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-12-08 12:14:12 +0100 |
| commit | ca0de6eb7b7fe5cbf48147b51d8c0c60703226e6 (patch) | |
| tree | 76b555c1d24b387404aae2f1cc422099f513cae6 | |
| parent | 66d6091e395fc25a5fd5cdf6290b326c69239bab (diff) | |
update to 2.2.2
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-doctrine-doctrine-bundle2.spec | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/composer.json b/composer.json index bbe3962..8f53203 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "doctrine/coding-standard": "^8.0", "doctrine/orm": "^2.6", "ocramius/proxy-manager": "^2.1", - "phpunit/phpunit": "^7.5 || ^9.3", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3", "symfony/phpunit-bridge": "^4.2", "symfony/property-info": "^4.3.3|^5.0", "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0", diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec index f59cfb5..5f0287b 100644 --- a/php-doctrine-doctrine-bundle2.spec +++ b/php-doctrine-doctrine-bundle2.spec @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name DoctrineBundle -%global github_version 2.2.1 -%global github_commit 9e07bb1ff35d35d9ec4597b79e5d05502d7d4d43 +%global github_version 2.2.2 +%global github_commit 044d33eeffdb236d5013b6b4af99f87519e10751 %global major 2 %global composer_vendor doctrine @@ -132,8 +132,8 @@ BuildRequires: php-symfony4-yaml >= %{symfony_br_ver} %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.3 %else -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.5 +%global phpunit %{_bindir}/phpunit8 +BuildRequires: phpunit8 >= 8.0 %endif ## phpcompatinfo (computed from version 2.0.0) BuildRequires: php-dom @@ -300,7 +300,7 @@ sed -e '/listener/d' phpunit.xml.dist >phpunit.xml : Upstream tests with SCLs if available RETURN_CODE=0 -for CMDARG in "php %{phpunit}" "php72 %{_bindir}/phpunit7" php73 php74 php80; do +for CMDARG in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do if which $CMDARG; then set $CMDARG $1 ${2:-%{_bindir}/phpunit9} \ @@ -327,6 +327,9 @@ exit $RETURN_CODE %changelog +* Tue Dec 8 2020 Remi Collet <remi@remirepo.net> - 2.2.2-1 +- update to 2.2.2 + * Thu Nov 12 2020 Remi Collet <remi@remirepo.net> - 2.2.1-1 - update to 2.2.1 |