From f715fbc3cfba50e292aadb9f07cc349f1dc083b2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 May 2018 08:07:10 +0200 Subject: update to 2.7.0 raise dependency on PHP 5.6 --- composer.json | 43 +++++++++++++++++++++-------- php-zendframework-zend-permissions-acl.spec | 22 +++++++++------ 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index cf0b445..fc40fde 100644 --- a/composer.json +++ b/composer.json @@ -1,24 +1,26 @@ { "name": "zendframework/zend-permissions-acl", - "description": "provides a lightweight and flexible access control list (ACL) implementation for privileges management", + "description": "Provides a lightweight and flexible access control list (ACL) implementation for privileges management", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "acl" ], - "homepage": "https://github.com/zendframework/zend-permissions-acl", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } + "support": { + "docs": "https://docs.zendframework.com/zend-permissions-acl/", + "issues": "https://github.com/zendframework/zend-permissions-acl/issues", + "source": "https://github.com/zendframework/zend-permissions-acl", + "rss": "https://github.com/zendframework/zend-permissions-acl/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" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { @@ -33,5 +35,24 @@ "psr-4": { "ZendTest\\Permissions\\Acl\\": "test/" } + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.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-permissions-acl.spec b/php-zendframework-zend-permissions-acl.spec index ccf1e1e..5a44fd0 100644 --- a/php-zendframework-zend-permissions-acl.spec +++ b/php-zendframework-zend-permissions-acl.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 843bbd9c6f6d20b84dd0ce6c815d10397e98082b +%global gh_commit c9568f4aee2887e43bf07769973f9686e8f61707 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-permissions-acl @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.0 +Version: 2.7.0 Release: 1%{?dist} Summary: Zend Framework Permissions-%{library} component @@ -33,21 +33,21 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-spl # From composer, "require-dev": { -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5", +# "zendframework/zend-coding-standard": "~1.0.0", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +BuildRequires: php-composer(phpunit/phpunit) >= 5.7.27 # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { -# "php": "^5.5 || ^7.0" -Requires: php(language) >= 5.5 +# "php": "^5.6 || ^7.0" +Requires: php(language) >= 5.6 %if ! %{bootstrap} # From composer, "suggest": { # "zendframework/zend-servicemanager": "To support Zend\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage" @@ -103,7 +103,7 @@ require_once '%{php_home}/Zend/autoload.php'; EOF ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit || ret=1 fi @@ -124,6 +124,10 @@ exit $ret %changelog +* Thu May 3 2018 Remi Collet - 2.7.0-1 +- update to 2.7.0 +- raise dependency on PHP 5.6 + * Thu Feb 4 2016 Remi Collet - 2.6.0-1 - update to 2.6.0 - raise dependency on PHP >= 5.5 -- cgit