summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-01-06 15:15:13 +0100
committerRemi Collet <remi@php.net>2022-01-06 15:15:13 +0100
commit67d9cce9a1f4a2fdddd113c959544de56e9466a6 (patch)
tree526ef8d5a2a4c52ddf16a085fd74e34166231084
parentf947006e99660649a8fb0d4fd5ecc93c472e6d3b (diff)
update to 2.5.5HEADmaster
-rw-r--r--composer.json2
-rw-r--r--php-doctrine-doctrine-bundle2.spec15
2 files changed, 12 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index 9b51b86..bcae79c 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
"symfony/cache": "^4.3.3|^5.0|^6.0",
"symfony/config": "^4.4.3|^5.0|^6.0",
"symfony/console": "^3.4.30|^4.3.3|^5.0|^6.0",
- "symfony/dependency-injection": "^4.3.3|^5.0|^6.0",
+ "symfony/dependency-injection": "^4.4.18|^5.0|^6.0",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/doctrine-bridge": "^4.4.22|^5.2.7|^6.0",
"symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0|^6.0",
diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 6715699..0df0487 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.5.4
-%global github_commit f6191c50600bad1c0195638413f53aee6158b909
+%global github_version 2.5.5
+%global github_commit 5c086cbbe5327937dd6f90da075f7d421b0f28bc
%global major 2
%global composer_vendor doctrine
@@ -42,7 +42,7 @@
%global sql_formatter_max_ver 2.0
# "symfony/config": "^4.3.3|^5.0|^6.0",
# "symfony/console": "^3.4.30|^4.3.3|^5.0|^6.0"
-# "symfony/dependency-injection": "^^4.3.3|^5.0|^6.0"
+# "symfony/dependency-injection": "^4.4.18|^5.0|^6.0"
# "symfony/doctrine-bridge": "^4.3.7|^5.0|^6.0"
# "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0|^6.0"
# "symfony/cache": "^4.3.3|^5.0|^6.0",
@@ -52,7 +52,7 @@
# "symfony/validator": "^3.4.30|^4.3.3|^5.0|^6.0"
# "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0|^6.0"
# "symfony/yaml": "^3.4.30|^4.3.3|^5.0|^6.0"
-%global symfony_min_ver 4.3.7
+%global symfony_min_ver 4.4.18
%global symfony_max_ver 6
%global symfony_br_ver %{symfony_min_ver}
# "symfony/service-contracts": "^1.1.1|^2.0|^3",
@@ -348,7 +348,11 @@ for CMDARG in "php %{phpunit}" php74 php80 php81; do
if which $CMDARG; then
set $CMDARG
$1 ${2:-%{_bindir}/phpunit9} \
+%if 0%{?rhel} == 7
+ --filter '^((?!(testBacktraceLogged|testExecuteXmlWithBundle|testExecuteAnnotationsWithBundle|testExecuteXmlWithNamespace|testExecuteAnnotationsWithNamespace)).)*$' \
+%else
--filter '^((?!(testBacktraceLogged)).)*$' \
+%endif
--bootstrap bs.php \
--verbose || RETURN_CODE=1
fi
@@ -371,6 +375,9 @@ exit $RETURN_CODE
%changelog
+* Thu Jan 6 2022 Remi Collet <remi@remirepo.net> - 2.5.5-1
+- update to 2.5.5
+
* Mon Jan 3 2022 Remi Collet <remi@remirepo.net> - 2.5.4-1
- update to 2.5.4
- allow doctrin/orm 3