summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-05-10 15:35:50 +0200
committerRemi Collet <remi@php.net>2022-05-10 15:35:50 +0200
commit68ad25a365ccddd0058de2e092c6ecb6d99ac499 (patch)
tree82a919922fa06b030a51ce246d0e976466b9dd65
parent5ae5bd6db363e148698a81bfce6d1e6975c98d48 (diff)
update to 2.6.0HEADmaster
-rw-r--r--composer.json22
-rw-r--r--php-monolog2.spec19
2 files changed, 30 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index b151c65..52cb35f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,20 +17,25 @@
"psr/log": "^1.0.1 || ^2.0 || ^3.0"
},
"require-dev": {
+ "ext-json": "*",
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
- "elasticsearch/elasticsearch": "^7",
- "mongodb/mongodb": "^1.8",
+ "elasticsearch/elasticsearch": "^7 || ^8",
"graylog2/gelf-php": "^1.4.2",
+ "guzzlehttp/guzzle": "^7.4",
+ "guzzlehttp/psr7": "^2.2",
+ "mongodb/mongodb": "^1.8",
"php-amqplib/php-amqplib": "~2.4 || ^3",
"php-console/php-console": "^3.1.3",
- "phpspec/prophecy": "^1.6.1",
- "phpunit/phpunit": "^8.5",
+ "phpspec/prophecy": "^1.15",
+ "phpstan/phpstan": "^0.12.91",
+ "phpunit/phpunit": "^8.5.14",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3 || ^2 || ^3",
- "ruflin/elastica": ">=0.90@dev",
+ "ruflin/elastica": "^7",
"swiftmailer/swiftmailer": "^5.3|^6.0",
- "phpstan/phpstan": "^0.12.91"
+ "symfony/mailer": "^5.4 || ^6",
+ "symfony/mime": "^5.4 || ^6"
},
"suggest": {
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
@@ -70,6 +75,9 @@
"config": {
"lock": false,
"sort-packages": true,
- "platform-check": false
+ "platform-check": false,
+ "allow-plugins": {
+ "composer/package-versions-deprecated": true
+ }
}
}
diff --git a/php-monolog2.spec b/php-monolog2.spec
index 57f558b..aefa112 100644
--- a/php-monolog2.spec
+++ b/php-monolog2.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-monolog2
#
-# Copyright (c) 2012-2021 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2012-2022 Shawn Iwinski <shawn.iwinski@gmail.com>
# Remi Collet <remi@remirepo.net>
#
# License: MIT
@@ -9,10 +9,14 @@
# Please preserve changelog entries
#
+# TODO optional (and not available yet)
+# symfony/mailer + symfony/mime ^5.4 || ^6
+# guzzlehttp/guzzle + guzzlehttp/psr7
+
%global github_owner Seldaek
%global github_name monolog
-%global github_version 2.5.0
-%global github_commit 4192345e260f1d51b365536199744b987e160edc
+%global github_version 2.6.0
+%global github_commit 247918972acd74356b0a91dfaa5adcaec069b6c0
%global composer_vendor monolog
%global composer_project monolog
@@ -50,7 +54,7 @@ BuildArch: noarch
%if %{with tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: phpunit8 >= 8.5
+BuildRequires: phpunit8 >= 8.5.14
# remirepo:1
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
BuildRequires: (php-composer(psr/log) >= %{psrlog_min_ver} with php-composer(psr/log) < %{psrlog_max_ver})
@@ -198,6 +202,10 @@ rm -f tests/Monolog/Processor/GitProcessorTest.php
rm -f tests/Monolog/Handler/SocketHandlerTest.php
rm -f tests/Monolog/Handler/RollbarHandlerTest.php
+: Not available
+rm -f tests/Monolog/Handler/ElasticsearchHandlerTest.php
+rm -f tests/Monolog/Handler/SymfonyMailerHandlerTest.php
+
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit8)
@@ -226,6 +234,9 @@ exit $RETURN_CODE
%changelog
+* Tue May 10 2022 Remi Collet <remi@remirepo.net> - 2.6.0-1
+- update to 2.6.0
+
* Mon Apr 11 2022 Remi Collet <remi@remirepo.net> - 2.5.0-1
- update to 2.5.0