switch to Laminas

2 files changed, 154 insertions, 125 deletions

diff --git a/composer.json b/composer.json
index 4ad9e73..3ce429b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,64 +1,65 @@
 {
-    "name": "zendframework/zend-paginator",
+    "name": "laminas/laminas-paginator",
     "description": "Paginate collections of data from arbitrary sources",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zendframework",
-        "zf",
+        "laminas",
         "paginator"
     ],
+    "homepage": "https://laminas.dev",
     "support": {
-        "docs": "https://docs.zendframework.com/zend-paginator/",
-        "issues": "https://github.com/zendframework/zend-paginator/issues",
-        "source": "https://github.com/zendframework/zend-paginator",
-        "rss": "https://github.com/zendframework/zend-paginator/releases.atom",
-        "chat": "https://zendframework-slack.herokuapp.com",
-        "forum": "https://discourse.zendframework.com/c/questions/components"
+        "docs": "https://docs.laminas.dev/laminas-paginator/",
+        "issues": "https://github.com/laminas/laminas-paginator/issues",
+        "source": "https://github.com/laminas/laminas-paginator",
+        "rss": "https://github.com/laminas/laminas-paginator/releases.atom",
+        "chat": "https://laminas.dev/chat",
+        "forum": "https://discourse.laminas.dev"
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.8.x-dev",
+            "dev-develop": "2.9.x-dev"
+        },
+        "laminas": {
+            "component": "Laminas\\Paginator",
+            "config-provider": "Laminas\\Paginator\\ConfigProvider"
+        }
     },
     "require": {
         "php": "^7.0 || ^5.6",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+        "laminas/laminas-stdlib": "^2.7 || ^3.0",
+        "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.2.1 || ^5.7.15",
-        "zendframework/zend-cache": "^2.6.1",
-        "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-config": "^2.6.0",
-        "zendframework/zend-db": "^2.9.2",
-        "zendframework/zend-filter": "^2.6.1",
-        "zendframework/zend-json": "^2.6.1",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-view": "^2.6.3"
+        "laminas/laminas-cache": "^2.6.1",
+        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-config": "^2.6.0",
+        "laminas/laminas-db": "^2.9.2",
+        "laminas/laminas-filter": "^2.6.1",
+        "laminas/laminas-json": "^2.6.1",
+        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+        "laminas/laminas-view": "^2.6.3",
+        "phpunit/phpunit": "^6.2.1 || ^5.7.15"
     },
     "suggest": {
-        "zendframework/zend-cache": "Zend\\Cache component to support cache features",
-        "zendframework/zend-db": "Zend\\Db component",
-        "zendframework/zend-filter": "Zend\\Filter component",
-        "zendframework/zend-json": "Zend\\Json component",
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-        "zendframework/zend-view": "Zend\\View component"
+        "laminas/laminas-cache": "Laminas\\Cache component to support cache features",
+        "laminas/laminas-db": "Laminas\\Db component",
+        "laminas/laminas-filter": "Laminas\\Filter component",
+        "laminas/laminas-json": "Laminas\\Json component",
+        "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+        "laminas/laminas-view": "Laminas\\View component"
     },
     "autoload": {
         "psr-4": {
-            "Zend\\Paginator\\": "src/"
+            "Laminas\\Paginator\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "ZendTest\\Paginator\\": "test/"
-        }
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.8.x-dev",
-            "dev-develop": "2.9.x-dev"
-        },
-        "zf": {
-            "component": "Zend\\Paginator",
-            "config-provider": "Zend\\Paginator\\ConfigProvider"
+            "LaminasTest\\Paginator\\": "test/"
         }
     },
     "scripts": {
@@ -70,5 +71,8 @@
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+    },
+    "replace": {
+        "zendframework/zend-paginator": "self.version"
     }
 }
diff --git a/php-laminas-paginator.spec b/php-laminas-paginator.spec
index c994ce2..fd9661c 100644
--- a/php-laminas-paginator.spec
+++ b/php-laminas-paginator.spec
@@ -1,17 +1,19 @@
-# remirepo/Fedora spec file for php-zendframework-zend-paginator
+# remirepo/Fedora spec file for php-laminas-paginator
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2020 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    2b4d07d9475ed581278a28d065b238a0941402e2
+%global gh_commit    5e53d927776b2d20e420bc2b289fa0c364a6b0bd
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner     zendframework
-%global gh_project   zend-paginator
+%global gh_owner     laminas
+%global gh_project   laminas-paginator
+%global zf_name      zend-paginator
 %global php_home     %{_datadir}/php
+%global namespace    Laminas
 %global library      Paginator
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
@@ -19,13 +21,13 @@
 %global with_tests   0%{!?_without_tests:1}
 %endif
 
-Name:           php-%{gh_owner}-%{gh_project}
+Name:           php-%{gh_project}
 Version:        2.8.2
-Release:        2%{?dist}
-Summary:        Zend Framework %{library} component
+Release:        1%{?dist}
+Summary:        %{namespace} Framework %{library} component
 
 License:        BSD
-URL:            https://zendframework.github.io/%{gh_project}/
+URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
@@ -33,50 +35,41 @@ BuildArch:      noarch
 # Tests
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.6
+BuildRequires:  php-json
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)           <  4)
-# remirepo:4
-%else
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         <  4
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
-%endif
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0     with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "require-dev": {
-#        "phpunit/phpunit": "^6.2.1 || ^5.7.15",
-#        "zendframework/zend-cache": "^2.6.1",
-#        "zendframework/zend-coding-standard": "~1.0.0",
-#        "zendframework/zend-config": "^2.6.0",
-#        "zendframework/zend-db": "^2.9.2",
-#        "zendframework/zend-filter": "^2.6.1",
-#        "zendframework/zend-json": "^2.6.1",
-#        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-#        "zendframework/zend-view": "^2.6.3"
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/zend-cache)          >= 2.6.1   with php-autoloader(%{gh_owner}/zend-cache)          <  3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-config)         >= 2.6.0   with php-autoloader(%{gh_owner}/zend-config)         <  3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-db)             >= 2.9.2   with php-autoloader(%{gh_owner}/zend-db)             <  3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-filter)         >= 2.6.1   with php-autoloader(%{gh_owner}/zend-filter)         <  3)
+#        "laminas/laminas-cache": "^2.6.1",
+#        "laminas/laminas-coding-standard": "~1.0.0",
+#        "laminas/laminas-config": "^2.6.0",
+#        "laminas/laminas-db": "^2.9.2",
+#        "laminas/laminas-filter": "^2.6.1",
+#        "laminas/laminas-json": "^2.6.1",
+#        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+#        "laminas/laminas-view": "^2.6.3",
+#        "phpunit/phpunit": "^6.2.1 || ^5.7.15"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache)                >= 2.6.1   with php-autoloader(%{gh_owner}/laminas-cache)                <  3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-config)               >= 2.6.0   with php-autoloader(%{gh_owner}/laminas-config)               <  3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-db)                   >= 2.9.2   with php-autoloader(%{gh_owner}/laminas-db)                   <  3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter)               >= 2.6.1   with php-autoloader(%{gh_owner}/laminas-filter)               <  3)
 # ignore max version as test suite passes with 3.1.1
-BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.6.1
-BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5   with php-autoloader(%{gh_owner}/zend-servicemanager) <  4)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-view)           >= 2.6.3   with php-autoloader(%{gh_owner}/zend-view)           <  3)
-# remirepo:15
+BuildRequires:  php-autoloader(%{gh_owner}/laminas-json)                 >= 2.6.1
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 2.7.5   with php-autoloader(%{gh_owner}/laminas-servicemanager)       <  4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-view)                 >= 2.6.3   with php-autoloader(%{gh_owner}/laminas-view)                 <  3)
+# remirepo:11
 %else
-BuildRequires:  php-autoloader(%{gh_owner}/zend-cache)          <  3
-BuildRequires:  php-autoloader(%{gh_owner}/zend-cache)          >= 2.6.1
-BuildRequires:  php-autoloader(%{gh_owner}/zend-config)         <  3
-BuildRequires:  php-autoloader(%{gh_owner}/zend-config)         >= 2.6.0
-BuildRequires:  php-autoloader(%{gh_owner}/zend-db)             <  3
-BuildRequires:  php-autoloader(%{gh_owner}/zend-db)             >= 2.9.2
-BuildRequires:  php-autoloader(%{gh_owner}/zend-filter)         <  3
-BuildRequires:  php-autoloader(%{gh_owner}/zend-filter)         >= 2.6.1
-BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.6.1
-BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) <  4
-BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-view)           <  3
-BuildRequires:  php-autoloader(%{gh_owner}/zend-view)           >= 2.6.3
+BuildRequires:  php-laminas-stdlib
+BuildRequires:  php-laminas-zendframework-bridge
+BuildRequires:  php-laminas-cache
+BuildRequires:  php-laminas-config
+BuildRequires:  php-laminas-db
+BuildRequires:  php-laminas-filter
+BuildRequires:  php-laminas-json
+BuildRequires:  php-laminas-servicemanager
+BuildRequires:  php-laminas-view
 %endif
 BuildRequires:  phpunit6 >= 6.2.1
 %endif
@@ -85,49 +78,55 @@ BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
 #        "php": "^7.0 || ^5.6",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+#        "laminas/laminas-stdlib": "^2.7 || ^3.0",
+#        "laminas/laminas-zendframework-bridge": "^1.0"
 Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)           <  4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0     with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# From composer, "suggest": {
+#        "laminas/laminas-cache": "Laminas\\Cache component to support cache features",
+#        "laminas/laminas-db": "Laminas\\Db component",
+#        "laminas/laminas-filter": "Laminas\\Filter component",
+#        "laminas/laminas-json": "Laminas\\Json component",
+#        "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+#        "laminas/laminas-view": "Laminas\\View component"
+Suggests:       php-autoloader(%{gh_owner}/laminas-cache)
+Suggests:       php-autoloader(%{gh_owner}/laminas-db)
+Suggests:       php-autoloader(%{gh_owner}/laminas-filter)
+Suggests:       php-autoloader(%{gh_owner}/laminas-json)
+Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager)
+Suggests:       php-autoloader(%{gh_owner}/laminas-view)
 # remirepo:4
 %else
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
-%endif
-# From composer, "suggest": {
-#        "zendframework/zend-cache": "Zend\\Cache component to support cache features",
-#        "zendframework/zend-db": "Zend\\Db component",
-#        "zendframework/zend-filter": "Zend\\Filter component",
-#        "zendframework/zend-json": "Zend\\Json component",
-#        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-#        "zendframework/zend-view": "Zend\\View component"
-%if 0%{?fedora} >= 21
-Suggests:       php-autoloader(%{gh_owner}/zend-cache)
-Suggests:       php-autoloader(%{gh_owner}/zend-db)
-Suggests:       php-autoloader(%{gh_owner}/zend-filter)
-Suggests:       php-autoloader(%{gh_owner}/zend-json)
-Suggests:       php-autoloader(%{gh_owner}/zend-servicemanager)
-Suggests:       php-autoloader(%{gh_owner}/zend-view)
+Requires:       php-laminas-stdlib
+Requires:       php-laminas-zendframework-bridge
 %endif
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
-# From phpcompatinfo report for version 2.5.1
+# From phpcompatinfo report for version 2.8.2
+Requires:       php-json
 Requires:       php-spl
 
-Obsoletes:      php-ZendFramework2-%{library} < 2.5
-Provides:       php-ZendFramework2-%{library} = %{version}
-Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
+Obsoletes:      php-ZendFramework2-%{library}             < 2.5
+Provides:       php-ZendFramework2-%{library}             = %{version}
+# Compatibily ensure by the bridge
+Obsoletes:      php-zendframework-%{zf_name}              < 2.8.2-99
+Provides:       php-zendframework-%{zf_name}              = %{version}-99
+Provides:       php-composer(%{gh_owner}/%{gh_project})   = %{version}
+Provides:       php-composer(zendframework/%{zf_name})    = %{version}
 Provides:       php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
+Provides:       php-autoloader(zendframework/%{zf_name})  = %{version}
 
 
 %description
-Zend\Paginator is a flexible component for paginating
+%{namespace}\Paginator is a flexible component for paginating
 collections of data and presenting that data to users.
 
-Documentation: https://zendframework.github.io/%{gh_project}/
+Documentation: https://docs.laminas.dev/%{gh_project}/
 
 
 %prep
@@ -141,22 +140,36 @@ mv LICENSE.md LICENSE
 phpab --template fedora --output src/autoload.php src
 cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/Zend/View/autoload.php',
+    '%{php_home}/%{namespace}/Stdlib/autoload.php',
 ]);
 \Fedora\Autoloader\Dependencies::optional([
-    '%{php_home}/Zend/Cache/autoload.php',
-    '%{php_home}/Zend/Db/autoload.php',
-    '%{php_home}/Zend/Filter/autoload.php',
-    '%{php_home}/Zend/Json/autoload.php',
-    '%{php_home}/Zend/ServiceManager/autoload.php',
-    '%{php_home}/Zend/View/autoload.php',
+    '%{php_home}/%{namespace}/Cache/autoload.php',
+    '%{php_home}/%{namespace}/Db/autoload.php',
+    '%{php_home}/%{namespace}/Filter/autoload.php',
+    '%{php_home}/%{namespace}/Json/autoload.php',
+    '%{php_home}/%{namespace}/ServiceManager/autoload.php',
+    '%{php_home}/%{namespace}/View/autoload.php',
+]);
+EOF
+
+cat << 'EOF' | tee zf.php
+<?php
+require_once '%{php_home}/Fedora/Autoloader/autoload.php';
+\Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php',
+    dirname(dirname(__DIR__)) . '/%{namespace}/%{library}/autoload.php',
 ]);
 EOF
 
 
 %install
-mkdir -p   %{buildroot}%{php_home}/Zend/
-cp -pr src %{buildroot}%{php_home}/Zend/%{library}
+: Laminas library
+mkdir -p   %{buildroot}%{php_home}/%{namespace}/
+cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}
+
+: Zend equiv
+mkdir -p      %{buildroot}%{php_home}/Zend/%{library}
+cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php
 
 
 %check
@@ -164,15 +177,22 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library}
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
-require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
+require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/Zend/Config/autoload.php',
+    '%{php_home}/%{namespace}/Config/autoload.php',
 ]);
-\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test');
+\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
 EOF
 
+: check compat autoloader
+php -r '
+require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
+exit (class_exists("\\Zend\\%{library}\\Factory") ? 0 : 1);
+'
+
+: upstream test suite
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php72 php73 php74; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit6 --verbose || ret=1
   fi
@@ -184,14 +204,19 @@ exit $ret
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
 %doc composer.json
 %{php_home}/Zend/%{library}
+%{php_home}/%{namespace}/%{library}
 
 
 %changelog
+* Thu Jan 16 2020 Remi Collet <remi@remirepo.net> - 2.8.2-1
+- switch to Laminas
+
 * Wed Aug 21 2019 Remi Collet <remi@remirepo.net> - 2.8.2-2
 - update to 2.8.2
 - use range dependencies