diff options
| -rw-r--r-- | composer.json | 52 | ||||
| -rw-r--r-- | php-laminas-stdlib.spec | 84 |
2 files changed, 82 insertions, 54 deletions
diff --git a/composer.json b/composer.json index 8c99009..b374590 100644 --- a/composer.json +++ b/composer.json @@ -1,46 +1,47 @@ { - "name": "zendframework/zend-stdlib", + "name": "laminas/laminas-stdlib", "description": "SPL extensions, array utilities, error handlers, and more", "license": "BSD-3-Clause", "keywords": [ - "zf", - "zendframework", + "laminas", "stdlib" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-stdlib/", - "issues": "https://github.com/zendframework/zend-stdlib/issues", - "source": "https://github.com/zendframework/zend-stdlib", - "rss": "https://github.com/zendframework/zend-stdlib/releases.atom", - "slack": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-stdlib/", + "issues": "https://github.com/laminas/laminas-stdlib/issues", + "source": "https://github.com/laminas/laminas-stdlib", + "rss": "https://github.com/laminas/laminas-stdlib/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev", + "dev-develop": "3.3.x-dev" + } }, "require": { - "php": "^5.6 || ^7.0" + "php": "^5.6 || ^7.0", + "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { + "laminas/laminas-coding-standard": "~1.0.0", "phpbench/phpbench": "^0.13", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", - "zendframework/zend-coding-standard": "~1.0.0" + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" }, "autoload": { "psr-4": { - "Zend\\Stdlib\\": "src/" + "Laminas\\Stdlib\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\Stdlib\\": "test/", - "ZendBench\\Stdlib\\": "benchmark/" - } - }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev", - "dev-develop": "3.3.x-dev" + "LaminasTest\\Stdlib\\": "test/", + "LaminasBench\\Stdlib\\": "benchmark/" } }, "scripts": { @@ -52,5 +53,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-stdlib": "self.version" } } diff --git a/php-laminas-stdlib.spec b/php-laminas-stdlib.spec index bf4d2d9..fdf252d 100644 --- a/php-laminas-stdlib.spec +++ b/php-laminas-stdlib.spec @@ -1,17 +1,19 @@ -# remirepo/Fedora spec file for php-zendframework-zend-stdlib +# remirepo/Fedora spec file for php-laminas-stdlib # -# 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 66536006722aff9e62d1b331025089b7ec71c065 +%global gh_commit 2b18347625a2f06a1a485acfbc870f699dbe51c6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-stdlib +%global gh_owner laminas +%global gh_project laminas-stdlib +%global zf_name zend-stdlib %global php_home %{_datadir}/php +%global namespace Laminas %global library Stdlib %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.2.1 Release: 1%{?dist} -Summary: Zend Framework %{library} component +Summary: Laminas 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 @@ -40,26 +42,27 @@ BuildRequires: php-pcre BuildRequires: php-posix BuildRequires: php-spl # From composer, "require-dev": { +# "laminas/laminas-coding-standard": "~1.0.0", # "phpbench/phpbench": "^0.13", -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", -# "zendframework/zend-coding-standard": "~1.0.0" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" %global phpunit %{_bindir}/phpunit7 BuildRequires: phpunit7 >= 7.1.2 -# remirepo:4 -%else -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.5.8 -%endif # Autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer, "require": { # "php": "^5.6 || ^7.0", +# "laminas/laminas-zendframework-bridge": "^1.0" Requires: php(language) >= 5.6 -# From phpcompatinfo report for version 3.1.0 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) +# remirepo:3 +%else +Requires: php-laminas-zendframework-bridge +%endif +# From phpcompatinfo report for version 3.2.1 Requires: php-iconv Requires: php-intl Requires: php-mbstring @@ -69,18 +72,19 @@ Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) -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} < 3.2.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\Stdlib is a set of components that implements general purpose utility +%{namespace}\%{library} is a set of components that implements general purpose utility class for different scopes like: * array utilities functions; -* hydrators; -* json serializable interfaces; * general messaging systems; * string wrappers; * etc. @@ -97,10 +101,24 @@ mv LICENSE.md LICENSE %build phpab --template fedora --output src/autoload.php src +cat << 'EOF' | tee zf.php +<?php +require_once '%{php_home}/Fedora/Autoloader/autoload.php'; +\Fedora\Autoloader\Dependencies::required([ + '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php', + '%{php_home}/%{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} + +: Zend equiv +mkdir -p %{buildroot}%{php_home}/Zend/%{library} +cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php %check @@ -108,12 +126,14 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library} mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php -require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test'); +require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); EOF +php %{buildroot}%{php_home}/Zend/%{library}/autoload.php + ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73 php74; do +for cmdarg in "php %{phpunit}" php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -126,15 +146,19 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json -%dir %{php_home}/Zend %{php_home}/Zend/%{library} +%{php_home}/%{namespace}/%{library} %changelog +* Mon Jan 6 2020 Remi Collet <remi@remirepo.net> - 3.2.1-1 +- switch to Laminas + * Wed Aug 29 2018 Remi Collet <remi@remirepo.net> - 3.2.1-1 - update to 3.2.1 |