summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json23
-rw-r--r--php-monolog2.spec13
2 files changed, 18 insertions, 18 deletions
diff --git a/composer.json b/composer.json
index 9e54787..27d4333 100644
--- a/composer.json
+++ b/composer.json
@@ -2,14 +2,14 @@
"name": "monolog/monolog",
"description": "Sends your logs to files, sockets, inboxes, databases and various web services",
"keywords": ["log", "logging", "psr-3"],
- "homepage": "http://github.com/Seldaek/monolog",
+ "homepage": "https://github.com/Seldaek/monolog",
"type": "library",
"license": "MIT",
"authors": [
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
+ "homepage": "https://seld.be"
}
],
"require": {
@@ -19,17 +19,18 @@
"require-dev": {
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
- "elasticsearch/elasticsearch": "^6.0",
+ "elasticsearch/elasticsearch": "^7",
+ "mongodb/mongodb": "^1.8",
"graylog2/gelf-php": "^1.4.2",
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
- "php-parallel-lint/php-parallel-lint": "^1.0",
"phpspec/prophecy": "^1.6.1",
"phpunit/phpunit": "^8.5",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
- "ruflin/elastica": ">=0.90 <3.0",
- "swiftmailer/swiftmailer": "^5.3|^6.0"
+ "ruflin/elastica": ">=0.90 <7.0.1",
+ "swiftmailer/swiftmailer": "^5.3|^6.0",
+ "phpstan/phpstan": "^0.12.59"
},
"suggest": {
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
@@ -56,16 +57,12 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev"
+ "dev-main": "2.x-dev"
}
},
"scripts": {
- "lint": [
- "parallel-lint . --exclude vendor"
- ],
- "test": [
- "phpunit"
- ]
+ "test": "vendor/bin/phpunit",
+ "phpstan": "vendor/bin/phpstan analyse"
},
"config": {
"sort-packages": true,
diff --git a/php-monolog2.spec b/php-monolog2.spec
index ed337e4..b6511a0 100644
--- a/php-monolog2.spec
+++ b/php-monolog2.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-monolog2
#
-# Copyright (c) 2012-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2012-2021 Shawn Iwinski <shawn.iwinski@gmail.com>
# Remi Collet <remi@remirepo.net>
#
# License: MIT
@@ -11,8 +11,8 @@
%global github_owner Seldaek
%global github_name monolog
-%global github_version 2.1.1
-%global github_commit f9eee5cec93dfb313a38b6b288741e84e53f02d5
+%global github_version 2.2.0
+%global github_commit 1cb1cde8e8dd0f70cc0fe51354a59acad9302084
%global composer_vendor monolog
%global composer_project monolog
@@ -187,7 +187,7 @@ BOOTSTRAP
rm -f tests/Monolog/Handler/MongoDBHandlerTest.php
: Remove RedisHandlerTest because it requires a running Redis server
-rm -f tests/Monolog/Handler/RedisHandlerTest.php
+rm -f tests/Monolog/Handler/Redis*Test.php
: Remove GitProcessorTest because it requires a git repo
rm -f tests/Monolog/Processor/GitProcessorTest.php
@@ -199,7 +199,7 @@ rm -f tests/Monolog/Handler/RollbarHandlerTest.php
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit8)
-for PHP_EXEC in "" php72 php73 php74; do
+for PHP_EXEC in "" php72 php73 php74 php80; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1
fi
@@ -221,6 +221,9 @@ exit $RETURN_CODE
%changelog
+* Mon Jan 4 2021 Remi Collet <remi@remirepo.net> - 2.2.0-1
+- update to 2.2.0
+
* Thu Jul 23 2020 Remi Collet <remi@remirepo.net> - 2.1.1-1
- update to 2.1.1
- rename to php-monolog2