From 6a595b39fba893ab543607a1c9c25e13a5bb55fe Mon Sep 17 00:00:00 2001 From: Mark Boudreau Date: Tue, 10 Sep 2019 17:42:48 -0400 Subject: [PATCH 1/2] Update Worker.php - squashed allow-monolog-2 (#2) credit to @rlehrke --- lib/Resque/Worker.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Resque/Worker.php b/lib/Resque/Worker.php index 0d0e4d3..bae065c 100755 --- a/lib/Resque/Worker.php +++ b/lib/Resque/Worker.php @@ -630,19 +630,19 @@ public function log($message, $code = self::LOG_TYPE_INFO) } else { switch ($code) { case self::LOG_TYPE_INFO: - $this->logger->addInfo($message, $extra); + $this->logger->info($message, $extra); break; case self::LOG_TYPE_WARNING: - $this->logger->addWarning($message, $extra); + $this->logger->warning($message, $extra); break; case self::LOG_TYPE_ERROR: - $this->logger->addError($message, $extra); + $this->logger->error($message, $extra); break; case self::LOG_TYPE_CRITICAL: - $this->logger->addCritical($message, $extra); + $this->logger->critical($message, $extra); break; case self::LOG_TYPE_ALERT: - $this->logger->addAlert($message, $extra); + $this->logger->alert($message, $extra); } } @@ -652,7 +652,7 @@ public function log($message, $code = self::LOG_TYPE_INFO) if ($this->logger === null) { fwrite($this->logOutput, "[" . date('c') . "] " . $message . "\n"); } else { - $this->logger->addDebug($message, $extra); + $this->logger->debug($message, $extra); } } else { return false; From 56c1219ce7205544244b3026339ee45a7d3aa0f8 Mon Sep 17 00:00:00 2001 From: Mark Boudreau Date: Tue, 10 Sep 2019 18:43:34 -0400 Subject: [PATCH 2/2] Update Resque Worker.php; set compatible phpunit version in composer.json; credit to @rlehrke (#3) --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index b8203be..109c454 100644 --- a/composer.json +++ b/composer.json @@ -40,5 +40,8 @@ ], "conflict": { "chrisboulton/php-resque": "*" + }, + "require-dev": { + "phpunit/phpunit": "^5.0" } }