summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-09-22 10:21:01 +0200
committerRemi Collet <remi@remirepo.net>2021-09-22 10:21:01 +0200
commit4f647a74b8253ea7acc896ca4a6b1d0a739ad9d2 (patch)
tree22e19f042862f6ebfd20eab81ce7ec4648448d40
parentafabf3cb47ba63dc69405ce4ba9dfe0915f8b21a (diff)
update to 2.3.4
allow psr/log v2 and v3
-rw-r--r--composer.json11
-rw-r--r--php-monolog2.spec22
2 files changed, 22 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index 7ed2e3d..5372e48 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
],
"require": {
"php": ">=7.2",
- "psr/log": "^1.0.1"
+ "psr/log": "^1.0.1 || ^2.0 || ^3.0"
},
"require-dev": {
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
@@ -28,7 +28,7 @@
"phpunit/phpunit": "^8.5",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
- "ruflin/elastica": ">=0.90 <7.0.1",
+ "ruflin/elastica": ">=0.90@dev",
"swiftmailer/swiftmailer": "^5.3|^6.0",
"phpstan/phpstan": "^0.12.91"
},
@@ -44,7 +44,10 @@
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
"php-console/php-console": "Allow sending log messages to Google Chrome",
- "ext-mbstring": "Allow to work properly with unicode symbols"
+ "ext-mbstring": "Allow to work properly with unicode symbols",
+ "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
+ "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
+ "ext-openssl": "Required to send log messages using SSL"
},
"autoload": {
"psr-4": {"Monolog\\": "src/Monolog"}
@@ -53,7 +56,7 @@
"psr-4": {"Monolog\\": "tests/Monolog"}
},
"provide": {
- "psr/log-implementation": "1.0.0"
+ "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
},
"extra": {
"branch-alias": {
diff --git a/php-monolog2.spec b/php-monolog2.spec
index 31894d5..5b8a6e1 100644
--- a/php-monolog2.spec
+++ b/php-monolog2.spec
@@ -11,8 +11,8 @@
%global github_owner Seldaek
%global github_name monolog
-%global github_version 2.3.2
-%global github_commit 71312564759a7db5b789296369c1a264efc43aad
+%global github_version 2.3.4
+%global github_commit 437e7a1c50044b92773b361af77620efb76fff59
%global composer_vendor monolog
%global composer_project monolog
@@ -20,9 +20,9 @@
# "php": ">=7.2"
%global php_min_ver 7.2
-# "psr/log": "^1.0.1"
+# "psr/log": "^1.0.1 || ^2.0 || ^3.0"
%global psrlog_min_ver 1.0.1
-%global psrlog_max_ver 2.0
+%global psrlog_max_ver 4
# "aws/aws-sdk-php": "^2.4.9 || ^3.0"
# NOTE: Min version not 2.4.9 because autoloader required
%global aws_min_ver 2.8.13
@@ -151,9 +151,13 @@ phpab -t fedora \
cat <<'AUTOLOAD' | tee -a src/Monolog/autoload.php
-\Fedora\Autoloader\Dependencies::required(array(
- '%{phpdir}/Psr/Log/autoload.php',
-));
+\Fedora\Autoloader\Dependencies::required([
+ [
+ '%{phpdir}/Psr/Log3/autoload.php',
+ '%{phpdir}/Psr/Log2/autoload.php',
+ '%{phpdir}/Psr/Log/autoload.php',
+ ],
+]);
\Fedora\Autoloader\Dependencies::optional([
[
@@ -221,6 +225,10 @@ exit $RETURN_CODE
%changelog
+* Wed Sep 22 2021 Remi Collet <remi@remirepo.net> - 2.3.4-1
+- update to 2.3.4
+- allow psr/log v2 and v3
+
* Fri Jul 23 2021 Remi Collet <remi@remirepo.net> - 2.3.2-1
- update to 2.3.2