From 90e99426dcafa65fad1600d782913539f5869741 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Jan 2020 15:28:25 +0100 Subject: switch to Laminas --- composer.json | 56 +++++++++++---------- php-laminas-tag.spec | 135 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 112 insertions(+), 79 deletions(-) diff --git a/composer.json b/composer.json index d6ae116..545d2b8 100644 --- a/composer.json +++ b/composer.json @@ -1,50 +1,51 @@ { - "name": "zendframework/zend-tag", + "name": "laminas/laminas-tag", "description": "Manipulate and weight taggable items, and create tag clouds", "license": "BSD-3-Clause", "keywords": [ - "zf", - "zendframework", + "laminas", "tag" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-tag/", - "issues": "https://github.com/zendframework/zend-tag/issues", - "source": "https://github.com/zendframework/zend-tag", - "rss": "https://github.com/zendframework/zend-tag/releases.atom", - "chat": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-tag/", + "issues": "https://github.com/laminas/laminas-tag/issues", + "source": "https://github.com/laminas/laminas-tag", + "rss": "https://github.com/laminas/laminas-tag/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-escaper": "^2.5", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "laminas/laminas-escaper": "^2.5", + "laminas/laminas-stdlib": "^2.7 || ^3.0", + "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", - "zendframework/zend-coding-standard": "~1.0.0" + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" }, "suggest": { - "zendframework/zend-servicemanager": "Zend\\ServiceManager component" + "laminas/laminas-servicemanager": "Laminas\\ServiceManager component" }, "autoload": { "psr-4": { - "Zend\\Tag\\": "src/" + "Laminas\\Tag\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\Tag\\": "test/" - } - }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" + "LaminasTest\\Tag\\": "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-tag": "self.version" } } diff --git a/php-laminas-tag.spec b/php-laminas-tag.spec index 606919a..2f391a4 100644 --- a/php-laminas-tag.spec +++ b/php-laminas-tag.spec @@ -1,4 +1,4 @@ -# remirepo/Fedora spec file for php-zendframework-zend-tag +# remirepo/Fedora spec file for php-laminas-tag # # 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 a9f92a01157dac2ce20bf5d5de2291b1294d3f88 +%global gh_commit 6af061af4d7a54f3ee6ba94846c0f21ad284dc10 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-tag +%global gh_owner laminas +%global gh_project laminas-tag +%global zf_name zend-tag %global php_home %{_datadir}/php +%global namespace Laminas %global library Tag %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 @@ -36,72 +38,73 @@ BuildRequires: php(language) >= 5.6 BuildRequires: php-pcre BuildRequires: php-spl # From composer, "require-dev": { -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", -# "zendframework/zend-coding-standard": "~1.0.0" +# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", +# "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-escaper) >= 2.5 with php-autoloader(%{gh_owner}/zend-escaper) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1.4 -# remirepo:10 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +# remirepo:6 %else -BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.5.8 +BuildRequires: php-laminas-escaper +BuildRequires: php-laminas-stdlib +BuildRequires: php-laminas-servicemanager +BuildRequires: php-laminas-zendframework-bridge %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-escaper": "^2.5", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "laminas/laminas-escaper": "^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-escaper) >= 2.5 with php-autoloader(%{gh_owner}/zend-escaper) < 3) -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-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 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) +# remirepo:5 %else -Requires: php-autoloader(%{gh_owner}/zend-escaper) < 3 -Requires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-laminas-escaper +Requires: php-laminas-stdlib +Requires: php-laminas-zendframework-bridge %endif # From composer, "suggest": { -# "zendframework/zend-servicemanager": "Zend\\ServiceManager component" -Suggests: php-autoloader(%{gh_owner}/servicemanager) +# "laminas/laminas-servicemanager": "Laminas\\ServiceManager component" +Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager) %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-pcre Requires: php-spl -Obsoletes: php-ZendFramework2-%{library} < 2.5 -Provides: php-ZendFramework2-%{library} = %{version} -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +# Compatibily ensure by the bridge +Obsoletes: php-zendframework-%{zf_name} < 2.7.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\Tag is a component suite which provides a facility to work with +%{namespace}\Tag is a component suite which provides a facility to work with taggable Items. As its base, it provides two classes to work with Tags, -Zend\Tag\Item and Zend\Tag\ItemList. Additionally, it comes with the -interface Zend\Tag\TaggableInterface, which allows you to use any of -your models as a taggable item in conjunction with Zend\Tag. +%{namespace}\Tag\Item and %{namespace}\Tag\ItemList. Additionally, it comes with the +interface %{namespace}\Tag\TaggableInterface, which allows you to use any of +your models as a taggable item in conjunction with %{namespace}\Tag. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -114,18 +117,32 @@ 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/Escaper/autoload.php', - '%{php_home}/Zend/Stdlib/autoload.php', + '%{php_home}/%{namespace}/Escaper/autoload.php', + '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/Zend/ServiceManager/autoload.php', + '%{php_home}/%{namespace}/ServiceManager/autoload.php', +]); +EOF + +cat << 'EOF' | tee zf.php + - 2.7.2-1 +- switch to Laminas + * Thu May 2 2019 Remi Collet - 2.7.1-2 - update to 2.7.1 -- cgit