summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-16 14:23:30 +0100
committerRemi Collet <remi@remirepo.net>2020-01-16 14:23:30 +0100
commit5a3347e39d6ca150b385b4b5305fcfaf00d7376b (patch)
treecf54c890f54c4ec074f166ac1770cc41c28b804f
parent896cc14da531f6a10bc13169ca81a562f1e4ab3a (diff)
switch to Laminas
-rw-r--r--composer.json88
-rw-r--r--php-laminas-test.spec370
2 files changed, 227 insertions, 231 deletions
diff --git a/composer.json b/composer.json
index fcf43cb..d01f2bf 100644
--- a/composer.json
+++ b/composer.json
@@ -1,70 +1,71 @@
{
- "name": "zendframework/zend-test",
- "description": "Tools to facilitate unit testing of zend-mvc applications",
+ "name": "laminas/laminas-test",
+ "description": "Tools to facilitate unit testing of laminas-mvc applications",
"license": "BSD-3-Clause",
"keywords": [
- "zendframework",
- "zf",
+ "laminas",
"test"
],
+ "homepage": "https://laminas.dev",
"support": {
- "docs": "https://docs.zendframework.com/zend-test/",
- "issues": "https://github.com/zendframework/zend-test/issues",
- "source": "https://github.com/zendframework/zend-test",
- "rss": "https://github.com/zendframework/zend-test/releases.atom",
- "slack": "https://zendframework-slack.herokuapp.com",
- "forum": "https://discourse.zendframework.com/c/questions/components"
+ "docs": "https://docs.laminas.dev/laminas-test/",
+ "issues": "https://github.com/laminas/laminas-test/issues",
+ "source": "https://github.com/laminas/laminas-test",
+ "rss": "https://github.com/laminas/laminas-test/releases.atom",
+ "chat": "https://laminas.dev/chat",
+ "forum": "https://discourse.laminas.dev"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.3.x-dev",
+ "dev-develop": "3.4.x-dev"
+ }
},
"require": {
"php": "^5.6 || ^7.0",
+ "laminas/laminas-console": "^2.6",
+ "laminas/laminas-dom": "^2.6",
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+ "laminas/laminas-http": "^2.8.3",
+ "laminas/laminas-mvc": "^3.0",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-uri": "^2.5",
+ "laminas/laminas-view": "^2.6.3",
+ "laminas/laminas-zendframework-bridge": "^1.0",
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
- "sebastian/version": "^1.0.4 || ^2.0",
- "zendframework/zend-console": "^2.6",
- "zendframework/zend-dom": "^2.6",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-http": "^2.8.3",
- "zendframework/zend-mvc": "^3.0",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-stdlib": "^2.7 || ^3.0",
- "zendframework/zend-uri": "^2.5",
- "zendframework/zend-view": "^2.6.3"
+ "sebastian/version": "^1.0.4 || ^2.0"
},
"require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-i18n": "^2.6",
+ "laminas/laminas-log": "^2.7.1",
+ "laminas/laminas-modulemanager": "^2.7.1",
+ "laminas/laminas-mvc-console": "^1.1.8",
+ "laminas/laminas-mvc-plugin-flashmessenger": "^0.1.0",
+ "laminas/laminas-serializer": "^2.6.1",
+ "laminas/laminas-session": "^2.8.5",
+ "laminas/laminas-validator": "^2.8",
"mikey179/vfsstream": "~1.2",
- "symfony/finder": "^2.2",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-i18n": "^2.6",
- "zendframework/zend-log": "^2.7.1",
- "zendframework/zend-modulemanager": "^2.7.1",
- "zendframework/zend-mvc-console": "^1.1.8",
- "zendframework/zend-mvc-plugin-flashmessenger": "^0.1.0",
- "zendframework/zend-serializer": "^2.6.1",
- "zendframework/zend-session": "^2.8.5",
- "zendframework/zend-validator": "^2.8"
+ "symfony/finder": "^2.2"
},
"suggest": {
- "zendframework/zend-mvc-console": "^1.1.8, to test MVC <-> console integration"
+ "laminas/laminas-mvc-console": "^1.1.8, to test MVC <-> console integration"
},
"autoload": {
"files": [
"autoload/phpunit-class-aliases.php"
],
"psr-4": {
- "Zend\\Test\\": "src/"
+ "Laminas\\Test\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
- "ZendTest\\Test\\": "test/"
- }
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "3.3.x-dev",
- "dev-develop": "3.4.x-dev"
+ "LaminasTest\\Test\\": "test/"
}
},
"scripts": {
@@ -76,5 +77,8 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zend-test": "self.version"
}
}
diff --git a/php-laminas-test.spec b/php-laminas-test.spec
index 550f0a6..f3710ca 100644
--- a/php-laminas-test.spec
+++ b/php-laminas-test.spec
@@ -1,4 +1,4 @@
-# remirepo/Fedora spec file for php-zendframework-zend-test
+# remirepo/Fedora spec file for php-laminas-test
#
# Copyright (c) 2015-2020 Remi Collet
# License: CC-BY-SA
@@ -7,11 +7,13 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 9cc4ab4c84a7da4c8035087253606b4f3ff1e72f
+%global gh_commit 42cdc13c2bf78199ed01f24f5cee735bcedaaad9
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner zendframework
-%global gh_project zend-test
+%global gh_owner laminas
+%global gh_project laminas-test
+%global zf_name zend-test
%global php_home %{_datadir}/php
+%global namespace Laminas
%global library Test
%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: 3.3.0
Release: 1%{?dist}
-Summary: Zend Framework %{library} component
+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,75 +35,67 @@ BuildArch: noarch
# Tests
%if %{with_tests}
BuildRequires: php(language) >= 5.6
-BuildRequires: php-composer(phpunit/phpunit) >= 4.0
+BuildRequires: php-pcre
+BuildRequires: phpunit
BuildRequires: phpunit6
-# remirepo:1
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-BuildRequires: phpunit8
-# remirepo:2
-%endif
-%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
BuildRequires: phpunit7
-# remirepo:1
-%endif
-BuildRequires: php-pcre
+BuildRequires: phpunit8
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/zend-console) >= 2.6 with php-autoloader(%{gh_owner}/zend-console) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-dom) >= 2.6 with php-autoloader(%{gh_owner}/zend-dom) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.8.3 with php-autoloader(%{gh_owner}/zend-http) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4)
-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-uri) >= 2.5 with php-autoloader(%{gh_owner}/zend-uri) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 with php-autoloader(%{gh_owner}/zend-view) < 3)
-# remirepo:11
-%else
-BuildRequires: php-autoloader(%{gh_owner}/zend-console) >= 2.6
-BuildRequires: php-autoloader(%{gh_owner}/zend-dom) >= 2.6
-BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2
-BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.8.3
-BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0
-BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
-BuildRequires: php-autoloader(%{gh_owner}/zend-uri) >= 2.5
-BuildRequires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3
-%endif
+BuildRequires: (php-composer(sebastian/version) >= 1.0.4 with php-composer(sebastian/version) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-dom) >= 2.6 with php-autoloader(%{gh_owner}/laminas-dom) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.8.3 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4)
+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-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.6.3 with php-autoloader(%{gh_owner}/laminas-view) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "require-dev": {
+# "laminas/laminas-coding-standard": "~1.0.0",
+# "laminas/laminas-i18n": "^2.6",
+# "laminas/laminas-log": "^2.7.1",
+# "laminas/laminas-modulemanager": "^2.7.1",
+# "laminas/laminas-mvc-console": "^1.1.8",
+# "laminas/laminas-mvc-plugin-flashmessenger": "^0.1.0",
+# "laminas/laminas-serializer": "^2.6.1",
+# "laminas/laminas-session": "^2.8.5",
+# "laminas/laminas-validator": "^2.8",
# "mikey179/vfsstream": "~1.2",
-# "symfony/finder": "^2.2",
-# "zendframework/zend-coding-standard": "~1.0.0",
-# "zendframework/zend-i18n": "^2.6",
-# "zendframework/zend-log": "^2.7.1",
-# "zendframework/zend-modulemanager": "^2.7.1",
-# "zendframework/zend-mvc-console": "^1.1.8",
-# "zendframework/zend-mvc-plugin-flashmessenger": "^0.1.0",
-# "zendframework/zend-serializer": "^2.6.1",
-# "zendframework/zend-session": "^2.8.5",
-# "zendframework/zend-validator": "^2.8"
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(mikey179/vfsstream) >= 1.2 with php-composer(mikey179/vfsstream) < 2)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-i18n) >= 2.6 with php-autoloader(%{gh_owner}/zend-i18n) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-log) >= 2.7.1 with php-autoloader(%{gh_owner}/zend-log) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1 with php-autoloader(%{gh_owner}/zend-modulemanager) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc-console) >= 1.1.8 with php-autoloader(%{gh_owner}/zend-mvc-console) < 2)
-BuildRequires: php-autoloader(%{gh_owner}/zend-mvc-plugin-flashmessenger) >= 0.1.0
-BuildRequires: (php-autoloader(%{gh_owner}/zend-serializer) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-serializer) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.8 with php-autoloader(%{gh_owner}/zend-validator) < 3)
+# "symfony/finder": "^2.2"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.6 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-log) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-log) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-console) >= 1.1.8 with php-autoloader(%{gh_owner}/laminas-mvc-console) < 2)
+BuildRequires: php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 0.1.0
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-serializer) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.5 with php-autoloader(%{gh_owner}/laminas-session) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.8 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
+BuildRequires: (php-composer(mikey179/vfsstream) >= 1.2 with php-composer(mikey179/vfsstream) < 2)
# remirepo:11
%else
-BuildRequires: php-composer(mikey179/vfsstream) >= 1.2
-BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) >= 2.6
-BuildRequires: php-autoloader(%{gh_owner}/zend-log) >= 2.7.1
-BuildRequires: php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1
-BuildRequires: php-autoloader(%{gh_owner}/zend-mvc-console) >= 1.1.8
-BuildRequires: php-autoloader(%{gh_owner}/zend-mvc-plugin-flashmessenger) >= 0.1.0
-BuildRequires: php-autoloader(%{gh_owner}/zend-serializer) >= 2.6.1
-BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5
-BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.8
+BuildRequires: php-phpunit-Version
+BuildRequires: php-laminas-console
+BuildRequires: php-laminas-dom
+BuildRequires: php-laminas-eventmanager
+BuildRequires: php-laminas-http
+BuildRequires: php-laminas-mvc
+BuildRequires: php-laminas-servicemanager
+BuildRequires: php-laminas-stdlib
+BuildRequires: php-laminas-uri
+BuildRequires: php-laminas-view
+BuildRequires: php-laminas-zendframework-bridge
+BuildRequires: php-mikey179-vfsstream
+BuildRequires: php-laminas-i18n
+BuildRequires: php-laminas-log
+BuildRequires: php-laminas-modulemanager
+BuildRequires: php-laminas-mvc-console
+BuildRequires: php-laminas-mvc-plugin-flashmessenger
+BuildRequires: php-laminas-serializer
+BuildRequires: php-laminas-session
+BuildRequires: php-laminas-validator
%endif
BuildRequires: php-symfony-finder
%endif
@@ -110,92 +104,77 @@ BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "^5.6 || ^7.0",
+# "laminas/laminas-console": "^2.6",
+# "laminas/laminas-dom": "^2.6",
+# "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+# "laminas/laminas-http": "^2.8.3",
+# "laminas/laminas-mvc": "^3.0",
+# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+# "laminas/laminas-stdlib": "^2.7 || ^3.0",
+# "laminas/laminas-uri": "^2.5",
+# "laminas/laminas-view": "^2.6.3",
+# "laminas/laminas-zendframework-bridge": "^1.0",
# "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
-# "sebastian/version": "^1.0.4 || ^2.0",
-# "zendframework/zend-console": "^2.6",
-# "zendframework/zend-dom": "^2.6",
-# "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-# "zendframework/zend-http": "^2.8.3",
-# "zendframework/zend-mvc": "^2.7.1",
-# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-# "zendframework/zend-stdlib": "^2.7 || ^3.0",
-# "zendframework/zend-uri": "^2.5",
-# "zendframework/zend-view": "^2.6.3"
+# "sebastian/version": "^1.0.4 || ^2.0"
Requires: php(language) >= 5.6
# remirepo:1
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Recommends: phpunit8
-# remirepo:2
-%endif
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
Recommends: phpunit7
-# remirepo:2
-%endif
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
Recommends: phpunit6
-Recommends: php-composer(phpunit/phpunit) >= 4.0
-# remirepo:3
+Recommends: phpunit
+Requires: (php-composer(sebastian/version) >= 1.0.4 with php-composer(sebastian/version) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-dom) >= 2.6 with php-autoloader(%{gh_owner}/laminas-dom) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.8.3 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4)
+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-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.6.3 with php-autoloader(%{gh_owner}/laminas-view) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# From composer.json, "suggest": {
+# "laminas/laminas-mvc-console": "^1.1.8, to test MVC <-> console integration"
+Suggests: php-autoloader(%{gh_owner}/laminas-mvc-console)
+# remirepo:23
%else
-Requires: php-composer(phpunit/phpunit) >= 4.0
-%endif
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(sebastian/version) >= 1.0.4 with php-composer(sebastian/version) < 3)
-%if ! %{bootstrap}
-Requires: (php-autoloader(%{gh_owner}/zend-console) >= 2.6 with php-autoloader(%{gh_owner}/zend-console) < 3)
-Requires: (php-autoloader(%{gh_owner}/zend-dom) >= 2.6 with php-autoloader(%{gh_owner}/zend-dom) < 3)
-Requires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4)
-Requires: (php-autoloader(%{gh_owner}/zend-http) >= 2.8.3 with php-autoloader(%{gh_owner}/zend-http) < 3)
-Requires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4)
-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)
-Requires: (php-autoloader(%{gh_owner}/zend-uri) >= 2.5 with php-autoloader(%{gh_owner}/zend-uri) < 3)
-Requires: (php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 with php-autoloader(%{gh_owner}/zend-view) < 3)
-%endif
-# remirepo:24
-%else
-Requires: php-composer(sebastian/version) >= 1.0.4
-Requires: php-composer(sebastian/version) < 3
-%if ! %{bootstrap}
-Requires: php-autoloader(%{gh_owner}/zend-console) >= 2.6
-Requires: php-autoloader(%{gh_owner}/zend-console) < 3
-Requires: php-autoloader(%{gh_owner}/zend-dom) >= 2.6
-Requires: php-autoloader(%{gh_owner}/zend-dom) < 3
-Requires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2
-Requires: php-autoloader(%{gh_owner}/zend-eventmanager) < 4
-Requires: php-autoloader(%{gh_owner}/zend-http) >= 2.8.3
-Requires: php-autoloader(%{gh_owner}/zend-http) < 3
-Requires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0
-Requires: php-autoloader(%{gh_owner}/zend-mvc) < 4
-Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4
-Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
-Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
-Requires: php-autoloader(%{gh_owner}/zend-uri) >= 2.5
-Requires: php-autoloader(%{gh_owner}/zend-uri) < 3
-Requires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3
-Requires: php-autoloader(%{gh_owner}/zend-view) < 3
-%endif
+Requires: php-phpunit-Version
+Requires: php-laminas-console
+Requires: php-laminas-dom
+Requires: php-laminas-eventmanager
+Requires: php-laminas-http
+Requires: php-laminas-mvc
+Requires: php-laminas-servicemanager
+Requires: php-laminas-stdlib
+Requires: php-laminas-uri
+Requires: php-laminas-view
+Requires: php-laminas-zendframework-bridge
%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
-# From phpcompatinfo report for version 2.5.1
+# From phpcompatinfo report for version 3.3.0
Requires: php-pcre
-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} < 3.3.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
-The Zend\Test component provides tools to facilitate unit testing of your
-Zend Framework applications. At this time, we offer facilities to enable
-testing of your Zend Framework MVC applications.
+The %{namespace}\Test component provides tools to facilitate unit testing of your
+%{namespace} Framework applications. At this time, we offer facilities to enable
+testing of your %{namespace} Framework MVC applications.
PHPUnit is the only library supported currently.
-Documentation: https://zendframework.github.io/%{gh_project}/
+Documentation: https://docs.laminas.dev/%{gh_project}/
%prep
@@ -203,39 +182,48 @@ Documentation: https://zendframework.github.io/%{gh_project}/
mv LICENSE.md LICENSE
+mv autoload/phpunit-class-aliases.php src/
-%build
-: Create dependency autoloader - deprecated
-mv autoload/*.php src
-
-cat << 'EOF' | tee autoload.php
-<?php
-require_once __DIR__ . '/%{library}/phpunit-class-aliases.php';
-EOF
+%build
: Generate autoloader
phpab --template fedora --output src/autoload.php src
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
__DIR__ . '/phpunit-class-aliases.php',
- '%{php_home}/Zend/Console/autoload.php',
- '%{php_home}/Zend/Dom/autoload.php',
- '%{php_home}/Zend/EventManager/autoload.php',
- '%{php_home}/Zend/Http/autoload.php',
- '%{php_home}/Zend/Mvc/autoload.php',
- '%{php_home}/Zend/ServiceManager/autoload.php',
- '%{php_home}/Zend/Stdlib/autoload.php',
- '%{php_home}/Zend/Uri/autoload.php',
- '%{php_home}/Zend/View/autoload.php',
+ '%{php_home}/%{namespace}/Console/autoload.php',
+ '%{php_home}/%{namespace}/Dom/autoload.php',
+ '%{php_home}/%{namespace}/EventManager/autoload.php',
+ '%{php_home}/%{namespace}/Http/autoload.php',
+ '%{php_home}/%{namespace}/Mvc/autoload.php',
+ '%{php_home}/%{namespace}/ServiceManager/autoload.php',
+ '%{php_home}/%{namespace}/Stdlib/autoload.php',
+ '%{php_home}/%{namespace}/Uri/autoload.php',
+ '%{php_home}/%{namespace}/View/autoload.php',
+]);
+\Fedora\Autoloader\Dependencies::optional([
+ '%{php_home}/%{namespace}/Mvc/Console/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}
-install -m644 autoload.php %{buildroot}%{php_home}/Zend/%{library}-autoload.php
+: Zend equiv
+mkdir -p %{buildroot}%{php_home}/Zend/%{library}
+cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php
%check
@@ -243,50 +231,50 @@ install -m644 autoload.php %{buildroot}%{php_home}/Zend/%{library}-autoload.php
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}/org/bovigo/vfs/autoload.php',
'%{php_home}/Symfony/Component/Finder/autoload.php',
- '%{php_home}/Zend/I18n/autoload.php',
- '%{php_home}/Zend/Log/autoload.php',
- '%{php_home}/Zend/ModuleManager/autoload.php',
- '%{php_home}/Zend/Serializer/autoload.php',
- '%{php_home}/Zend/Mvc/Console/autoload.php',
- '%{php_home}/Zend/Mvc/Plugin/FlashMessenger/autoload.php',
- '%{php_home}/Zend/Serializer/autoload.php',
- '%{php_home}/Zend/Session/autoload.php',
- '%{php_home}/Zend/Validator/autoload.php',
+ '%{php_home}/%{namespace}/I18n/autoload.php',
+ '%{php_home}/%{namespace}/Log/autoload.php',
+ '%{php_home}/%{namespace}/ModuleManager/autoload.php',
+ '%{php_home}/%{namespace}/Serializer/autoload.php',
+ '%{php_home}/%{namespace}/Mvc/Plugin/FlashMessenger/autoload.php',
+ '%{php_home}/%{namespace}/Serializer/autoload.php',
+ '%{php_home}/%{namespace}/Session/autoload.php',
+ '%{php_home}/%{namespace}/Validator/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}\\Util\ModuleLoader") ? 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}/phpunit --verbose || ret=1
fi
done
-if [ -f %{_bindir}/phpunit6 ]; then
- for cmd in php php71 php72 php73 php74; do
- if which $cmd; then
- $cmd %{_bindir}/phpunit6 --verbose || ret=1
- fi
- done
-fi
-if [ -f %{_bindir}/phpunit7 ]; then
- for cmd in php php71 php72 php73 php74; do
- if which $cmd; then
- $cmd %{_bindir}/phpunit7 --verbose || ret=1
- fi
- done
-fi
-if [ -f %{_bindir}/phpunit8 ]; then
- for cmd in php php72 php73 php74; do
- if which $cmd; then
- $cmd %{_bindir}/phpunit8 --verbose || ret=1
- fi
- done
-fi
+for cmd in php php72 php73 php74; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit6 --verbose || ret=1
+ fi
+done
+for cmd in php php72 php73 php74; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit7 --verbose || ret=1
+ fi
+done
+for cmd in php php72 php73 php74; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit8 --verbose || ret=1
+ fi
+done
exit $ret
%else
: Test suite disabled
@@ -294,15 +282,19 @@ exit $ret
%files
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.md
%doc composer.json
%{php_home}/Zend/%{library}
-%{php_home}/Zend/%{library}-autoload.php
+%{php_home}/%{namespace}/%{library}
%changelog
+* Thu Jan 16 2020 Remi Collet <remi@remirepo.net> - 3.3.0-1
+- switch to Laminas
+
* Wed Jun 12 2019 Remi Collet <remi@remirepo.net> - 3.3.0-1
- update to 3.3.0
- allow phpunit8