diff options
| -rw-r--r-- | composer.json | 80 | ||||
| -rw-r--r-- | php-laminas-log.spec | 211 |
2 files changed, 153 insertions, 138 deletions
diff --git a/composer.json b/composer.json index e46f5c0..9ebd529 100644 --- a/composer.json +++ b/composer.json @@ -1,36 +1,50 @@ { - "name": "zendframework/zend-log", + "name": "laminas/laminas-log", "description": "Robust, composite logger with filtering, formatting, and PSR-3 support", "license": "BSD-3-Clause", "keywords": [ - "zendframework", - "zf", + "laminas", "log", "logging" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-log/", - "issues": "https://github.com/zendframework/zend-log/issues", - "source": "https://github.com/zendframework/zend-log", - "rss": "https://github.com/zendframework/zend-log/releases.atom", - "chat": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-log/", + "issues": "https://github.com/laminas/laminas-log/issues", + "source": "https://github.com/laminas/laminas-log", + "rss": "https://github.com/laminas/laminas-log/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.12.x-dev", + "dev-develop": "2.13.x-dev" + }, + "laminas": { + "component": "Laminas\\Log", + "config-provider": "Laminas\\Log\\ConfigProvider" + } }, "require": { "php": "^5.6 || ^7.0", - "psr/log": "^1.1.2", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", + "laminas/laminas-stdlib": "^2.7 || ^3.0", + "laminas/laminas-zendframework-bridge": "^1.0", + "psr/log": "^1.1.2" }, "require-dev": { + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-db": "^2.6", + "laminas/laminas-escaper": "^2.5", + "laminas/laminas-filter": "^2.5", + "laminas/laminas-mail": "^2.6.1", + "laminas/laminas-validator": "^2.10.1", "mikey179/vfsstream": "^1.6.7", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-db": "^2.6", - "zendframework/zend-escaper": "^2.5", - "zendframework/zend-filter": "^2.5", - "zendframework/zend-mail": "^2.6.1", - "zendframework/zend-validator": "^2.10.1" + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15" }, "provide": { "psr/log-implementation": "1.0.0" @@ -38,37 +52,24 @@ "suggest": { "ext-mongo": "mongo extension to use Mongo writer", "ext-mongodb": "mongodb extension to use MongoDB writer", - "zendframework/zend-db": "Zend\\Db component to use the database log writer", - "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter", - "zendframework/zend-mail": "Zend\\Mail component to use the email log writer", - "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages" + "laminas/laminas-db": "Laminas\\Db component to use the database log writer", + "laminas/laminas-escaper": "Laminas\\Escaper component, for use in the XML log formatter", + "laminas/laminas-mail": "Laminas\\Mail component to use the email log writer", + "laminas/laminas-validator": "Laminas\\Validator component to block invalid log messages" }, "autoload": { "psr-4": { - "Zend\\Log\\": "src/" + "Laminas\\Log\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\Log\\": "test/" + "LaminasTest\\Log\\": "test/" }, "files": [ "test/Writer/TestAsset/chmod.php" ] }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "2.12.x-dev", - "dev-develop": "2.13.x-dev" - }, - "zf": { - "component": "Zend\\Log", - "config-provider": "Zend\\Log\\ConfigProvider" - } - }, "scripts": { "check": [ "@cs-check", @@ -78,5 +79,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-log": "self.version" } } diff --git a/php-laminas-log.spec b/php-laminas-log.spec index dc436a9..976950c 100644 --- a/php-laminas-log.spec +++ b/php-laminas-log.spec @@ -1,4 +1,4 @@ -# remirepo/Fedora spec file for php-zendframework-zend-log +# remirepo/Fedora spec file for php-laminas-log # # 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 e5ec088dc8a7b4d96a3a6627761f720a738a36b8 +%global gh_commit 4e92d841b48868714a070b10866e94be80fc92ff %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-log +%global gh_owner laminas +%global gh_project laminas-log +%global zf_name zend-log %global php_home %{_datadir}/php +%global namespace Laminas %global library Log %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.12.0 -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 @@ -41,104 +43,84 @@ BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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-composer(psr/log) >= 1.1.2 with php-composer(psr/log) < 2) +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-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +BuildRequires: (php-composer(psr/log) >= 1.1.2 with php-composer(psr/log) < 2) +# From composer, "require-dev": { +# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-db": "^2.6", +# "laminas/laminas-escaper": "^2.5", +# "laminas/laminas-filter": "^2.5", +# "laminas/laminas-mail": "^2.6.1", +# "laminas/laminas-validator": "^2.10.1", +# "mikey179/vfsstream": "^1.6.7", +# "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.6 with php-autoloader(%{gh_owner}/laminas-db) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.5 with php-autoloader(%{gh_owner}/laminas-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mail) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-mail) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6.6 with php-composer(mikey179/vfsstream) < 2) # remirepo:8 %else -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -BuildRequires: php-composer(psr/log) < 2 -BuildRequires: php-composer(psr/log) >= 1.1.2 +BuildRequires: php-laminas-servicemanager +BuildRequires: php-laminas-stdlib +BuildRequires: php-laminas-zendframework-bridge +BuildRequires: php-PsrLog +BuildRequires: php-mikey179-vfsstream +BuildRequires: php-laminas-db +BuildRequires: php-laminas-escaper +BuildRequires: php-laminas-filter +BuildRequires: php-laminas-mail +BuildRequires: php-laminas-validator %endif -# From composer, "require-dev": { -# "mikey179/vfsstream": "^1.6.7", -# "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15, -# "zendframework/zend-coding-standard": "~1.0.0", -# "zendframework/zend-db": "^2.6", -# "zendframework/zend-escaper": "^2.5", -# "zendframework/zend-filter": "^2.5", -# "zendframework/zend-mail": "^2.6.1", -# "zendframework/zend-validator": "^2.10.1" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -# ignore min version, 1.6.7 is PHP 7.4 only -BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6.6 with php-composer(mikey179/vfsstream) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/zend-console) >= 2.5 with php-autoloader(%{gh_owner}/zend-console) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-db) >= 2.6 with php-autoloader(%{gh_owner}/zend-db) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 with php-autoloader(%{gh_owner}/zend-escaper) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.5 with php-autoloader(%{gh_owner}/zend-filter) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-mail) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-mail) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3) %global phpunit %{_bindir}/phpunit7 BuildRequires: phpunit7 >= 7.5.15 -# remirepo:18 -%else -BuildRequires: php-composer(mikey179/vfsstream) < 2 -BuildRequires: php-composer(mikey179/vfsstream) >= 1.6.6 -BuildRequires: php-autoloader(%{gh_owner}/zend-console) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-console) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-db) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-db) >= 2.6 -BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-filter) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-mail) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-mail) >= 2.6.1 -BuildRequires: php-autoloader(%{gh_owner}/zend-validator) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 -%global phpunit %{_bindir}/phpunit -BuildRequires: php-phpunit-PHPUnit >= 5.7.27 -%endif # Optional dep -BuildRequires: php-autoloader(%{gh_owner}/zend-mime) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/laminas-mime) >= 2.5 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", -# "psr/log": "^1.1.2", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", +# "laminas/laminas-stdlib": "^2.7 || ^3.0", +# "laminas/laminas-zendframework-bridge": "^1.0", +# "psr/log": "^1.1.2" Requires: php(language) >= 5.6 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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-composer(psr/log) >= 1.1.2 with php-composer(psr/log) < 2) +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-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +Requires: (php-composer(psr/log) >= 1.1.2 with php-composer(psr/log) < 2) # From composer, "suggest": { # "ext-mongo": "mongo extension to use Mongo writer", # "ext-mongodb": "mongodb extension to use MongoDB writer", -# "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor", -# "zendframework/zend-db": "Zend\\Db component to use the database log writer", -# "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter", -# "zendframework/zend-mail": "Zend\\Mail component to use the email log writer", -# "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages" -Suggests: php-pecl(mongo) +# "laminas/laminas-db": "Laminas\\Db component to use the database log writer", +# "laminas/laminas-escaper": "Laminas\\Escaper component, for use in the XML log formatter", +# "laminas/laminas-mail": "Laminas\\Mail component to use the email log writer", +# "laminas/laminas-validator": "Laminas\\Validator component to block invalid log messages" Suggests: php-pecl(mongodb) -Suggests: php-autoloader(%{gh_owner}/zend-console) -Suggests: php-autoloader(%{gh_owner}/zend-db) -Suggests: php-autoloader(%{gh_owner}/zend-escaper) -Suggests: php-autoloader(%{gh_owner}/zend-mail) -Suggests: php-autoloader(%{gh_owner}/zend-validator) -# remirepo:8 +Suggests: php-autoloader(%{gh_owner}/laminas-console) +Suggests: php-autoloader(%{gh_owner}/laminas-db) +Suggests: php-autoloader(%{gh_owner}/laminas-escaper) +Suggests: php-autoloader(%{gh_owner}/laminas-mail) +Suggests: php-autoloader(%{gh_owner}/laminas-validator) +# remirepo:6 %else -Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 -Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -Requires: php-composer(psr/log) < 2 -Requires: php-composer(psr/log) >= 1.1.2 +Requires: php-laminas-servicemanager +Requires: php-laminas-stdlib +Requires: php-laminas-zendframework-bridge +Requires: php-PsrLog %endif %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.6.0 +# From phpcompatinfo report for version 2.12.0 Requires: php-ctype Requires: php-date Requires: php-dom @@ -147,19 +129,24 @@ Requires: php-pcre Requires: php-spl # mongo is optional -Obsoletes: php-ZendFramework2-%{library} < 2.5 -Provides: php-ZendFramework2-%{library} = %{version} -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} -Provides: php-composer(psr/log-implementation) = 1.0.0 +Obsoletes: php-ZendFramework2-%{library} < 2.5 +Provides: php-ZendFramework2-%{library} = %{version} +# Compatibily ensure by the bridge +Obsoletes: php-zendframework-%{zf_name} < 2.12.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} +Provides: php-composer(psr/log-implementation) = 1.0.0 %description -Zend\Log is a component for general purpose logging. It supports multiple +%{namespace}\Log is a component for general purpose logging. It supports multiple log backends, formatting messages sent to the log, and filtering messages from being logged. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -173,23 +160,36 @@ 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/ServiceManager/autoload.php', - '%{php_home}/Zend/Stdlib/autoload.php', + '%{php_home}/%{namespace}/ServiceManager/autoload.php', + '%{php_home}/%{namespace}/Stdlib/autoload.php', '%{php_home}/Psr/Log/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/Zend/Console/autoload.php', - '%{php_home}/Zend/Db/autoload.php', - '%{php_home}/Zend/Escaper/autoload.php', - '%{php_home}/Zend/Mail/autoload.php', - '%{php_home}/Zend/Validator/autoload.php', + '%{php_home}/%{namespace}/Db/autoload.php', + '%{php_home}/%{namespace}/Escaper/autoload.php', + '%{php_home}/%{namespace}/Mail/autoload.php', + '%{php_home}/%{namespace}/Validator/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} + +: Zend equiv +mkdir -p %{buildroot}%{php_home}/Zend/%{library} +cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php %check @@ -197,12 +197,12 @@ 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'; +require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; \Fedora\Autoloader\Dependencies::required([ '%{php_home}/org/bovigo/vfs/autoload.php', - '%{php_home}/Zend/Filter/autoload.php', + '%{php_home}/%{namespace}/Filter/autoload.php', ]); -\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test'); +\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); require __DIR__ . '/../test/Writer/TestAsset/chmod.php'; EOF @@ -210,8 +210,15 @@ EOF # ignore test requiring a MongoDB server rm test/Writer/MongoDBTest.php +: check compat autoloader +php -r ' +require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php"; +exit (class_exists("\\Zend\\%{library}\\Logger") ? 0 : 1); +' + +: upstream test suite ret=0 -for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit6" php72 php73 php74; do +for cmdarg in "php %{phpunit}" php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} || ret=1 @@ -230,9 +237,13 @@ exit $ret %doc *.md %doc composer.json %{php_home}/Zend/%{library} +%{php_home}/%{namespace}/%{library} %changelog +* Wed Jan 15 2020 Remi Collet <remi@remirepo.net> - 2.12.0-1 +- switch to Laminas + * Fri Jan 3 2020 Remi Collet <remi@remirepo.net> - 2.12.0-2 - update to 2.12.0 - bump dependency on psr/log 1.1.2 |