switch to Laminas

2 files changed, 118 insertions, 81 deletions

diff --git a/composer.json b/composer.json
index b1b118b..5b0bb29 100644
--- a/composer.json
+++ b/composer.json
@@ -1,33 +1,43 @@
 {
-    "name": "zendframework/zend-text",
+    "name": "laminas/laminas-text",
     "description": "Create FIGlets and text-based tables",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf",
-        "zendframework",
+        "laminas",
         "text"
     ],
+    "homepage": "https://laminas.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"
+        "docs": "https://docs.laminas.dev/laminas-text/",
+        "issues": "https://github.com/laminas/laminas-text/issues",
+        "source": "https://github.com/laminas/laminas-text",
+        "rss": "https://github.com/laminas/laminas-text/releases.atom",
+        "chat": "https://laminas.dev/chat",
+        "forum": "https://discourse.laminas.dev"
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
+        }
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+        "laminas/laminas-stdlib": "^2.7 || ^3.0",
+        "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-        "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-config": "^2.6"
+        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-config": "^2.6",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
     },
     "autoload": {
         "psr-4": {
-            "Zend\\Text\\": "src/"
+            "Laminas\\Text\\": "src/"
         }
     },
     "autoload-dev": {
@@ -35,16 +45,7 @@
             "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"
+            "LaminasTest\\Text\\": "test/"
         }
     },
     "scripts": {
@@ -56,5 +57,8 @@
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+    },
+    "replace": {
+        "zendframework/zend-text": "self.version"
     }
 }
diff --git a/php-laminas-text.spec b/php-laminas-text.spec
index dbaa623..815f942 100644
--- a/php-laminas-text.spec
+++ b/php-laminas-text.spec
@@ -1,17 +1,19 @@
-# remirepo/Fedora spec file for php-zendframework-zend-text
+# remirepo/Fedora spec file for php-laminas-text
 #
-# Copyright (c) 2015-2018 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    41e32dafa4015e160e2f95a7039554385c71624d
+%global gh_commit    3601b5eacb06ed0a12f658df860cc0f9613cf4db
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner     zendframework
-%global gh_project   zend-text
+%global gh_owner     laminas
+%global gh_project   laminas-text
+%global zf_name      zend-text
 %global php_home     %{_datadir}/php
+%global namespace    Laminas
 %global library      Text
 %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.7.1
-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
 
@@ -37,78 +39,83 @@ BuildRequires:  php-ctype
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer, "require-dev": {
-#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-#        "zendframework/zend-coding-standard": "~1.0.0",
-#        "zendframework/zend-config": "^2.6"
+#        "laminas/laminas-coding-standard": "~1.0.0",
+#        "laminas/laminas-config": "^2.6",
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-config)         >= 2.6   with php-autoloader(%{gh_owner}/zend-config)         < 3)
-%global phpunit %{_bindir}/phpunit7
-BuildRequires:  phpunit7 >= 7.1.4
-# remirepo:10
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.0.3  with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+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)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-config)               >= 2.6    with php-autoloader(%{gh_owner}/laminas-config)               < 3)
+# remirepo:6
 %else
-BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) <  4
-BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         <  4
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
-BuildRequires:  php-autoloader(%{gh_owner}/zend-config)         <  3
-BuildRequires:  php-autoloader(%{gh_owner}/zend-config)         >= 2.6
-%global phpunit %{_bindir}/phpunit6
-BuildRequires:  phpunit6 >= 6.5.8
+BuildRequires:  php-laminas-servicemanager
+BuildRequires:  php-laminas-stdlib
+BuildRequires:  php-laminas-zendframework-bridge
+BuildRequires:  php-laminas-config
 %endif
+%global phpunit %{_bindir}/phpunit7
+BuildRequires:  phpunit7 >= 7.1.4
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
 #        "php": "^5.6 || ^7.0",
-#        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+#        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+#        "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-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
-Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
-# remirepo:6
+Requires:      (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.0.3  with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 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)
+# remirepo:5
 %else
-Requires:       php-autoloader(%{gh_owner}/zend-servicemanager) <  4
-Requires:       php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+Requires:       php-laminas-servicemanager
+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.7.1
 Requires:       php-ctype
 Requires:       php-pcre
 Requires:       php-spl
 
-Obsoletes:      php-ZendFramework2-%{library} < 2.5
-Provides:       php-ZendFramework2-%{library} = %{version}
-Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
+# remirepo:2
+Obsoletes:      php-ZendFramework2-%{library}             < 2.5
+Provides:       php-ZendFramework2-%{library}             = %{version}
+# Compatibily ensure by the bridge
+Obsoletes:      php-zendframework-%{zf_name}              < 2.10.1-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\Text is a component to work on text strings.
+%{namespace}\Text is a component to work on text strings.
 It contains the subcomponents:
 
-* Zend\Text\Figlet that enables developers to create a so called FIGlet text.
-  A FIGlet text is a string, which is represented as ASCII art. FIGlets use a
-  special font format, called FLT (FigLet Font). By default, one standard font
-  is shipped with Zend\Text\Figlet, but you can download additional fonts here
+* %{namespace}\Text\Figlet that enables developers to create a so called FIGlet
+  text. A FIGlet text is a string, which is represented as ASCII art. FIGlets
+  use a special font format, called FLT (FigLet Font). By default, one standard
+  font is shipped with %{namespace}\Text\Figlet, but you can download
+  additional fonts here
 
-* Zend\Text\Table to create text based tables on the fly with different
+* %{namespace}\Text\Table to create text based tables on the fly with different
   decorators. This can be helpful, if you either want to send structured data
   in text emails, which are used to have mono-spaced fonts, or to display table
-  information in a CLI application. Zend\Text\Table supports multi-line columns,
-  colspan and align as well.
+  information in a CLI application. %{namespace}\Text\Table supports multi-line
+  columns, colspan and align as well.
 
-Documentation: https://zendframework.github.io/%{gh_project}/
+Documentation: https://docs.laminas.dev/%{gh_project}/
 
 
 %prep
@@ -121,15 +128,29 @@ 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/Stdlib/autoload.php',
-    '%{php_home}/Zend/ServiceManager/autoload.php',
+    '%{php_home}/%{namespace}/Stdlib/autoload.php',
+    '%{php_home}/%{namespace}/ServiceManager/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
@@ -137,15 +158,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}\\MultiByte") ? 0 : 1);
+'
+
+: upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
@@ -158,14 +186,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
+* Fri Jan 10 2020 Remi Collet <remi@remirepo.net> - 2.7.1-1
+- switch to Laminas
+
 * Thu Oct 17 2019 Remi Collet <remi@remirepo.net> - 2.7.1-1
 - update to 2.7.1