diff options
| -rw-r--r-- | composer.json | 39 | ||||
| -rw-r--r-- | php-laminas-text.spec | 81 |
2 files changed, 71 insertions, 49 deletions
diff --git a/composer.json b/composer.json index 5b0bb29..da35dbd 100644 --- a/composer.json +++ b/composer.json @@ -16,24 +16,26 @@ "forum": "https://discourse.laminas.dev" }, "config": { - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "8.0.99" + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" - } }, "require": { - "php": "^5.6 || ^7.0", - "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", - "laminas/laminas-stdlib": "^2.7 || ^3.0", - "laminas/laminas-zendframework-bridge": "^1.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "laminas/laminas-servicemanager": "^3.19.0", + "laminas/laminas-stdlib": "^3.7.1" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-config": "^2.6", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" + "laminas/laminas-coding-standard": "~2.4.0", + "phpunit/phpunit": "^9.5", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.1" }, "autoload": { "psr-4": { @@ -41,9 +43,6 @@ } }, "autoload-dev": { - "files": [ - "test/autoload.php" - ], "psr-4": { "LaminasTest\\Text\\": "test/" } @@ -55,10 +54,12 @@ ], "cs-check": "phpcs", "cs-fix": "phpcbf", - "test": "phpunit --colors=always", - "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + "test": "phpunit --colors=always --testsuite \"unit test\"", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", + "test-integration": "phpunit --colors=always --testsuite \"integration test\"", + "upload-coverage": "coveralls -v" }, - "replace": { - "zendframework/zend-text": "self.version" + "conflict": { + "zendframework/zend-text": "*" } } diff --git a/php-laminas-text.spec b/php-laminas-text.spec index 8f587b5..3774d93 100644 --- a/php-laminas-text.spec +++ b/php-laminas-text.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-text # -# 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 3601b5eacb06ed0a12f658df860cc0f9613cf4db +%global gh_commit 40f7acdb284d41553d32db811e704d6e15e415b4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-text @@ -22,11 +22,11 @@ %endif Name: php-%{gh_project} -Version: 2.7.1 -Release: 2%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: %{namespace} Framework %{library} component -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -34,44 +34,42 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 8.0 BuildRequires: php-ctype BuildRequires: php-pcre BuildRequires: php-spl # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-config": "^2.6", -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" +# "laminas/laminas-coding-standard": "~2.4.0", +# "phpunit/phpunit": "^9.5", +# "psalm/plugin-phpunit": "^0.18.4", +# "vimeo/psalm": "^5.1" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.19 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.7.1 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-config) >= 2.6 with php-autoloader(%{gh_owner}/laminas-config) < 3) -# remirepo:6 +# remirepo:5 %else BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge -BuildRequires: php-laminas-config %endif -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1.4 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.5 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0", -# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", -# "laminas/laminas-stdlib": "^2.7 || ^3.0", -# "laminas/laminas-zendframework-bridge": "^1.0" -Requires: php(language) >= 5.6 +# "php": "~8.0.0 || ~8.1.0 || ~8.2.0", +# "laminas/laminas-servicemanager": "^3.19.0", +# "laminas/laminas-stdlib": "^3.7.1" +Requires: php(language) >= 8.0 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.19 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.7.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) # remirepo:5 %else @@ -91,8 +89,8 @@ Requires: php-spl Obsoletes: php-ZendFramework2-%{library} < 2.5 Provides: php-ZendFramework2-%{library} = %{version} # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 2.7.1-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 2.7.2 +Provides: php-zendframework-%{zf_name} = %{version} Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} @@ -159,9 +157,6 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; -\Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{namespace}/Config/autoload.php', -]); \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); EOF @@ -173,10 +168,11 @@ exit (class_exists("\\Zend\\%{library}\\MultiByte") ? 0 : 1); : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php72 php73 php74; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit9} \ + --verbose || ret=1 fi done exit $ret @@ -196,6 +192,31 @@ exit $ret %changelog +* Wed Dec 14 2022 Remi Collet <remi@remirepo.net> - 2.10.0-1 +- update to 2.10.0 +- raise dependency on PHP 8.0 +- raise dependency on laminas-servicemanager 3.19 +- raise dependency on zend-stdlib >= 3.7.1 + +* Wed Nov 10 2021 Remi Collet <remi@remirepo.net> - 2.9.0-2 +- ignore tests for deprecation + +* Fri Sep 3 2021 Remi Collet <remi@remirepo.net> - 2.9.0-1 +- update to 2.9.0 +- raise dependency on zend-stdlib >= 3.6 +- keep compatibility using laminas-zendframework-bridge + as this is only used using compat autolader + +* Thu Feb 25 2021 Remi Collet <remi@remirepo.net> - 2.8.1-1 +- update to 2.8.1 (no change) + +* Mon Nov 2 2020 Remi Collet <remi@remirepo.net> - 2.8.0-1 +- update to 2.8.0 (no change) +- raise dependency on PHP 7.3 +- raise dependency on laminas-servicemanager 3.4 +- raise dependency on zend-stdlib >= 3.1 +- switch to phpunit9 + * Sat Jan 25 2020 Remi Collet <remi@remirepo.net> - 2.7.1-2 - fix Package obsoletes itself #1792401 |