From 0b4e23595b74e421bab3d5270170ca7672d1e3d3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Aug 2019 12:03:26 +0200 Subject: v2.11.0 --- composer.json | 46 ++++++++++++++++++++++++----------------- php-zendframework-zend-log.spec | 9 +++++--- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index 99e3c39..af0b79b 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,21 @@ { "name": "zendframework/zend-log", - "description": "component for general purpose logging", + "description": "Robust, composite logger with filtering, formatting, and PSR-3 support", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zendframework", + "zf", "log", "logging" ], - "homepage": "https://github.com/zendframework/zend-log", + "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" + }, "require": { "php": "^5.6 || ^7.0", "psr/log": "^1.0", @@ -15,8 +23,8 @@ "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "mikey179/vfsStream": "^1.6", - "phpunit/phpunit": "^5.7.15 || ^6.0.8", + "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", @@ -30,24 +38,11 @@ "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" }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "2.11.x-dev" - }, - "zf": { - "component": "Zend\\Log", - "config-provider": "Zend\\Log\\ConfigProvider" - } - }, "autoload": { "psr-4": { "Zend\\Log\\": "src/" @@ -58,10 +53,23 @@ "ZendTest\\Log\\": "test/" }, "files": [ - "autoload/phpunit.php", + "test/autoload.php", "test/Writer/TestAsset/chmod.php" ] }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.11.x-dev", + "dev-develop": "2.12.x-dev" + }, + "zf": { + "component": "Zend\\Log", + "config-provider": "Zend\\Log\\ConfigProvider" + } + }, "scripts": { "check": [ "@cs-check", diff --git a/php-zendframework-zend-log.spec b/php-zendframework-zend-log.spec index 0583be0..a4fa5b6 100644 --- a/php-zendframework-zend-log.spec +++ b/php-zendframework-zend-log.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 9cec3b092acb39963659c2f32441cccc56b3f430 +%global gh_commit cb278772afdacb1924342248a069330977625ae6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-log @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.10.0 +Version: 2.11.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -153,7 +153,7 @@ Zend\Loader\AutoloaderFactory::factory(array( )))); require_once '%{php_home}/Zend/autoload.php'; -require __DIR__ . '/../autoload/phpunit.php'; +require __DIR__ . '/../test/autoload.php'; require __DIR__ . '/../test/Writer/TestAsset/chmod.php'; EOF @@ -182,6 +182,9 @@ exit $ret %changelog +* Mon Aug 26 2019 Remi Collet - 2.11.0-1 +- update to 2.11.0 + * Wed Apr 11 2018 Remi Collet - 2.10.0-1 - update to 2.10.0 -- cgit