From 2c07b3d53b92a7af4fd860159652d4442c22b73f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 2 May 2018 15:04:51 +0200
Subject: update to 2.6.0 raise dependency on PHP 5.6 add dependency on
 zend-escaper

---
 composer.json                     | 58 +++++++++++++++++++++++++--------------
 php-zendframework-zend-debug.spec | 34 +++++++++++------------
 2 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/composer.json b/composer.json
index 1cc6250..8ddbc8c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,40 +1,58 @@
 {
     "name": "zendframework/zend-debug",
-    "description": " ",
+    "description": "Safely dump debug information to HTML",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "debug"
     ],
-    "homepage": "https://github.com/zendframework/zend-debug",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Debug\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-debug/",
+        "issues": "https://github.com/zendframework/zend-debug/issues",
+        "source": "https://github.com/zendframework/zend-debug",
+        "rss": "https://github.com/zendframework/zend-debug/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": ">=5.3.23"
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-escaper": "^2.0"
     },
     "require-dev": {
-        "zendframework/zend-escaper": "2.*",
-        "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"
     },
     "suggest": {
-        "ext/xdebug": "XDebug, for better backtrace output",
-        "zendframework/zend-escaper": "To support escaped output"
+        "ext-xdebug": "XDebug, for better backtrace output"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+    "autoload": {
+        "psr-4": {
+            "Zend\\Debug\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Debug\\": "test/"
         }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.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"
     }
-}
\ No newline at end of file
+}
diff --git a/php-zendframework-zend-debug.spec b/php-zendframework-zend-debug.spec
index cd03e0c..bd45b76 100644
--- a/php-zendframework-zend-debug.spec
+++ b/php-zendframework-zend-debug.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    b6f9df59155391ca683c479a0d758f66ef73b3b3
+%global gh_commit    cb423facd6f2e875a3cb44cf992b6bd1f5fd1a96
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-debug
@@ -20,7 +20,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.5.1
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -34,29 +34,26 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.3.23
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-pcre
-# From composer, "require-dev": {
-#        "zendframework/zend-escaper": "2.*",
-#        "fabpot/php-cs-fixer": "1.7.*",
-#        "phpunit/PHPUnit": "~4.0"
 BuildRequires:  php-composer(%{gh_owner}/zend-escaper)          >= 2.5
-BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.0
+# From composer, "require-dev": {
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
+#        "zendframework/zend-coding-standard": "~1.0.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.3.23"
-Requires:       php(language) >= 5.3.23
+#        "php": "^5.6 || ^7.0",
+#        "zendframework/zend-escaper": "^2.0"
+Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
+Requires:       php-composer(%{gh_owner}/zend-escaper)
 # From composer, "suggest": {
 #        "ext/xdebug": "XDebug, for better backtrace output",
 #        "zendframework/zend-escaper": "To support escaped output"
-%if 0%{?fedora} >= 21
-Suggests:       php-pecl(xdebug)
-Suggests:       php-composer(%{gh_owner}/zend-escaper)
-%endif
 # Autoloader
 Requires:       php-composer(%{gh_owner}/zend-loader)           >= 2.5
 %endif
@@ -111,10 +108,6 @@ require_once '%{php_home}/Zend/autoload.php';
 EOF
 
 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home}
-
-if which php70; then
-   php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home}
-fi
 %else
 : Test suite disabled
 %endif
@@ -134,5 +127,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed May  2 2018 Remi Collet <remi@remirepo.net> - 2.6.0-1
+- update to 2.6.0
+- raise dependency on PHP 5.6
+- add dependency on zend-escaper
+
 * Tue Aug  4 2015 Remi Collet <remi@fedoraproject.org> - 2.5.1-1
 - initial package
-- 
cgit