switch to Laminas

2 files changed, 120 insertions, 86 deletions

diff --git a/composer.json b/composer.json
index 2db3c29..f7c965b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,69 +1,70 @@
 {
-    "name": "zendframework/zenddiagnostics",
+    "name": "laminas/laminas-diagnostics",
     "description": "A set of components for performing diagnostic tests in PHP applications",
-    "homepage": "https://github.com/zendframework/zend-diagnostics",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf",
-        "zendframework",
+        "laminas",
         "php",
         "diagnostics",
         "test"
     ],
+    "homepage": "https://laminas.dev",
     "support": {
-        "issues": "https://github.com/zendframework/zend-diagnostics/issues",
-        "source": "https://github.com/zendframework/zend-diagnostics",
-        "rss": "https://github.com/zendframework/zend-diagnostics/releases.atom",
-        "chat": "https://zendframework-slack.herokuapp.com",
-        "forum": "https://discourse.zendframework.com/c/questions/components"
+        "docs": "https://docs.laminas.dev/laminas-diagnostics/",
+        "issues": "https://github.com/laminas/laminas-diagnostics/issues",
+        "source": "https://github.com/laminas/laminas-diagnostics",
+        "rss": "https://github.com/laminas/laminas-diagnostics/releases.atom",
+        "chat": "https://laminas.dev/chat",
+        "forum": "https://discourse.laminas.dev"
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.6.x-dev",
+            "dev-develop": "1.7.x-dev"
+        }
     },
     "require": {
-        "php": "^5.6 || ^7.0"
+        "php": "^5.6 || ^7.0",
+        "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
         "doctrine/migrations": "^1.0 || ^2.0",
         "guzzlehttp/guzzle": "^5.3.3 || ^6.3.3",
+        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-loader": "^2.0",
         "mikey179/vfsstream": "^1.6",
         "php-amqplib/php-amqplib": "^2.0",
         "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
         "predis/predis": "^1.0",
         "sensiolabs/security-checker": "^5.0 || ^6.0.3",
-        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-        "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-loader": "^2.0"
+        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0"
+    },
+    "conflict": {
+        "guzzlehttp/ringphp": "<1.1.1"
     },
     "suggest": {
         "ext-bcmath": "Required by Check\\CpuPerformance",
-        "sensiolabs/security-checker": "Required by Check\\SecurityAdvisory",
-        "symfony/yaml": "Required by Check\\YamlFile",
+        "doctrine/migrations": "Required by Check\\DoctrineMigration",
         "guzzlehttp/guzzle": "Required by Check\\GuzzleHttpService",
         "predis/predis": "Required by Check\\Redis",
-        "videlalvaro/php-amqplib": "Required by Check\\RabbitMQ",
-        "doctrine/migrations": "Required by Check\\DoctrineMigration"
+        "sensiolabs/security-checker": "Required by Check\\SecurityAdvisory",
+        "symfony/yaml": "Required by Check\\YamlFile",
+        "videlalvaro/php-amqplib": "Required by Check\\RabbitMQ"
     },
     "autoload": {
         "files": [
             "src/autoload.php"
         ],
         "psr-4": {
-            "ZendDiagnostics\\": "src/"
+            "Laminas\\Diagnostics\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "ZendDiagnosticsTest\\": "test/"
-        }
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "conflict": {
-        "guzzlehttp/ringphp": "<1.1.1"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.6.x-dev",
-            "dev-develop": "1.7.x-dev"
+            "LaminasTest\\Diagnostics\\": "test/"
         }
     },
     "scripts": {
@@ -75,5 +76,8 @@
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+    },
+    "replace": {
+        "zendframework/zenddiagnostics": "self.version"
     }
 }
diff --git a/php-laminas-diagnostics.spec b/php-laminas-diagnostics.spec
index 9661277..410c308 100644
--- a/php-laminas-diagnostics.spec
+++ b/php-laminas-diagnostics.spec
@@ -1,30 +1,28 @@
-# remirepo/Fedora spec file for php-zendframework-zenddiagnostics
+# remirepo/Fedora spec file for php-laminas-diagnostics
 #
-# Copyright (c) 2020 Remi Collet
+# Copyright (c) 2019-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    9ad04e7a911c3895071cfb7ec22c5f354a0099fe
+%global gh_commit    9434b93ca7fc66999e0a2f01400e7f20214169c4
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner     zendframework
-%global gh_project   zend-diagnostics
-# Packagist
-%global pk_vendor    %{gh_owner}
-%global pk_project   zenddiagnostics
-# Namespace
-%global library      ZendDiagnostics
+%global gh_owner     laminas
+%global gh_project   laminas-diagnostics
+%global zf_name      zenddiagnostics
+%global namespace    Laminas
+%global library      Diagnostics
 %global php_home     %{_datadir}/php
 %global with_tests   0%{!?_without_tests:1}
 
-Name:           php-%{pk_vendor}-%{pk_project}
+Name:           php-%{gh_project}
 Version:        1.6.0
 Release:        1%{?dist}
 Summary:        A set of components for performing diagnostic tests
 
 License:        BSD
-URL:            https://framework.zend.com/
+URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
@@ -41,50 +39,51 @@ BuildRequires:  php-xmlreader
 # From composer, "require-dev": {
 #        "doctrine/migrations": "^1.0 || ^2.0",
 #        "guzzlehttp/guzzle": "^5.3.3 || ^6.3.3",
-#        "mikey179/vfsStream": "^1.6",
+#        "laminas/laminas-coding-standard": "~1.0.0",
+#        "laminas/laminas-loader": "^2.0",
+#        "mikey179/vfsstream": "^1.6",
 #        "php-amqplib/php-amqplib": "^2.0",
 #        "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
 #        "predis/predis": "^1.0",
 #        "sensiolabs/security-checker": "^5.0 || ^6.0.3",
-#        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-#        "zendframework/zend-coding-standard": "~1.0.0",
-#        "zendframework/zend-loader": "^2.0"
+#        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(doctrine/migrations)         >= 1.0   with php-composer(doctrine/migrations)         < 3)
-BuildRequires: (php-composer(guzzlehttp/guzzle)           >= 5.3.3 with php-composer(guzzlehttp/guzzle)           < 7)
-BuildRequires: (php-composer(mikey179/vfsStream)          >= 1.6   with php-composer(mikey179/vfsStream)          < 2)
-BuildRequires: (php-composer(php-amqplib/php-amqplib)     >= 2.0   with php-composer(php-amqplib/php-amqplib)     < 3)
-BuildRequires: (php-composer(predis/predis)               >= 1.0   with php-composer(predis/predis)               < 2)
-BuildRequires: (php-composer(sensiolabs/security-checker) >= 5.0   with php-composer(sensiolabs/security-checker) < 7)
-BuildRequires: (php-composer(symfony/yaml)                >= 2.7   with php-composer(symfony/yaml)                < 6)
-%global phpunit %{_bindir}/phpunit7
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0   with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+BuildRequires: (php-composer(doctrine/migrations)                        >= 1.0   with php-composer(doctrine/migrations)                        < 3)
+BuildRequires: (php-composer(guzzlehttp/guzzle)                          >= 5.3.3 with php-composer(guzzlehttp/guzzle)                          < 7)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader)               >= 2.0   with php-autoloader(%{gh_owner}/laminas-loader)               < 3)
+BuildRequires: (php-composer(mikey179/vfsStream)                         >= 1.6   with php-composer(mikey179/vfsStream)                         < 2)
+BuildRequires: (php-composer(php-amqplib/php-amqplib)                    >= 2.0   with php-composer(php-amqplib/php-amqplib)                    < 3)
+BuildRequires: (php-composer(predis/predis)                              >= 1.0   with php-composer(predis/predis)                              < 2)
+BuildRequires: (php-composer(sensiolabs/security-checker)                >= 5.0   with php-composer(sensiolabs/security-checker)                < 7)
+BuildRequires: (php-composer(symfony/yaml)                               >= 2.7   with php-composer(symfony/yaml)                               < 6)
 # remirepo:16
 %else
-BuildRequires:  php-composer(doctrine/migrations)         <  3
-BuildRequires:  php-composer(doctrine/migrations)         >= 1.0
-BuildRequires:  php-composer(guzzlehttp/guzzle)           <  7
-BuildRequires:  php-composer(guzzlehttp/guzzle)           >= 5.3.3
-BuildRequires:  php-composer(mikey179/vfsStream)          <  2
-BuildRequires:  php-composer(mikey179/vfsStream)          >= 1.6
-BuildRequires:  php-composer(php-amqplib/php-amqplib)     <  3
-BuildRequires:  php-composer(php-amqplib/php-amqplib)     >= 2.0
-BuildRequires:  php-composer(predis/predis)               <  2
-BuildRequires:  php-composer(predis/predis)               >= 1.0
-BuildRequires:  php-composer(sensiolabs/security-checker) <  7
-BuildRequires:  php-composer(sensiolabs/security-checker) >= 5.0
+BuildRequires:  php-laminas-zendframework-bridge
+BuildRequires:  php-doctrine-migrations
+BuildRequires:  php-guzzlehttp-guzzle6
+BuildRequires:  php-laminas-loader
+BuildRequires:  php-mikey179-vfsStream
+BuildRequires:  php-amqplib
+BuildRequires:  php-nrk-Predis
+BuildRequires:  php-sensiolabs-security-checker
 BuildRequires:  php-symfony3-yaml
-%global phpunit %{_bindir}/phpunit
 %endif
-BuildRequires:  %{phpunit}
+%global phpunit %{_bindir}/phpunit7
+BuildRequires:  phpunit7 >= 7.1.2
 BuildRequires:  /bin/ps
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.6 || ^7.0"
+#        "php": "^5.6 || ^7.0",
+#        "laminas/laminas-zendframework-bridge": "^1.0"
 Requires:       php(language) >= 5.6
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 #    "suggest": {
 #        "ext-bcmath": "Required by Check\\CpuPerformance",
 #        "sensiolabs/security-checker": "Required by Check\\SecurityAdvisory",
@@ -93,8 +92,6 @@ Requires:       php(language) >= 5.6
 #        "predis/predis": "Required by Check\\Redis",
 #        "videlalvaro/php-amqplib": "Required by Check\\RabbitMQ",
 #        "doctrine/migrations": "Required by Check\\DoctrineMigration"
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Recommends:     php-bcmath
 Recommends:    (php-composer(sensiolabs/security-checker) >= 5.0   with php-composer(sensiolabs/security-checker) < 7)
 Recommends:    (php-composer(symfony/yaml)                >= 2.7   with php-composer(symfony/yaml)                < 6)
@@ -102,11 +99,13 @@ Recommends:    (php-composer(guzzlehttp/guzzle)           >= 5.3.3 with php-comp
 Recommends:    (php-composer(predis/predis)               >= 1.0   with php-composer(predis/predis)               < 2)
 Recommends:    (php-composer(php-amqplib/php-amqplib)     >= 2.0   with php-composer(php-amqplib/php-amqplib)     < 3)
 Recommends:    (php-composer(doctrine/migrations)         >= 1.0   with php-composer(doctrine/migrations)         < 3)
-# remirepo:1
+# remirepo:3
+%else
+Requires:       php-laminas-zendframework-bridge
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
-# From phpcompatinfo report for version 1.3.1
+# From phpcompatinfo report for version 1.6.0
 Requires:       php-pdo
 Requires:       php-simplexml
 Requires:       php-json
@@ -114,13 +113,20 @@ Requires:       php-pcre
 Requires:       php-spl
 Requires:       php-xmlreader
 
-Provides:       php-composer(%{gh_owner}/%{pk_project}) = %{version}
-Provides:       php-autoloader(%{gh_owner}/%{pk_project}) = %{version}
+# Compatibily ensure by the bridge
+Obsoletes:      php-zendframework-%{zf_name}              < 1.6.0-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
 Perform diagnostic tests within real-world PHP applications.
 
+Documentation: https://docs.laminas.dev/%{gh_project}/
+
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
@@ -130,6 +136,7 @@ mv LICENSE.md LICENSE
 %build
 : Create autoloader
 mv src/autoload.php src/_autoload.php
+
 phpab --template fedora --output src/autoload.php src
 cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::required([
@@ -143,10 +150,7 @@ cat << 'EOF' | tee -a src/autoload.php
         '%{php_home}/Symfony3/Component/Yaml/autoload.php',
         '%{php_home}/Symfony/Component/Yaml/autoload.php',
     ],
-    [
-        '%{php_home}/GuzzleHttp6/autoload.php',
-        '%{php_home}/Guzzle/autoload.php',
-    ],
+    '%{php_home}/GuzzleHttp6/autoload.php',
     '%{php_home}/PhpAmqpLib/autoload.php',
     [
         '%{php_home}/Doctrine/Migrations/autoload.php',
@@ -159,11 +163,25 @@ if  (file_exists('/usr/share/pear/Predis/Autoloader.php')) {
 }
 EOF
 
+# Notice ZendDiagnostics instead of Zend/Diagnostics
+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(__DIR__) . '/%{namespace}/%{library}/autoload.php',
+]);
+EOF
+
 
 %install
-mkdir -p   %{buildroot}%{php_home}
-cp -pr src %{buildroot}%{php_home}/%{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
@@ -171,19 +189,27 @@ cp -pr src %{buildroot}%{php_home}/%{library}
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
-require_once '%{buildroot}%{php_home}/%{library}/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr4('ZendDiagnosticsTest\\', dirname(__DIR__).'/test');
+require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
 \Fedora\Autoloader\Dependencies::required([
     '%{php_home}/org/bovigo/vfs/autoload.php',
+    '%{php_home}/%{namespace}/Loader/autoload.php',
 ]);
 EOF
 
+: check compat autoloader
+php -r '
+require "%{buildroot}%{php_home}/Zend%{library}/autoload.php";
+return (class_exists("\\Zend%{library}\\Check\\IniFile") ? 0 : 1);
+'
+
 # testJitFreeSpace have erratic results as rely on free space in builder  /tmp
 # testCheck have erratic results from reviewer
 # test in GuzzleHttpServiceTest.php sometime fail in local build, ok in mock
 
+: upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit7} \
@@ -203,10 +229,14 @@ exit $ret
 %license LICENSE
 %doc *.md
 %doc composer.json
-%{php_home}/%{library}
+%{php_home}/Zend%{library}
+%{php_home}/%{namespace}/%{library}
 
 
 %changelog
+* Thu Jan 16 2020 Remi Collet <remi@remirepo.net> - 1.6.0-1
+- switch to Laminas
+
 * Mon Nov 25 2019 Remi Collet <remi@remirepo.net> - 1.6.0-1
 - update to 1.6.0
 - allow sensiolabs/security-checker 6