update to 2.9.0

raise dependency on PHP 5.6

2 files changed, 46 insertions, 42 deletions

diff --git a/composer.json b/composer.json
index b2ea496..b6eb035 100644
--- a/composer.json
+++ b/composer.json
@@ -1,39 +1,38 @@
 {
     "name": "zendframework/zend-ldap",
-    "description": "provides support for LDAP operations including but not limited to binding, searching and modifying entries in an LDAP directory",
+    "description": "Provides support for LDAP operations including but not limited to binding, searching and modifying entries in an LDAP directory",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "ldap"
     ],
-    "homepage": "https://github.com/zendframework/zend-ldap",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Ldap\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-ldap/",
+        "issues": "https://github.com/zendframework/zend-ldap/issues",
+        "source": "https://github.com/zendframework/zend-ldap",
+        "rss": "https://github.com/zendframework/zend-ldap/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-ldap": "*"
     },
     "require-dev": {
+        "php-mock/php-mock-phpunit": "^1.1.2 || ^2.1.1",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.5",
         "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0",
-        "phpunit/PHPUnit": "^4.5",
-        "php-mock/php-mock-phpunit": "~0.3",
-        "zendframework/zend-coding-standard": "~1.0.0",
-        "phpunit/phpunit": "^4.6"
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "suggest": {
         "zendframework/zend-eventmanager": "Zend\\EventManager component"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.8-dev",
-            "dev-develop": "2.9-dev"
+    "autoload": {
+        "psr-4": {
+            "Zend\\Ldap\\": "src/"
         }
     },
     "autoload-dev": {
@@ -41,6 +40,15 @@
             "ZendTest\\Ldap\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.9.x-dev",
+            "dev-develop": "2.10.x-dev"
+        }
+    },
     "scripts": {
         "check": [
             "@cs-check",
@@ -49,7 +57,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }
diff --git a/php-zendframework-zend-ldap.spec b/php-zendframework-zend-ldap.spec
index e9ee6e4..469e7df 100644
--- a/php-zendframework-zend-ldap.spec
+++ b/php-zendframework-zend-ldap.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-zendframework-zend-ldap
 #
-# 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    a9284a7440e17ce0ba697670bb4db1baf2340acd
+%global gh_commit    eced1c5d82890800c75db2e5c6dfac829ed844e1
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-ldap
@@ -20,11 +20,10 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.8.0
+Version:        2.9.0
 Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
@@ -33,7 +32,7 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.5
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-ldap
 BuildRequires:  php-date
 BuildRequires:  php-iconv
@@ -43,39 +42,33 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.5
 # From composer, "require-dev": {
+#        "php-mock/php-mock-phpunit": "^1.1.2 || ^2.1.1",
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+#        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-config": "^2.5",
 #        "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.0",
-#        "phpunit/PHPUnit": "^4.5",
-#        "php-mock/php-mock-phpunit": "~0.3",
-#        "zendframework/zend-coding-standard": "~1.0.0",
-#        "phpunit/phpunit": "^4.6"
+#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
 BuildRequires:  php-composer(%{gh_owner}/zend-config)           >= 2.5
 BuildRequires:  php-composer(%{gh_owner}/zend-eventmanager)     >= 2.6.3
 BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.7
-BuildRequires:  php-composer(php-mock/php-mock-phpunit)         >= 0.3
-BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.6
+BuildRequires:  php-mock-phpunit                                >= 1.1.2
+BuildRequires:  php-composer(phpunit/phpunit)                   >= 5.7
 # Autoloader
 BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 %endif
 
 # From composer, "require": {
-#        "php": "^5.5 || ^7.0",
+#        "php": "^5.6 || ^7.0",
 #        "ext-ldap": "*"
-Requires:       php(language) >= 5.5
+Requires:       php(language) >= 5.6
 Requires:       php-ldap
 %if ! %{bootstrap}
 # From composer, "suggest": {
 #        "zendframework/zend-config": "^2.5",
 #        "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
 #        "zendframework/zend-stdlib": "^2.7 || ^3.0",
-%if 0%{?fedora} >= 21
-Suggests:       php-composer(%{gh_owner}/zend-config)           >= 2.5
-Suggests:       php-composer(%{gh_owner}/zend-eventmanager)     >= 2.6.3
-Suggests:       php-composer(%{gh_owner}/zend-stdlib)           >= 2.7
 %endif
-%endif
-# From phpcompatinfo report for version 2.5.2
+# From phpcompatinfo report for version 2.9.0
 Requires:       php-date
 Requires:       php-iconv
 Requires:       php-json
@@ -129,7 +122,7 @@ EOF
 ret=0
 for cmd in php php56 php70 php71 php72; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1
+    $cmd %{_bindir}/phpunit || ret=1
   fi
 done
 exit $ret
@@ -147,6 +140,10 @@ exit $ret
 
 
 %changelog
+* Wed Apr 25 2018 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- update to 2.9.0
+- raise dependency on PHP 5.6
+
 * Tue Mar  7 2017 Remi Collet <remi@remirepo.net> - 2.8.0-1
 - Update to 2.8.0