diff options
| -rw-r--r-- | composer.json | 55 | ||||
| -rw-r--r-- | php-zendframework-zend-math.spec | 65 |
2 files changed, 81 insertions, 39 deletions
diff --git a/composer.json b/composer.json index 804ba67..a8d1abf 100644 --- a/composer.json +++ b/composer.json @@ -1,32 +1,36 @@ { "name": "zendframework/zend-math", - "description": " ", + "description": "Create cryptographically secure pseudo-random numbers, and manage big integers", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "math" ], - "homepage": "https://github.com/zendframework/zend-math", - "autoload": { - "psr-4": { - "Zend\\Math\\": "src/" - } + "support": { + "docs": "https://docs.zendframework.com/zend-math/", + "issues": "https://github.com/zendframework/zend-math/issues", + "source": "https://github.com/zendframework/zend-math", + "rss": "https://github.com/zendframework/zend-math/releases.atom", + "chat": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "ext-mbstring": "*", - "paragonie/random_compat": "^2.0.2" + "paragonie/random_compat": "^2.0.11" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", + "zendframework/zend-coding-standard": "~1.0.0" }, "suggest": { "ext-bcmath": "If using the bcmath functionality", "ext-gmp": "If using the gmp functionality" }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "autoload": { + "psr-4": { + "Zend\\Math\\": "src/" } }, "autoload-dev": { @@ -34,8 +38,23 @@ "ZendTest\\Math\\": "test/" } }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev", + "dev-develop": "3.2.x-dev" + } + }, + "scripts": { + "check": [ + "@cs-check", + "@test" + ], + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" } } diff --git a/php-zendframework-zend-math.spec b/php-zendframework-zend-math.spec index 791e883..da5e260 100644 --- a/php-zendframework-zend-math.spec +++ b/php-zendframework-zend-math.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-math # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 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 fda3b4e6c3bb15c35adc6db38b2eacabaa243e65 +%global gh_commit 558806e338ee68575fbe69489c9dcb6d57a1dae0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-math @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 3.0.0 -Release: 4%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -33,35 +33,49 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-bcmath BuildRequires: php-gmp -BuildRequires: php-openssl +BuildRequires: php-mbstring BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-composer(paragonie/random_compat) < 3 -BuildRequires: php-composer(paragonie/random_compat) >= 2.0.2 # test suite hangs without (need investigation) BuildRequires: php-mcrypt # From composer, "require-dev": { -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0", -BuildRequires: php-composer(ircmaxell/random-lib) >= 1.1 -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", +# "zendframework/zend-coding-standard": "~1.0.0" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(paragonie/random_compat) >= 2.0.11 with php-composer(paragonie/random_compat) < 3) +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.2 +# remirepo:6 +%else +BuildRequires: php-composer(paragonie/random_compat) < 3 +BuildRequires: php-composer(paragonie/random_compat) >= 2.0.11 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit6 >= 6.5.8 +%endif # Autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer, "require": { -# "php": "^5.5 || ^7.0", +# "php": "^5.6 || ^7.0", # "ext-mbstring": "*", -# "paragonie/random_compat": "^2.0.2" -Requires: php(language) >= 5.5 +# "paragonie/random_compat": "^2.0.11" +Requires: php(language) >= 5.6 Requires: php-mbstring +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(paragonie/random_compat) >= 2.0.11 with php-composer(paragonie/random_compat) < 3) +# remirepo:4 +%else Requires: php-composer(paragonie/random_compat) < 3 -Requires: php-composer(paragonie/random_compat) >= 2.0.2 -# From phpcompatinfo report for version 2.5.2 -Requires: php-openssl +Requires: php-composer(paragonie/random_compat) >= 2.0.11 +%endif +# From phpcompatinfo report for version 3.1.0 +Requires: php-mbstring Requires: php-pcre Requires: php-spl %if ! %{bootstrap} @@ -128,9 +142,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php56 php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit --verbose || ret=1 +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 fi done exit $ret @@ -150,6 +165,14 @@ exit $ret %changelog +* Fri Apr 27 2018 Remi Collet <remi@remirepo.net> - 3.1.0-1 +- update to 3.1.0 +- raise dependency on PHP 5.6 +- raise dependency on paragonie/random_compat 2.0.11 +- add dependency on mbstring +- use range dependencies on F27+ +- switch to phpunit6 or phpunit7 + * Thu Nov 23 2017 Remi Collet <remi@fedoraproject.org> - 3.0.0-4 - switch from zend-loader to fedora/autoloader |