diff options
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-laminas-zendframework-bridge.spec | 28 |
2 files changed, 19 insertions, 16 deletions
diff --git a/composer.json b/composer.json index 34af15a..d025ba0 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,13 @@ "forum": "https://discourse.laminas.dev/" }, "require": { - "php": "^5.6 || ^7.0 || ^8.0" + "php": "^7.3 || ^8.0" }, "require-dev": { "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", - "squizlabs/php_codesniffer": "^3.5" + "psalm/plugin-phpunit": "^0.15.1", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.6" }, "autoload": { "files": [ @@ -52,6 +54,7 @@ "scripts": { "cs-check": "phpcs", "cs-fix": "phpcbf", + "static-analysis": "psalm --shepherd --stats", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" } diff --git a/php-laminas-zendframework-bridge.spec b/php-laminas-zendframework-bridge.spec index 94b3359..de9fe33 100644 --- a/php-laminas-zendframework-bridge.spec +++ b/php-laminas-zendframework-bridge.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-zendframework-bridge # -# Copyright (c) 2020 Remi Collet +# Copyright (c) 2020-2021 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 6ede70583e101030bcace4dcddd648f760ddf642 +%global gh_commit 6cccbddfcfc742eb02158d6137ca5687d92cee32 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-zendframework-bridge @@ -21,7 +21,7 @@ %endif Name: php-%{gh_project} -Version: 1.1.1 +Version: 1.2.0 Release: 1%{?dist} Summary: Alias legacy ZF class names to Laminas Project equivalents @@ -36,25 +36,21 @@ Patch0: %{name}-rpm.patch BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 7.3 BuildRequires: php-spl # From composer, "require-dev": { -# "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", -# "squizlabs/php_codesniffer": "^3.5" -%if 0%{?fedora} >= 32 +# "psalm/plugin-phpunit": "^0.15.1", +# "squizlabs/php_codesniffer": "^3.5", +# "vimeo/psalm": "^4.6" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.3 -%else -%global phpunit %{_bindir}/phpunit8 -BuildRequires: phpunit8 >= 8.1 -%endif # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.1 %endif # From composer, "require": { -# "php": "^5.6 || ^7.0 || ^8.0" -Requires: php(language) >= 5.6 +# "php": "^7.3 || ^8.0" +Requires: php(language) >= 7.3 # From phpcompatinfo report for version 1.0.0 Requires: php-spl # Autoloader @@ -164,7 +160,7 @@ php %{buildroot}%{php_home}/%{namespace}/autoload.php : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -190,6 +186,10 @@ exit $ret %changelog +* Fri Feb 26 2021 Remi Collet <remi@remirepo.net> - 1.2.0-1 +- update to 1.2.0 (no change) +- raise dependency on PHP 7.3 + * Tue Sep 15 2020 Remi Collet <remi@remirepo.net> - 1.1.1-1 - update to 1.1.1 (no change) - switch to phpunit9 |