summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-01-18 16:40:49 +0100
committerRemi Collet <remi@php.net>2023-01-18 16:40:49 +0100
commitc627daea7258d3c83e4be7f2cf0d3a3523f61d8d (patch)
treed3bc7a180f5d367fe0aaf81d0c85f83e4dd49598
parentfcbe00e7f8c6a31c53957f90452f42d85435f5fd (diff)
update to 2.22.0HEADmaster
-rw-r--r--composer.json2
-rw-r--r--php-laminas-mail.spec13
2 files changed, 10 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index fd2350e..f06b205 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
"symfony/polyfill-intl-idn": "^1.26.0"
},
"require-dev": {
- "laminas/laminas-coding-standard": "~2.4.0",
+ "laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-crypt": "^3.9.0",
"laminas/laminas-db": "^2.16",
"laminas/laminas-servicemanager": "^3.20",
diff --git a/php-laminas-mail.spec b/php-laminas-mail.spec
index 826b2e3..b42eec7 100644
--- a/php-laminas-mail.spec
+++ b/php-laminas-mail.spec
@@ -8,7 +8,7 @@
#
%bcond_without tests
-%global gh_commit 6e3d32a81dc28c233f4e1071564f75e151fcaca6
+%global gh_commit 1d307ff65328c00117c6d90ba0084fdd0fc2bd5c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-mail
@@ -18,7 +18,7 @@
%global library Mail
Name: php-%{gh_project}
-Version: 2.21.1
+Version: 2.22.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -47,7 +47,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.23
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
BuildRequires: (php-composer(webmozart/assert) >= 1.11.0 with php-composer(webmozart/assert) < 2)
# From composer, "require-dev": {
-# "laminas/laminas-coding-standard": "~2.4.0",
+# "laminas/laminas-coding-standard": "~2.5.0",
# "laminas/laminas-crypt": "^3.9.0",
# "laminas/laminas-db": "^2.16",
# "laminas/laminas-servicemanager": "^3.20",
@@ -156,6 +156,7 @@ mv LICENSE.md LICENSE
%build
: Create autoloader
phpab --template fedora --output src/autoload.php src
+
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/%{namespace}/Loader/autoload.php',
@@ -215,12 +216,13 @@ exit (class_exists("\\Zend\\%{library}\\Message") ? 0 : 1);
: upstream test suite
# testCanUseTraversableAsSpec use Composer\\InstalledVersions
+# testExceptionShouldBeRaisedWhenConnectionHasTimedOut fails in mock
ret=0
for cmdarg in "php %{phpunit}" php80 php81 php82; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} \
- --filter '^((?!(testCanUseTraversableAsSpec)).)*$' \
+ --filter '^((?!(testCanUseTraversableAsSpec|testExceptionShouldBeRaisedWhenConnectionHasTimedOut)).)*$' \
|| ret=1
fi
done
@@ -241,6 +243,9 @@ exit $ret
%changelog
+* Wed Jan 18 2023 Remi Collet <remi@remirepo.net> - 2.22.0-1
+- update to 2.22.0
+
* Fri Jan 6 2023 Remi Collet <remi@remirepo.net> - 2.21.1-1
- update to 2.21.1