From 0a0c4502ca300f65419e9b6c98b66b7a60f12ad3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Nov 2016 19:18:20 +0100 Subject: php-Monolog: fix tests (backported from Fedora) --- php-Monolog-tests-sentry-gte-0-16-0.patch | 61 +++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 php-Monolog-tests-sentry-gte-0-16-0.patch (limited to 'php-Monolog-tests-sentry-gte-0-16-0.patch') diff --git a/php-Monolog-tests-sentry-gte-0-16-0.patch b/php-Monolog-tests-sentry-gte-0-16-0.patch new file mode 100644 index 0000000..d687ff2 --- /dev/null +++ b/php-Monolog-tests-sentry-gte-0-16-0.patch @@ -0,0 +1,61 @@ +diff --git a/tests/Monolog/Handler/MockRavenClient-gte-0-16-0.php b/tests/Monolog/Handler/MockRavenClient-gte-0-16-0.php +new file mode 100644 +index 0000000..07434e4 +--- /dev/null ++++ b/tests/Monolog/Handler/MockRavenClient-gte-0-16-0.php +@@ -0,0 +1,27 @@ ++ ++ * ++ * For the full copyright and license information, please view the LICENSE ++ * file that was distributed with this source code. ++ */ ++ ++namespace Monolog\Handler; ++ ++use Raven_Client; ++ ++class MockRavenClient extends Raven_Client ++{ ++ public function capture($data, $stack = null, $vars = null) ++ { ++ $data = array_merge($this->get_user_data(), $data); ++ $this->lastData = $data; ++ $this->lastStack = $stack; ++ } ++ ++ public $lastData; ++ public $lastStack; ++} +diff --git a/tests/Monolog/Handler/RavenHandlerTest.php b/tests/Monolog/Handler/RavenHandlerTest.php +index a7c4845..6ed5790 100644 +--- a/tests/Monolog/Handler/RavenHandlerTest.php ++++ b/tests/Monolog/Handler/RavenHandlerTest.php +@@ -14,16 +14,21 @@ namespace Monolog\Handler; + use Monolog\TestCase; + use Monolog\Logger; + use Monolog\Formatter\LineFormatter; ++use Raven_Client; + + class RavenHandlerTest extends TestCase + { + public function setUp() + { + if (!class_exists('Raven_Client')) { +- $this->markTestSkipped('raven/raven not installed'); ++ $this->markTestSkipped('sentry/sentry not installed'); + } + +- require_once __DIR__ . '/MockRavenClient.php'; ++ if (version_compare(Raven_Client::VERSION, '0.16.0', '>=')) { ++ require_once __DIR__ . '/MockRavenClient-gte-0-16-0.php'; ++ } else { ++ require_once __DIR__ . '/MockRavenClient.php'; ++ } + } + + /** -- cgit