diff options
| -rw-r--r-- | composer.json | 31 | ||||
| -rw-r--r-- | php-laminas-config3.spec | 95 |
2 files changed, 55 insertions, 71 deletions
diff --git a/composer.json b/composer.json index cad9aad..27b4d40 100644 --- a/composer.json +++ b/composer.json @@ -16,31 +16,27 @@ "forum": "https://discourse.laminas.dev" }, "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "3.4.x-dev", - "dev-develop": "3.5.x-dev" + "sort-packages": true, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true } }, "require": { - "php": "^7.3 || ^8.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "ext-json": "*", - "laminas/laminas-stdlib": "^2.7.7 || ^3.1", - "laminas/laminas-zendframework-bridge": "^1.0", + "laminas/laminas-stdlib": "^3.6", "psr/container": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-filter": "^2.7.2", - "laminas/laminas-i18n": "^2.10.3", - "laminas/laminas-servicemanager": "^3.4.1", - "malukenho/docheader": "^0.1.6", - "phpunit/phpunit": "^8.5.8" + "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-filter": "~2.23.0", + "laminas/laminas-i18n": "~2.19.0", + "laminas/laminas-servicemanager": "~3.19.0", + "phpunit/phpunit": "~9.5.25" }, "conflict": { - "container-interop/container-interop": "<1.2.0" + "container-interop/container-interop": "<1.2.0", + "zendframework/zend-config": "*" }, "suggest": { "laminas/laminas-filter": "^2.7.2; install if you want to use the Filter processor", @@ -68,8 +64,5 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", "license-check": "docheader check src/" - }, - "replace": { - "zendframework/zend-config": "^3.3.0" } } diff --git a/php-laminas-config3.spec b/php-laminas-config3.spec index cbf9814..5b860eb 100644 --- a/php-laminas-config3.spec +++ b/php-laminas-config3.spec @@ -1,17 +1,16 @@ # remirepo/Fedora spec file for php-laminas-config3 # -# Copyright (c) 2015-2020 Remi Collet +# Copyright (c) 2015-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 0bce6f5abab41dc673196741883b19018a2b5994 +%global gh_commit 46baad58d0b12cf98539e04334eff40a1fdfb9a0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-config -%global zf_name zend-config %global php_home %{_datadir}/php %global namespace Laminas %global library Config @@ -23,7 +22,7 @@ %endif Name: php-%{gh_project}%{major} -Version: 3.4.0 +Version: 3.8.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component v%{major} @@ -35,7 +34,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.0 BuildRequires: php-json BuildRequires: php-libxml BuildRequires: php-pcre @@ -44,46 +43,40 @@ BuildRequires: php-xmlreader BuildRequires: php-xmlwriter # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) # From composer, "require-dev": { -# "laminas/laminas-filter": "^2.7.2", -# "laminas/laminas-i18n": "^2.10.3", -# "laminas/laminas-servicemanager": "^3.4.1", -# "malukenho/docheader": "^0.1.6", -# "phpunit/phpunit": "^8.5.8" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.7.2 with php-autoloader(%{gh_owner}/laminas-filter) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.10.3 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -# remirepo:8 +# "laminas/laminas-coding-standard": "~2.4.0", +# "laminas/laminas-filter": "~2.23.0", +# "laminas/laminas-i18n": "~2.19.0", +# "laminas/laminas-servicemanager": "~3.19.0", +# "phpunit/phpunit": "~9.5.25" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.23.0 with php-autoloader(%{gh_owner}/laminas-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.19.0 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.19.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +# remirepo:7 %else BuildRequires: php-laminas-stdlib -BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-psr-container BuildRequires: php-laminas-filter BuildRequires: php-laminas-i18n BuildRequires: php-laminas-servicemanager %endif -BuildRequires: phpunit8 >= 8.5.8 +BuildRequires: phpunit9 >= 9.5.25 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ^8.0", +# "php": "~8.0.0 || ~8.1.0 || ~8.2.0", # "ext-json": "*", -# "laminas/laminas-stdlib": "^2.7.7 || ^3.1", -# "laminas/laminas-zendframework-bridge": "^1.0", +# "laminas/laminas-stdlib": "^3.6", # "psr/container": "^1.0" -# "laminas/laminas-stdlib": "^2.7 || ^3.0", -# "laminas/laminas-zendframework-bridge": "^1.0" -Requires: php(language) >= 7.3 +Requires: php(language) >= 8.0 Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) Requires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) # From composer, "suggest": { # "laminas/laminas-filter": "Laminas\\Filter component", @@ -92,10 +85,9 @@ Requires: (php-composer(psr/container) >= 1.0 Suggests: php-autoloader(%{gh_owner}/laminas-filter) Suggests: php-autoloader(%{gh_owner}/laminas-i18n) Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager) -# remirepo:5 +# remirepo:4 %else Requires: php-laminas-stdlib -Requires: php-laminas-zendframework-bridge Requires: php-psr-container %endif # Autoloader @@ -108,9 +100,7 @@ Requires: php-xmlreader Requires: php-xmlwriter Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} -Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} -Provides: php-autoloader(zendframework/%{zf_name}) = %{version} %description @@ -143,25 +133,12 @@ cat << 'EOF' | tee -a src/autoload.php ]); EOF -cat << 'EOF' | tee zf.php -<?php -require_once '%{php_home}/Fedora/Autoloader/autoload.php'; -\Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php', - dirname(dirname(__DIR__)) . '/%{namespace}/%{library}%{major}/autoload.php', -]); -EOF - %install : Laminas library mkdir -p %{buildroot}%{php_home}/%{namespace}/ cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}%{major} -: Zend equiv -mkdir -p %{buildroot}%{php_home}/Zend/%{library}%{major} -cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php - %check %if %{with_tests} @@ -172,17 +149,13 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.p \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); EOF -: check compat autoloader -php -r ' -require "%{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php"; -exit (class_exists("\\Zend\\%{library}\\Config") ? 0 : 1); -' - : upstream test suite ret=0 -for cmd in php php72 php73 php74 php80; do +for cmd in php php80 php81 php82; do if which $cmd; then - $cmd %{_bindir}/phpunit8 || ret=1 + $cmd %{_bindir}/phpunit9 \ + --filter '^((?!(testCloseWhenCallFromFileReaderGetInvalid|testCloseWhenCallFromStringReaderGetInvalid)).)*$' \ + || ret=1 fi done exit $ret @@ -197,11 +170,29 @@ exit $ret %license LICENSE %doc *.md %doc composer.json -%{php_home}/Zend/%{library}%{major} %{php_home}/%{namespace}/%{library}%{major} %changelog +* Mon Oct 17 2022 Remi Collet <remi@remirepo.net> - 3.8.0-1 +- update to 3.8.0 +- raise dependency on PHP 8.0 + +* Fri Jan 28 2022 Remi Collet <remi@remirepo.net> - 3.7.0-2 +- ignore 2 failed tests, FTBFS #2046823 + +* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 3.7.0-1 +- update to 3.7.0 +- raise dependency on laminas-stdlib 3.6 +- switch to phpunit9 + +* Wed Sep 8 2021 Remi Collet <remi@remirepo.net> - 3.6.0-1 +- update to 3.6.0 +- drop zendframework compatibility layer + +* Mon Feb 15 2021 Remi Collet <remi@remirepo.net> - 3.5.0-1 +- update to 3.5.0 + * Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 3.4.0-1 - update to 3.4.0 - raise dependency on PHP 7.3 |