From f2d4830085cb101ef694a30255aa54fa2d7878fe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Oct 2021 08:15:50 +0200 Subject: update to 2.3.5 --- composer.json | 6 +++--- php-monolog2.spec | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 5372e48..020d278 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "elasticsearch/elasticsearch": "^7", "mongodb/mongodb": "^1.8", "graylog2/gelf-php": "^1.4.2", - "php-amqplib/php-amqplib": "~2.4", + "php-amqplib/php-amqplib": "~2.4 || ^3", "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.6.1", "phpunit/phpunit": "^8.5", @@ -68,8 +68,8 @@ "phpstan": "vendor/bin/phpstan analyse" }, "config": { + "lock": false, "sort-packages": true, "platform-check": false - }, - "lock": false + } } diff --git a/php-monolog2.spec b/php-monolog2.spec index 5b8a6e1..0a1b255 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.4 -%global github_commit 437e7a1c50044b92773b361af77620efb76fff59 +%global github_version 2.3.5 +%global github_commit fd4380d6fc37626e2f799f29d91195040137eba9 %global composer_vendor monolog %global composer_project monolog @@ -203,10 +203,11 @@ rm -f tests/Monolog/Handler/RollbarHandlerTest.php : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit8) -for PHP_EXEC in "" php73 php74 php80 php81; do +for PHP_EXEC in "" php73 php80 php81; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1 fi + rm -rf .hg done exit $RETURN_CODE %else @@ -225,6 +226,9 @@ exit $RETURN_CODE %changelog +* Mon Oct 4 2021 Remi Collet - 2.3.5-1 +- update to 2.3.5 + * Wed Sep 22 2021 Remi Collet - 2.3.4-1 - update to 2.3.4 - allow psr/log v2 and v3 -- cgit