diff options
| -rw-r--r-- | composer.json | 42 | ||||
| -rw-r--r-- | php-laminas-mail.spec | 68 |
2 files changed, 57 insertions, 53 deletions
diff --git a/composer.json b/composer.json index 96074d2..2bf66e0 100644 --- a/composer.json +++ b/composer.json @@ -8,40 +8,38 @@ "homepage": "https://laminas.dev", "license": "BSD-3-Clause", "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", + "php": "~8.0.0 || ~8.1.0", "ext-iconv": "*", - "laminas/laminas-loader": "^2.8", + "laminas/laminas-loader": "^2.8.0", "laminas/laminas-mime": "^2.9.1", - "laminas/laminas-stdlib": "^3.6", - "laminas/laminas-validator": "^2.15", - "symfony/polyfill-mbstring": "^1.12.0", - "webmozart/assert": "^1.10", - "symfony/polyfill-intl-idn": "^1.24.0" - }, - "conflict": { - "zendframework/zend-mail": "*" + "laminas/laminas-stdlib": "^3.11.0", + "laminas/laminas-validator": "^2.23.0", + "symfony/polyfill-mbstring": "^1.16.0", + "webmozart/assert": "^1.11.0", + "symfony/polyfill-intl-idn": "^1.26.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-crypt": "^2.6 || ^3.4", - "laminas/laminas-db": "^2.13.3", - "laminas/laminas-servicemanager": "^3.7", - "phpunit/phpunit": "^9.5.5", - "psalm/plugin-phpunit": "^0.15.1", - "symfony/process": "^5.3.7", - "vimeo/psalm": "^4.7" + "laminas/laminas-coding-standard": "~2.3.0", + "laminas/laminas-crypt": "^3.8.0", + "laminas/laminas-db": "^2.15.0", + "laminas/laminas-servicemanager": "^3.16.0", + "phpunit/phpunit": "^9.5.21", + "psalm/plugin-phpunit": "^0.17.0", + "symfony/process": "^6.0.11", + "vimeo/psalm": "^4.26.0" }, "suggest": { - "laminas/laminas-crypt": "Crammd5 support in SMTP Auth", - "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages" + "laminas/laminas-crypt": "^3.8 Crammd5 support in SMTP Auth", + "laminas/laminas-servicemanager": "^3.16 when using SMTP to deliver messages" }, "config": { "sort-packages": true, "allow-plugins": { - "composer/package-versions-deprecated": true + "composer/package-versions-deprecated": true, + "dealerdirect/phpcodesniffer-composer-installer": true }, "platform": { - "php": "7.3.99" + "php": "8.0.99" } }, "extra": { diff --git a/php-laminas-mail.spec b/php-laminas-mail.spec index e266832..05c08b1 100644 --- a/php-laminas-mail.spec +++ b/php-laminas-mail.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 1ee1a384b96c8af29ecad9b3a7adc27a150ebc49 +%global gh_commit bf7504247d5a110d941efa8eb4815f5292a8dc56 %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.16.0 +Version: 2.17.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -30,7 +30,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.0 BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-iconv @@ -40,24 +40,24 @@ BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.8 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.8.0 with php-autoloader(%{gh_owner}/laminas-loader) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-mime) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-mime) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.11.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.23.0 with php-autoloader(%{gh_owner}/laminas-validator) < 3) 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.10 with php-composer(webmozart/assert) < 2) +BuildRequires: (php-composer(webmozart/assert) >= 1.11.0 with php-composer(webmozart/assert) < 2) # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-crypt": "^2.6 || ^3.4", -# "laminas/laminas-db": "^2.13.3", -# "laminas/laminas-servicemanager": "^3.7", -# "phpunit/phpunit": "^9.5.5" -# "psalm/plugin-phpunit": "^0.15.1", -# "symfony/process": "^5.3.7", -# "vimeo/psalm": "^4.7" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt) >= 3.4 with php-autoloader(%{gh_owner}/laminas-crypt) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.13.3 with php-autoloader(%{gh_owner}/laminas-db) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.7 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +# "laminas/laminas-coding-standard": "~2.3.0", +# "laminas/laminas-crypt": "^3.8.0", +# "laminas/laminas-db": "^2.15.0", +# "laminas/laminas-servicemanager": "^3.16.0", +# "phpunit/phpunit": "^9.5.21", +# "psalm/plugin-phpunit": "^0.17.0", +# "symfony/process": "^6.0.11", +# "vimeo/psalm": "^4.26.0" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt) >= 3.8.0 with php-autoloader(%{gh_owner}/laminas-crypt) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.15.0 with php-autoloader(%{gh_owner}/laminas-db) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.16.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) # ignore min version BuildRequires: (php-composer(symfony/process) >= 4 with php-composer(symfony/process) < 6) # remirepo:12 @@ -80,26 +80,26 @@ BuildRequires: phpunit9 >= 9.5.5 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "php": "~8.0.0 || ~8.1.0", # "ext-iconv": "*", -# "laminas/laminas-loader": "^2.8", +# "laminas/laminas-loader": "^2.8.0", # "laminas/laminas-mime": "^2.9.1", -# "laminas/laminas-stdlib": "^3.6", -# "laminas/laminas-validator": "^2.15", -# "symfony/polyfill-mbstring": "^1.12.0", -# "webmozart/assert": "^1.10", -# "symfony/polyfill-intl-idn": "^1.24.0" -Requires: php(language) >= 7.3 +# "laminas/laminas-stdlib": "^3.11.0", +# "laminas/laminas-validator": "^2.23.0", +# "symfony/polyfill-mbstring": "^1.162.0", +# "webmozart/assert": "^1.11", +# "symfony/polyfill-intl-idn": "^1.26.0" +Requires: php(language) >= 8.0 Requires: php-iconv Requires: php-mbstring # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.8 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.8.0 with php-autoloader(%{gh_owner}/laminas-loader) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-mime) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-mime) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.11.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.23.0 with php-autoloader(%{gh_owner}/laminas-validator) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) -Requires: (php-composer(webmozart/assert) >= 1.10 with php-composer(webmozart/assert) < 2) +Requires: (php-composer(webmozart/assert) >= 1.11.0 with php-composer(webmozart/assert) < 2) # From composer, "suggest": { # "laminas/laminas-crypt": "Crammd5 support in SMTP Auth", # "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages" @@ -216,7 +216,7 @@ exit (class_exists("\\Zend\\%{library}\\Message") ? 0 : 1); : upstream test suite # testCanUseTraversableAsSpec use Composer\\InstalledVersions ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -241,6 +241,12 @@ exit $ret %changelog +* Mon Aug 8 2022 Remi Collet <remi@remirepo.net> - 2.17.0-1 +- update to 2.17.0 +- raise dependency on laminas-stdlib 3.11.0 +- raise dependency on laminas-validator 2.23.0 +- raise dependency on webmozart/assert 1.11.0 + * Thu Feb 24 2022 Remi Collet <remi@remirepo.net> - 2.16.0-1 - update to 2.16.0 - drop dependency on true/punycode |