From a7cbd3f4315557cc462e06c7fcfe7d448a15e977 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jan 2020 16:22:27 +0100 Subject: switch to Laminas --- composer.json | 122 ++++++++-------- php-laminas-view.spec | 388 ++++++++++++++++++++++++++------------------------ 2 files changed, 265 insertions(+), 245 deletions(-) diff --git a/composer.json b/composer.json index 58091f1..c49a4cc 100644 --- a/composer.json +++ b/composer.json @@ -1,69 +1,79 @@ { - "name": "zendframework/zend-view", + "name": "laminas/laminas-view", "description": "Flexible view layer supporting and providing multiple view layers, helpers, and more", "license": "BSD-3-Clause", "keywords": [ - "zendframework", - "zf", + "laminas", "view" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-view/", - "issues": "https://github.com/zendframework/zend-view/issues", - "source": "https://github.com/zendframework/zend-view", - "rss": "https://github.com/zendframework/zend-view/releases.atom", - "chat": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-view/", + "issues": "https://github.com/laminas/laminas-view/issues", + "source": "https://github.com/laminas/laminas-view", + "rss": "https://github.com/laminas/laminas-view/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.11.x-dev", + "dev-develop": "2.12.x-dev" + } }, "require": { "php": "^5.6 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-json": "^2.6.1 || ^3.0", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "laminas/laminas-eventmanager": "^2.6.2 || ^3.0", + "laminas/laminas-json": "^2.6.1 || ^3.0", + "laminas/laminas-loader": "^2.5", + "laminas/laminas-stdlib": "^2.7 || ^3.0", + "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^5.7.15 || ^6.0.8", - "zendframework/zend-authentication": "^2.5", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-config": "^2.6", - "zendframework/zend-console": "^2.6", - "zendframework/zend-escaper": "^2.5", - "zendframework/zend-feed": "^2.7", - "zendframework/zend-filter": "^2.6.1", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-log": "^2.7", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-mvc": "^2.7.14 || ^3.0", - "zendframework/zend-navigation": "^2.5", - "zendframework/zend-paginator": "^2.5", - "zendframework/zend-permissions-acl": "^2.6", - "zendframework/zend-router": "^3.0.1", - "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.8.1", - "zendframework/zend-uri": "^2.5" + "laminas/laminas-authentication": "^2.5", + "laminas/laminas-cache": "^2.6.1", + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-config": "^2.6", + "laminas/laminas-console": "^2.6", + "laminas/laminas-escaper": "^2.5", + "laminas/laminas-feed": "^2.7", + "laminas/laminas-filter": "^2.6.1", + "laminas/laminas-http": "^2.5.4", + "laminas/laminas-i18n": "^2.6", + "laminas/laminas-log": "^2.7", + "laminas/laminas-modulemanager": "^2.7.1", + "laminas/laminas-mvc": "^2.7.14 || ^3.0", + "laminas/laminas-navigation": "^2.5", + "laminas/laminas-paginator": "^2.5", + "laminas/laminas-permissions-acl": "^2.6", + "laminas/laminas-router": "^3.0.1", + "laminas/laminas-serializer": "^2.6.1", + "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", + "laminas/laminas-session": "^2.8.1", + "laminas/laminas-uri": "^2.5", + "phpunit/phpunit": "^5.7.15 || ^6.0.8" }, "suggest": { - "zendframework/zend-authentication": "Zend\\Authentication component", - "zendframework/zend-escaper": "Zend\\Escaper component", - "zendframework/zend-feed": "Zend\\Feed component", - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-http": "Zend\\Http component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-mvc": "Zend\\Mvc component", - "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up", - "zendframework/zend-navigation": "Zend\\Navigation component", - "zendframework/zend-paginator": "Zend\\Paginator component", - "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component", - "zendframework/zend-uri": "Zend\\Uri component" + "laminas/laminas-authentication": "Laminas\\Authentication component", + "laminas/laminas-escaper": "Laminas\\Escaper component", + "laminas/laminas-feed": "Laminas\\Feed component", + "laminas/laminas-filter": "Laminas\\Filter component", + "laminas/laminas-http": "Laminas\\Http component", + "laminas/laminas-i18n": "Laminas\\I18n component", + "laminas/laminas-mvc": "Laminas\\Mvc component", + "laminas/laminas-mvc-plugin-flashmessenger": "laminas-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with laminas-mvc versions 3 and up", + "laminas/laminas-navigation": "Laminas\\Navigation component", + "laminas/laminas-paginator": "Laminas\\Paginator component", + "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component", + "laminas/laminas-servicemanager": "Laminas\\ServiceManager component", + "laminas/laminas-uri": "Laminas\\Uri component" }, "autoload": { "psr-4": { - "Zend\\View\\": "src/" + "Laminas\\View\\": "src/" } }, "autoload-dev": { @@ -71,16 +81,7 @@ "test/autoload.php" ], "psr-4": { - "ZendTest\\View\\": "test/" - } - }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "2.11.x-dev", - "dev-develop": "2.12.x-dev" + "LaminasTest\\View\\": "test/" } }, "bin": [ @@ -95,5 +96,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-view": "self.version" } } diff --git a/php-laminas-view.spec b/php-laminas-view.spec index 0be7927..c4480c8 100644 --- a/php-laminas-view.spec +++ b/php-laminas-view.spec @@ -1,4 +1,4 @@ -# remirepo/Fedora spec file for php-zendframework-zend-view +# remirepo/Fedora spec file for php-laminas-view # # Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA @@ -6,26 +6,24 @@ # # Please, preserve the changelog entries # -%global bootstrap 0 -%global gh_commit a8b1b2d9b52e191539be861a6529f8c8a0c06b9d +%global bootstrap 1 +%global gh_commit 3bbb2e94287383604c898284a18d2d06cf17301e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-view +%global gh_owner laminas +%global gh_project laminas-view +%global zf_name zend-view %global php_home %{_datadir}/php +%global namespace Laminas %global library View -%if %{bootstrap} -%global with_tests 0%{?_with_tests:1} -%else %global with_tests 0%{!?_without_tests:1} -%endif -Name: php-%{gh_owner}-%{gh_project} +Name: php-%{gh_project} Version: 2.11.4 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,6 +31,7 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 +BuildRequires: php-reflection BuildRequires: php-date BuildRequires: php-dom BuildRequires: php-filter @@ -40,175 +39,168 @@ BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-loader) >= 2.5 with php-autoloader(%{gh_owner}/zend-loader) < 3) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -# remirepo:6 -%else -BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 -BuildRequires: php-autoloader(%{gh_owner}/zend-loader) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 -%endif +BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-json) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 2.7 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": "^5.7.15 || ^6.0.8", -# "zendframework/zend-authentication": "^2.5", -# "zendframework/zend-cache": "^2.6.1", -# "zendframework/zend-coding-standard": "~1.0.0", -# "zendframework/zend-config": "^2.6", -# "zendframework/zend-console": "^2.6", -# "zendframework/zend-escaper": "^2.5", -# "zendframework/zend-feed": "^2.7", -# "zendframework/zend-filter": "^2.6.1", -# "zendframework/zend-http": "^2.5.4", -# "zendframework/zend-i18n": "^2.6", -# "zendframework/zend-log": "^2.7", -# "zendframework/zend-modulemanager": "^2.7.1", -# "zendframework/zend-mvc": "^2.7.14 || ^3.0", -# "zendframework/zend-navigation": "^2.5", -# "zendframework/zend-paginator": "^2.5", -# "zendframework/zend-permissions-acl": "^2.6", -# "zendframework/zend-router": "^3.0.1", -# "zendframework/zend-serializer": "^2.6.1", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", -# "zendframework/zend-session": "^2.8.1", -# "zendframework/zend-uri": "^2.5" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(%{gh_owner}/zend-authentication) >= 2.5 with php-composer(%{gh_owner}/zend-authentication) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-cache) >= 2.6.1 with php-composer(%{gh_owner}/zend-cache) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-config) >= 2.6 with php-composer(%{gh_owner}/zend-config) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-console) >= 2.6 with php-composer(%{gh_owner}/zend-console) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-escaper) >= 2.5 with php-composer(%{gh_owner}/zend-escaper) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-feed) >= 2.7 with php-composer(%{gh_owner}/zend-feed) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-filter) >= 2.6.1 with php-composer(%{gh_owner}/zend-filter) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-http) >= 2.5.4 with php-composer(%{gh_owner}/zend-http) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-i18n) >= 2.6 with php-composer(%{gh_owner}/zend-i18n) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-log) >= 2.7 with php-composer(%{gh_owner}/zend-log) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-modulemanager) >= 2.7.1 with php-composer(%{gh_owner}/zend-modulemanager) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-mvc) >= 2.7.14 with php-composer(%{gh_owner}/zend-mvc) < 4) -BuildRequires: (php-composer(%{gh_owner}/zend-navigation) >= 2.5 with php-composer(%{gh_owner}/zend-navigation) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-paginator) >= 2.5 with php-composer(%{gh_owner}/zend-paginator) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-permissions-acl) >= 2.6 with php-composer(%{gh_owner}/zend-permissions-acl) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-router) >= 3.0.1 with php-composer(%{gh_owner}/zend-router) < 4) -BuildRequires: (php-composer(%{gh_owner}/zend-serializer) >= 2.6.1 with php-composer(%{gh_owner}/zend-serializer) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-composer(%{gh_owner}/zend-servicemanager) < 4) -BuildRequires: (php-composer(%{gh_owner}/zend-session) >= 2.8.1 with php-composer(%{gh_owner}/zend-session) < 3) -BuildRequires: (php-composer(%{gh_owner}/zend-uri) >= 2.5 with php-composer(%{gh_owner}/zend-uri) < 3) -# remirepo:22 +# "laminas/laminas-authentication": "^2.5", +# "laminas/laminas-cache": "^2.6.1", +# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-config": "^2.6", +# "laminas/laminas-console": "^2.6", +# "laminas/laminas-escaper": "^2.5", +# "laminas/laminas-feed": "^2.7", +# "laminas/laminas-filter": "^2.6.1", +# "laminas/laminas-http": "^2.5.4", +# "laminas/laminas-i18n": "^2.6", +# "laminas/laminas-log": "^2.7", +# "laminas/laminas-modulemanager": "^2.7.1", +# "laminas/laminas-mvc": "^2.7.14 || ^3.0", +# "laminas/laminas-navigation": "^2.5", +# "laminas/laminas-paginator": "^2.5", +# "laminas/laminas-permissions-acl": "^2.6", +# "laminas/laminas-router": "^3.0.1", +# "laminas/laminas-serializer": "^2.6.1", +# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", +# "laminas/laminas-session": "^2.8.1", +# "laminas/laminas-uri": "^2.5", +# "phpunit/phpunit": "^5.7.15 || ^6.0.8" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-authentication) >= 2.5 with php-autoloader(%{gh_owner}/laminas-authentication) < 3) +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 with php-autoloader(%{gh_owner}/laminas-config) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-feed) >= 2.7 with php-autoloader(%{gh_owner}/laminas-feed) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.5.4 with php-autoloader(%{gh_owner}/laminas-http) < 3) +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 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) +%if ! %{bootstrap} +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-navigation) >= 2.5 with php-autoloader(%{gh_owner}/laminas-navigation) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-paginator) >= 2.5 with php-autoloader(%{gh_owner}/laminas-paginator) < 3) +%endif +BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.6 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0.1 with php-autoloader(%{gh_owner}/laminas-router) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-serializer) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.1 with php-autoloader(%{gh_owner}/laminas-session) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3) +# remirepo:26 %else -BuildRequires: php-composer(%{gh_owner}/zend-authentication) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-cache) >= 2.6.1 -BuildRequires: php-composer(%{gh_owner}/zend-config) >= 2.6 -BuildRequires: php-composer(%{gh_owner}/zend-console) >= 2.6 -BuildRequires: php-composer(%{gh_owner}/zend-escaper) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-feed) >= 2.7 -BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.6.1 -BuildRequires: php-composer(%{gh_owner}/zend-http) >= 2.5.4 -BuildRequires: php-composer(%{gh_owner}/zend-i18n) >= 2.6 -BuildRequires: php-composer(%{gh_owner}/zend-log) >= 2.7 -BuildRequires: php-composer(%{gh_owner}/zend-modulemanager) >= 2.7.1 -BuildRequires: php-composer(%{gh_owner}/zend-mvc) >= 2.7.14 -BuildRequires: php-composer(%{gh_owner}/zend-navigation) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-paginator) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-permissions-acl) >= 2.6 -BuildRequires: php-composer(%{gh_owner}/zend-router) >= 3.0.1 -BuildRequires: php-composer(%{gh_owner}/zend-serializer) >= 2.6.1 -BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 -BuildRequires: php-composer(%{gh_owner}/zend-session) >= 2.8.1 -BuildRequires: php-composer(%{gh_owner}/zend-uri) >= 2.5 +BuildRequires: php-laminas-eventmanager +BuildRequires: php-laminas-json +BuildRequires: php-laminas-loader +BuildRequires: php-laminas-stdlib +BuildRequires: php-laminas-zendframework-bridge +BuildRequires: php-laminas-authentication +BuildRequires: php-laminas-cache +BuildRequires: php-laminas-console +BuildRequires: php-laminas-escaper +BuildRequires: php-laminas-feed +BuildRequires: php-laminas-filter +BuildRequires: php-laminas-http +BuildRequires: php-laminas-i18n +BuildRequires: php-laminas-log +BuildRequires: php-laminas-modulemanager +%if ! %{bootstrap} +BuildRequires: php-laminas-mvc +BuildRequires: php-laminas-navigation +BuildRequires: php-laminas-paginator %endif -BuildRequires: phpunit6 -# Not in composer.json -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -BuildRequires: php-composer(%{gh_owner}/zend-mvc-plugin-flashmessenger) -BuildRequires: php-composer(%{gh_owner}/zend-mvc-i18n) -BuildRequires: php-composer(%{gh_owner}/zend-mvc-console) +BuildRequires: php-laminas-permissions-acl +BuildRequires: php-laminas-router +BuildRequires: php-laminas-serializer +BuildRequires: php-laminas-servicemanager +BuildRequires: php-laminas-session +BuildRequires: php-laminas-uri %endif +BuildRequires: phpunit6 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", -# "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", -# "zendframework/zend-json": "^2.6.1 || ^3.0", -# "zendframework/zend-loader": "^2.5", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "laminas/laminas-eventmanager": "^2.6.2 || ^3.0", +# "laminas/laminas-json": "^2.6.1 || ^3.0", +# "laminas/laminas-loader": "^2.5", +# "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-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-loader) >= 2.5 with php-autoloader(%{gh_owner}/zend-loader) < 3) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -# remirepo:10 -%else -Requires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 -Requires: php-autoloader(%{gh_owner}/zend-eventmanager) < 4 -Requires: php-autoloader(%{gh_owner}/zend-json) < 4 -Requires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 -Requires: php-autoloader(%{gh_owner}/zend-loader) >= 2.5 -Requires: php-autoloader(%{gh_owner}/zend-loader) < 3 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -%endif +Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-json) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-json) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +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": { -# "zendframework/zend-authentication": "Zend\\Authentication component", -# "zendframework/zend-escaper": "Zend\\Escaper component", -# "zendframework/zend-feed": "Zend\\Feed component", -# "zendframework/zend-filter": "Zend\\Filter component", -# "zendframework/zend-http": "Zend\\Http component", -# "zendframework/zend-i18n": "Zend\\I18n component", -# "zendframework/zend-mvc": "Zend\\Mvc component", -# "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up", -# "zendframework/zend-navigation": "Zend\\Navigation component", -# "zendframework/zend-paginator": "Zend\\Paginator component", -# "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component", -# "zendframework/zend-servicemanager": "Zend\\ServiceManager component", -# "zendframework/zend-uri": "Zend\\Uri component" -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 -Suggests: php-composer(%{gh_owner}/zend-authentication) -Suggests: php-composer(%{gh_owner}/zend-escaper) -Suggests: php-composer(%{gh_owner}/zend-feed) -Suggests: php-composer(%{gh_owner}/zend-filter) -Suggests: php-composer(%{gh_owner}/zend-http) -Suggests: php-composer(%{gh_owner}/zend-i18n) -Suggests: php-composer(%{gh_owner}/zend-mvc) -Suggests: php-composer(%{gh_owner}/zend-mvc-plugin-flashmessenger) -Suggests: php-composer(%{gh_owner}/zend-navigation) -Suggests: php-composer(%{gh_owner}/zend-paginator) -Suggests: php-composer(%{gh_owner}/zend-permissions-acl) -Suggests: php-composer(%{gh_owner}/zend-servicemanager) -Suggests: php-composer(%{gh_owner}/zend-uri) -%endif +# "laminas/laminas-authentication": "Laminas\\Authentication component", +# "laminas/laminas-escaper": "Laminas\\Escaper component", +# "laminas/laminas-feed": "Laminas\\Feed component", +# "laminas/laminas-filter": "Laminas\\Filter component", +# "laminas/laminas-http": "Laminas\\Http component", +# "laminas/laminas-i18n": "Laminas\\I18n component", +# "laminas/laminas-mvc": "Laminas\\Mvc component", +# "laminas/laminas-mvc-plugin-flashmessenger": "laminas-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with laminas-mvc versions 3 and up", +# "laminas/laminas-navigation": "Laminas\\Navigation component", +# "laminas/laminas-paginator": "Laminas\\Paginator component", +# "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component", +# "laminas/laminas-servicemanager": "Laminas\\ServiceManager component", +# "laminas/laminas-uri": "Laminas\\Uri component" +Suggests: php-composer(%{gh_owner}/laminas-authentication) +Suggests: php-composer(%{gh_owner}/laminas-escaper) +Suggests: php-composer(%{gh_owner}/laminas-feed) +Suggests: php-composer(%{gh_owner}/laminas-filter) +Suggests: php-composer(%{gh_owner}/laminas-http) +Suggests: php-composer(%{gh_owner}/laminas-i18n) +Suggests: php-composer(%{gh_owner}/laminas-mvc) +Suggests: php-composer(%{gh_owner}/laminas-mvc-plugin-flashmessenger) +Suggests: php-composer(%{gh_owner}/laminas-navigation) +Suggests: php-composer(%{gh_owner}/laminas-paginator) +Suggests: php-composer(%{gh_owner}/laminas-permissions-acl) +Suggests: php-composer(%{gh_owner}/laminas-servicemanager) +Suggests: php-composer(%{gh_owner}/laminas-uri) +# remirepo:7 +%else +Requires: php-laminas-eventmanager +Requires: php-laminas-json +Requires: php-laminas-loader +Requires: php-laminas-stdlib +Requires: php-laminas-zendframework-bridge %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.6.0 +# From phpcompatinfo report for version 2.11.4 Requires: php-cli +Requires: php-reflection Requires: php-date Requires: php-dom Requires: php-filter 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} +Obsoletes: php-ZendFramework2-%{library} < 2.5 +Provides: php-ZendFramework2-%{library} = %{version} +# Compatibily ensure by the bridge +Obsoletes: php-zendframework-%{zf_name} < 2.11.4-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} -# for zf_templatemap_generator command -Conflicts: php-zendframework < 2.5.3-3 +Provides: php-autoloader(zendframework/%{zf_name}) = %{version} %description -Zend\View provides the “View” layer of Zend Framework 2’s MVC system. +%{namespace}\View provides the “View” layer of Zend Framework 2’s MVC system. It is a multi-tiered system allowing a variety of mechanisms for extension, substitution, and more. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -222,66 +214,86 @@ 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/EventManager/autoload.php', - '%{php_home}/Zend/Loader/autoload.php', - '%{php_home}/Zend/Stdlib/autoload.php', + '%{php_home}/%{namespace}/EventManager/autoload.php', + '%{php_home}/%{namespace}/Loader/autoload.php', + '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/Zend/Authentication/autoload.php', - '%{php_home}/Zend/Escaper/autoload.php', - '%{php_home}/Zend/Feed/autoload.php', - '%{php_home}/Zend/Filter/autoload.php', - '%{php_home}/Zend/Http/autoload.php', - '%{php_home}/Zend/I18n/autoload.php', - '%{php_home}/Zend/Json/autoload.php', - '%{php_home}/Zend/Mvc/autoload.php', - '%{php_home}/Zend/Navigation/autoload.php', - '%{php_home}/Zend/Paginator/autoload.php', - '%{php_home}/Zend/Permissions/Acl/autoload.php', - '%{php_home}/Zend/ServiceManager/autoload.php', - '%{php_home}/Zend/Uri/autoload.php', + '%{php_home}/%{namespace}/Authentication/autoload.php', + '%{php_home}/%{namespace}/Escaper/autoload.php', + '%{php_home}/%{namespace}/Feed/autoload.php', + '%{php_home}/%{namespace}/Filter/autoload.php', + '%{php_home}/%{namespace}/Http/autoload.php', + '%{php_home}/%{namespace}/I18n/autoload.php', + '%{php_home}/%{namespace}/Json/autoload.php', + '%{php_home}/%{namespace}/Mvc/autoload.php', + '%{php_home}/%{namespace}/Navigation/autoload.php', + '%{php_home}/%{namespace}/Paginator/autoload.php', + '%{php_home}/%{namespace}/Permissions/Acl/autoload.php', + '%{php_home}/%{namespace}/ServiceManager/autoload.php', + '%{php_home}/%{namespace}/Uri/autoload.php', ]); EOF +cat << 'EOF' | tee zf.php + - 2.11.4-1 +- switch to Laminas + * Thu Dec 5 2019 Remi Collet - 2.11.4-1 - update to 2.11.4 -- cgit