From 8cfc819265183c57e5b24528d766768f55ae76df Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Mar 2016 17:25:05 +0100 Subject: [PATCH 1/5] missing property --- src/Monolog/Handler/SocketHandler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Monolog/Handler/SocketHandler.php b/src/Monolog/Handler/SocketHandler.php index c458b1ca..7a61bf4e 100644 --- a/src/Monolog/Handler/SocketHandler.php +++ b/src/Monolog/Handler/SocketHandler.php @@ -30,6 +30,7 @@ class SocketHandler extends AbstractProcessingHandler private $persistent = false; private $errno; private $errstr; + private $lastWritingAt; /** * @param string $connectionString Socket connection string From f614d44667b92c7e042078825620942da54c872e Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Fri, 25 Mar 2016 18:57:25 +0100 Subject: [PATCH 2/5] Only load mongo.so for PHP 5.x on Travis ext-mongo does not exist for PHP 7 either, not only for HHVM. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0ce7c34..cd0a9552 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: fast_finish: true before_script: - - if [ "`phpenv version-name`" != "hhvm" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi + - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi - if [ "`phpenv version-name`" != "hhvm" ]; then echo "extension = amqp.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi - if [ "$deps" == "low" ]; then composer update --prefer-source --prefer-lowest --prefer-stable; fi - if [ "$deps" != "low" ]; then composer install --prefer-source; fi From 1b6f1f4ad874ac77a78934bad34096a6c69af07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 22 Mar 2016 19:45:04 +0100 Subject: [PATCH 3/5] use maintained package reference in suggestion videlalvaro/php-amqplib has been abandoned in favor of php-amqplib/php-amqplib --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index faca62ab..b29f2283 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "raven/raven": "Allow sending log messages to a Sentry server", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", From 76247469e7a476587be8dcbf93fcc6200d32d48b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 15 Mar 2016 11:16:14 +0100 Subject: [PATCH 4/5] move from abandoned package to maintained package --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b29f2283..8631e27c 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "ruflin/elastica": ">=0.90 <3.0", "doctrine/couchdb": "~1.0@dev", "aws/aws-sdk-php": "^2.4.9", - "videlalvaro/php-amqplib": "~2.4", + "php-amqplib/php-amqplib": "~2.4", "swiftmailer/swiftmailer": "~5.3", "php-console/php-console": "^3.1.3", "phpunit/phpunit-mock-objects": "2.3.0", From 15e21f38aa9c2119e818c2053dfbd3becce3bc07 Mon Sep 17 00:00:00 2001 From: chalasr Date: Fri, 25 Mar 2016 10:49:27 +0100 Subject: [PATCH 5/5] Change copyright's end date from 2015 to 2016 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 56e08d55..16473219 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2015 Jordi Boggiano +Copyright (c) 2011-2016 Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal