diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | composer.json | 18 | ||||
| -rw-r--r-- | php-laminas-hydrator3.spec | 37 |
3 files changed, 29 insertions, 28 deletions
@@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/composer.json b/composer.json index 271951f..536ddee 100644 --- a/composer.json +++ b/composer.json @@ -19,19 +19,14 @@ "sort-packages": true }, "extra": { - "branch-alias": { - "dev-release-2.4": "2.4.x-dev", - "dev-master": "3.0.x-dev", - "dev-develop": "3.1.x-dev" - }, "laminas": { "component": "Laminas\\Hydrator", "config-provider": "Laminas\\Hydrator\\ConfigProvider" } }, "require": { - "php": "^7.2", - "laminas/laminas-stdlib": "^3.2.1", + "php": "^7.3 || ~8.0.0", + "laminas/laminas-stdlib": "^3.3", "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { @@ -40,9 +35,8 @@ "laminas/laminas-modulemanager": "^2.8", "laminas/laminas-serializer": "^2.9", "laminas/laminas-servicemanager": "^3.3.2", - "phpspec/prophecy": "^1.7.5", - "phpstan/phpstan": "^0.10.5", - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "~9.3.0", + "vimeo/psalm": "^3.16" }, "suggest": { "laminas/laminas-eventmanager": "^3.2, to support aggregate hydrator usage", @@ -60,17 +54,17 @@ } }, "scripts": { - "analyse": "phpstan analyse --no-progress", "check": [ "@cs-check", "@test" ], "cs-check": "phpcs", "cs-fix": "phpcbf", + "static-analysis": "psalm --shepherd --stats", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-hydrator": "self.version" + "zendframework/zend-hydrator": "^3.0.2" } } diff --git a/php-laminas-hydrator3.spec b/php-laminas-hydrator3.spec index b717e0f..3eed60e 100644 --- a/php-laminas-hydrator3.spec +++ b/php-laminas-hydrator3.spec @@ -1,6 +1,6 @@ # remirepo/Fedora spec file for php-laminas-hydrator3 # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,7 +11,7 @@ # pulled by php-ocramius-proxy-manager %global bootstrap 0 -%global gh_commit 5c418d6e37ad363bef5ce1c8a72388243d6c7950 +%global gh_commit f0336699910478cc45c7e34ca0fc83bf118e48bc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-hydrator @@ -27,7 +27,7 @@ %endif Name: php-%{gh_project}%{major} -Version: 3.0.2 +Version: 3.2.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component v%{major} @@ -39,22 +39,21 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.3 BuildRequires: php-date BuildRequires: php-reflection BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 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) # From composer, "require-dev": { # "laminas/laminas-eventmanager": "^3.2.1", # "laminas/laminas-modulemanager": "^2.8", # "laminas/laminas-serializer": "^2.9", # "laminas/laminas-servicemanager": "^3.3.2", -# "phpspec/prophecy": "^1.7.5", -# "phpstan/phpstan": "^0.10.5", -# "phpunit/phpunit": "^7.5" +# "phpunit/phpunit": "~9.3.0", +# "vimeo/psalm": "^3.16" BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.8 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer) >= 2.9 with php-autoloader(%{gh_owner}/laminas-serializer) < 3) @@ -68,19 +67,19 @@ BuildRequires: php-laminas-modulemanager BuildRequires: php-laminas-serializer BuildRequires: php-laminas-servicemanager %endif -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.5 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.3 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.2", -# "laminas/laminas-stdlib": "^3.2.1", -Requires: php(language) >= 7.2 +# "php": "^7.3 || ~8.0.0", +# "laminas/laminas-stdlib": "^3.3", +Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 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) # From composer, "suggest": { # "laminas/laminas-eventmanager": "^3.2, to support aggregate hydrator usage", @@ -175,10 +174,10 @@ exit (class_exists("\\Zend\\%{library}\\Reflection") ? 0 : 1); : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php72 php73 php74; do +for cmdarg in "php %{phpunit}" php73 php74 php80; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit7} -d memory_limit=1G || ret=1 + $1 ${2:-%{_bindir}/phpunit9} -d memory_limit=1G || ret=1 fi done exit $ret @@ -198,6 +197,12 @@ exit $ret %changelog +* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 3.2.0-1 +- update to 3.2.0 +- raise dependency on PHP 7.3 +- raise dependency on laminas-stdlib 3.3 +- switch to phpunit9 + * Mon Jan 20 2020 Remi Collet <remi@remirepo.net> - 3.0.2-1 - update to 3.0.2 - rename to php-laminas-hydrator3 |