summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-04-06 08:31:40 +0200
committerRemi Collet <remi@remirepo.net>2021-04-06 08:31:40 +0200
commit7c6bfbde80be9fd18b70341bba4576a33c517750 (patch)
tree9a5aca57eb3915e699eb54a9d060ded4d7f38388
parent4e63a2cf5a6c2bfd63997e0a3dba5c57e3f18cc3 (diff)
update to 3.1.2HEADmaster
-rw-r--r--composer.json3
-rw-r--r--php-doctrine-common3.spec11
2 files changed, 9 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index f1d7ad9..0f14ca3 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
"phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0",
"doctrine/coding-standard": "^6.0 || ^8.0",
"squizlabs/php_codesniffer": "^3.0",
- "symfony/phpunit-bridge": "^4.0.5"
+ "symfony/phpunit-bridge": "^4.0.5",
+ "vimeo/psalm": "^4.4"
},
"autoload": {
"psr-4": {
diff --git a/php-doctrine-common3.spec b/php-doctrine-common3.spec
index e339ba8..b3d2312 100644
--- a/php-doctrine-common3.spec
+++ b/php-doctrine-common3.spec
@@ -10,8 +10,8 @@
%global github_owner doctrine
%global github_name common
-%global github_version 3.1.1
-%global github_commit 2afde5a9844126bc311cd5f548b5475e75f800d3
+%global github_version 3.1.2
+%global github_commit a036d90c303f3163b5be8b8fde9b6755b2be4a3a
%global major 3
%global composer_vendor doctrine
@@ -71,9 +71,9 @@ BuildRequires: php-reflection
BuildRequires: php-date
BuildRequires: php-pcre
BuildRequires: php-spl
+%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
-%endif
# composer.json
Requires: php(language) >= %{php_min_ver}
@@ -133,7 +133,7 @@ sed "s#require.*autoload.*#require_once '%{buildroot}%{phpdir}/%{ns_vendor}/%{ns
: Upstream tests
RETURN_CODE=0
-for CMDARG in "php %{phpunit}" "php71 %{_bindir}/phpunit7" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
+for CMDARG in "php %{phpunit}" php73 php74 php80; do
if which $CMDARG; then
set $CMDARG
$1 ${2:-%{_bindir}/phpunit9} --verbose || RETURN_CODE=1
@@ -156,6 +156,9 @@ exit $RETURN_CODE
%changelog
+* Tue Apr 6 2021 Remi Collet <remi@remirepo.net> - 3.1.2-1
+- update to 3.1.2
+
* Thu Jan 21 2021 Remi Collet <remi@remirepo.net> - 3.1.1-1
- update to 3.1.1