From dc079a3a34ba95822e6709fec4c0ddb9fa0fd4e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jan 2020 13:15:07 +0100 Subject: switch to Laminas --- composer.json | 58 ++++++++++--------- php-laminas-progressbar.spec | 131 ++++++++++++++++++++++++++----------------- 2 files changed, 112 insertions(+), 77 deletions(-) diff --git a/composer.json b/composer.json index a77b349..af2cd29 100644 --- a/composer.json +++ b/composer.json @@ -1,51 +1,52 @@ { - "name": "zendframework/zend-progressbar", + "name": "laminas/laminas-progressbar", "description": "Create and update progress bars in different environments", "license": "BSD-3-Clause", "keywords": [ - "zf", - "zendframework", + "laminas", "progressbar" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-progressbar/", - "issues": "https://github.com/zendframework/zend-progressbar/issues", - "source": "https://github.com/zendframework/zend-progressbar", - "rss": "https://github.com/zendframework/zend-progressbar/releases.atom", - "chat": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-progressbar/", + "issues": "https://github.com/laminas/laminas-progressbar/issues", + "source": "https://github.com/laminas/laminas-progressbar", + "rss": "https://github.com/laminas/laminas-progressbar/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-stdlib": "^3.2.1" + "laminas/laminas-stdlib": "^3.2.1", + "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-json": "^2.6.1", - "zendframework/zend-session": "^2.8.5" + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-json": "^2.6.1", + "laminas/laminas-session": "^2.8.5", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" }, "suggest": { - "zendframework/zend-json": "Zend\\Json component", - "zendframework/zend-session": "To support progressbar persistent" + "laminas/laminas-json": "Laminas\\Json component", + "laminas/laminas-session": "To support progressbar persistent" }, "autoload": { "psr-4": { - "Zend\\ProgressBar\\": "src/" + "Laminas\\ProgressBar\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\ProgressBar\\": "test/" - } - }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" + "LaminasTest\\ProgressBar\\": "test/" } }, "scripts": { @@ -57,5 +58,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-progressbar": "self.version" } } diff --git a/php-laminas-progressbar.spec b/php-laminas-progressbar.spec index 93e1176..64cab95 100644 --- a/php-laminas-progressbar.spec +++ b/php-laminas-progressbar.spec @@ -1,17 +1,19 @@ -# remirepo/Fedora spec file for php-zendframework-zend-progressbar +# remirepo/Fedora spec file for php-laminas-progressbar # -# 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 f5b885453c4c789ddc86e395ae553df5b4148d15 +%global gh_commit 15f9e983276462f30d7d38660dc7488c6e3df34b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-progressbar +%global gh_owner laminas +%global gh_project laminas-progressbar +%global zf_name zend-progressbar %global php_home %{_datadir}/php +%global namespace Laminas %global library ProgressBar %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.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 @@ -36,76 +38,80 @@ BuildRequires: php(language) >= 5.6 BuildRequires: php-date 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-json": "^2.6.1", -# "zendframework/zend-session": "^2.8.5" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 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": { +# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-json": "^2.6.1", +# "laminas/laminas-session": "^2.8.5", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" # ignore max version -BuildRequires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3) -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1.4 -# remirepo:10 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-json) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.5 with php-autoloader(%{gh_owner}/laminas-session) < 3) +# remirepo:6 %else -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 -BuildRequires: php-autoloader(%{gh_owner}/zend-json) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 -BuildRequires: php-autoloader(%{gh_owner}/zend-session) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.5.8 +BuildRequires: php-laminas-stdlib +BuildRequires: php-laminas-zendframework-bridge +BuildRequires: php-laminas-json +BuildRequires: php-laminas-session %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-stdlib": "^3.2.1" +# "laminas/laminas-stdlib": "^3.2.1", +# "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-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 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": { +# "laminas/laminas-json": "Laminas\\Json component", +# "laminas/laminas-session": "To support progressbar persistent" +Suggests: php-autoloader(%{gh_owner}/laminas-json) +Suggests: php-autoloader(%{gh_owner}/laminas-session) # remirepo:4 %else -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 +Requires: php-laminas-stdlib +Requires: php-laminas-zendframework-bridge %endif -# From composer, "suggest": { -# "zendframework/zend-json": "Zend\\Json component", -# "zendframework/zend-session": "To support progressbar persistent" -Suggests: php-autoloader(%{gh_owner}/zend-json) -Suggests: php-autoloader(%{gh_owner}/zend-session) %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.5.1 +# From phpcompatinfo report for version 2.7.0 Requires: php-date Requires: php-pcre Requires: php-spl # apc and uploadprogress are optional -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.7.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 -Zend\ProgressBar is a component to create and update progress bars in +%{namespace}\ProgressBar is a component to create and update progress bars in different environments. It consists of a single backend, which outputs the progress through one of the multiple adapters. On every update, it takes an absolute value and optionally a status message, and then calls the adapter with some precalculated values like percentage and estimated time left. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -119,18 +125,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/Stdlib/autoload.php', + '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/Zend/Json/autoload.php', - '%{php_home}/Zend/Session/autoload.php', + '%{php_home}/%{namespace}/Json/autoload.php', + '%{php_home}/%{namespace}/Session/autoload.php', ]); EOF +cat << 'EOF' | tee zf.php + - 2.7.0-1 +- switch to Laminas + * Fri Oct 18 2019 Remi Collet - 2.7.0-1 - update to 2.7.0 (no change) - raise dependency on zend-stdlib >= 3.2.1 -- cgit