update to 2.7.0

raise dependency on PHP 5.6

2 files changed, 56 insertions, 27 deletions

diff --git a/composer.json b/composer.json
index ea1186c..b1b118b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,26 +1,28 @@
 {
     "name": "zendframework/zend-text",
-    "description": " ",
+    "description": "Create FIGlets and text-based tables",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "text"
     ],
-    "homepage": "https://github.com/zendframework/zend-text",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-text/",
+        "issues": "https://github.com/zendframework/zend-text/issues",
+        "source": "https://github.com/zendframework/zend-text",
+        "rss": "https://github.com/zendframework/zend-text/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": "^5.5 || ^7.0",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.6"
     },
     "autoload": {
@@ -29,8 +31,30 @@
         }
     },
     "autoload-dev": {
+        "files": [
+            "test/autoload.php"
+        ],
         "psr-4": {
             "ZendTest\\Text\\": "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-text.spec b/php-zendframework-zend-text.spec
index 7810c1f..a94a1c9 100644
--- a/php-zendframework-zend-text.spec
+++ b/php-zendframework-zend-text.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    07ad9388e4d4f12620ad37b52a5b0e4ee7845f92
+%global gh_commit    ca987dd4594f5f9508771fccd82c89bc7fbb39ac
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-text
@@ -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 %{library} component
 
@@ -33,32 +33,32 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.3.23
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-ctype
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.5
 BuildRequires:  php-composer(%{gh_owner}/zend-servicemanager)   >= 2.5
 # From composer, "require-dev": {
-#        "fabpot/php-cs-fixer": "1.7.*",
-#        "phpunit/PHPUnit": "~4.0",
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+#        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-config": "^2.6"
 BuildRequires:  php-composer(%{gh_owner}/zend-config)           >= 2.6
-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",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.0",
-#        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-Requires:       php(language) >= 5.5
+#        "php": "^5.6 || ^7.0",
+#        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
-Requires:       php-composer(%{gh_owner}/zend-stdlib)           >= 2.7
-Requires:       php-composer(%{gh_owner}/zend-stdlib)           <  4
-Requires:       php-composer(%{gh_owner}/zend-servicemanager)   >= 2.7.5
 Requires:       php-composer(%{gh_owner}/zend-servicemanager)   <  4
+Requires:       php-composer(%{gh_owner}/zend-servicemanager)   >= 2.7.5
+Requires:       php-composer(%{gh_owner}/zend-stdlib)           <  4
+Requires:       php-composer(%{gh_owner}/zend-stdlib)           >= 2.7
 %endif
 # From phpcompatinfo report for version 2.5.1
 Requires:       php-ctype
@@ -116,12 +116,13 @@ Zend\Loader\AutoloaderFactory::factory(array(
            'Zend\\%{library}'     => '%{buildroot}%{php_home}/Zend/%{library}'
 ))));
 require_once '%{php_home}/Zend/autoload.php';
+require_once dirname(__DIR__) . '/test/autoload.php';
 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 --verbose || ret=1
   fi
 done
 exit $ret
@@ -139,6 +140,10 @@ exit $ret
 
 
 %changelog
+* Thu May  3 2018 Remi Collet <remi@remirepo.net> - 2.7.0-1
+- update to 2.7.0
+- raise dependency on PHP 5.6
+
 * Fri Feb 12 2016 Remi Collet <remi@fedoraproject.org> - 2.6.0-1
 - update to 2.6.0
 - raise dependency on PHP >= 5.5