From: =?utf-8?q?David_Pr=C3=A9vot?= Date: Sat, 7 Sep 2019 16:09:07 -1000 Subject: Move to namespaced PHPUnit versions --- tests/Monolog/ErrorHandlerTest.php | 2 +- tests/Monolog/Formatter/ChromePHPFormatterTest.php | 2 +- tests/Monolog/Formatter/ElasticaFormatterTest.php | 2 +- tests/Monolog/Formatter/GelfMessageFormatterTest.php | 2 +- tests/Monolog/Formatter/LineFormatterTest.php | 2 +- tests/Monolog/Formatter/LogstashFormatterTest.php | 8 +++++--- tests/Monolog/Formatter/MongoDBFormatterTest.php | 2 +- tests/Monolog/Formatter/NormalizerFormatterTest.php | 11 +++++++---- tests/Monolog/Formatter/ScalarFormatterTest.php | 2 +- tests/Monolog/Formatter/WildfireFormatterTest.php | 2 +- tests/Monolog/Handler/SyslogHandlerTest.php | 2 +- tests/Monolog/LoggerTest.php | 2 +- tests/Monolog/Processor/PsrLogMessageProcessorTest.php | 2 +- tests/Monolog/RegistryTest.php | 2 +- tests/Monolog/TestCase.php | 2 +- tests/Monolog/UtilsTest.php | 2 +- 16 files changed, 26 insertions(+), 21 deletions(-) diff --git a/tests/Monolog/ErrorHandlerTest.php b/tests/Monolog/ErrorHandlerTest.php index a9a3f30..1dfb91e 100644 --- a/tests/Monolog/ErrorHandlerTest.php +++ b/tests/Monolog/ErrorHandlerTest.php @@ -13,7 +13,7 @@ namespace Monolog; use Monolog\Handler\TestHandler; -class ErrorHandlerTest extends \PHPUnit_Framework_TestCase +class ErrorHandlerTest extends \PHPUnit\Framework\TestCase { public function testHandleError() { diff --git a/tests/Monolog/Formatter/ChromePHPFormatterTest.php b/tests/Monolog/Formatter/ChromePHPFormatterTest.php index 71c4204..9323390 100644 --- a/tests/Monolog/Formatter/ChromePHPFormatterTest.php +++ b/tests/Monolog/Formatter/ChromePHPFormatterTest.php @@ -13,7 +13,7 @@ namespace Monolog\Formatter; use Monolog\Logger; -class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase +class ChromePHPFormatterTest extends \PHPUnit\Framework\TestCase { /** * @covers Monolog\Formatter\ChromePHPFormatter::format diff --git a/tests/Monolog/Formatter/ElasticaFormatterTest.php b/tests/Monolog/Formatter/ElasticaFormatterTest.php index 90cc48d..03f63e7 100644 --- a/tests/Monolog/Formatter/ElasticaFormatterTest.php +++ b/tests/Monolog/Formatter/ElasticaFormatterTest.php @@ -13,7 +13,7 @@ namespace Monolog\Formatter; use Monolog\Logger; -class ElasticaFormatterTest extends \PHPUnit_Framework_TestCase +class ElasticaFormatterTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/tests/Monolog/Formatter/GelfMessageFormatterTest.php b/tests/Monolog/Formatter/GelfMessageFormatterTest.php index 4a24761..fe816df 100644 --- a/tests/Monolog/Formatter/GelfMessageFormatterTest.php +++ b/tests/Monolog/Formatter/GelfMessageFormatterTest.php @@ -13,7 +13,7 @@ namespace Monolog\Formatter; use Monolog\Logger; -class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase +class GelfMessageFormatterTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/tests/Monolog/Formatter/LineFormatterTest.php b/tests/Monolog/Formatter/LineFormatterTest.php index 310d93c..6d4fd40 100644 --- a/tests/Monolog/Formatter/LineFormatterTest.php +++ b/tests/Monolog/Formatter/LineFormatterTest.php @@ -14,7 +14,7 @@ namespace Monolog\Formatter; /** * @covers Monolog\Formatter\LineFormatter */ -class LineFormatterTest extends \PHPUnit_Framework_TestCase +class LineFormatterTest extends \PHPUnit\Framework\TestCase { public function testDefFormatWithString() { diff --git a/tests/Monolog/Formatter/LogstashFormatterTest.php b/tests/Monolog/Formatter/LogstashFormatterTest.php index 9f6b1cc..e4cd7b7 100644 --- a/tests/Monolog/Formatter/LogstashFormatterTest.php +++ b/tests/Monolog/Formatter/LogstashFormatterTest.php @@ -12,12 +12,14 @@ namespace Monolog\Formatter; use Monolog\Logger; +use PHPUnit\Framework\TestCase; +use PHPUnit\Framework\Error\Warning; -class LogstashFormatterTest extends \PHPUnit_Framework_TestCase +class LogstashFormatterTest extends TestCase { public function tearDown() { - \PHPUnit_Framework_Error_Warning::$enabled = true; + Warning::$enabled = true; return parent::tearDown(); } @@ -298,7 +300,7 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase { if (version_compare(PHP_VERSION, '5.5.0', '<')) { // Ignore the warning that will be emitted by PHP <5.5.0 - \PHPUnit_Framework_Error_Warning::$enabled = false; + Warning::$enabled = false; } $formatter = new LogstashFormatter('test', 'hostname'); $record = array( diff --git a/tests/Monolog/Formatter/MongoDBFormatterTest.php b/tests/Monolog/Formatter/MongoDBFormatterTest.php index 52e699e..2ce6142 100644 --- a/tests/Monolog/Formatter/MongoDBFormatterTest.php +++ b/tests/Monolog/Formatter/MongoDBFormatterTest.php @@ -16,7 +16,7 @@ use Monolog\Logger; /** * @author Florian Plattner */ -class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase +class MongoDBFormatterTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/tests/Monolog/Formatter/NormalizerFormatterTest.php b/tests/Monolog/Formatter/NormalizerFormatterTest.php index 32235da..1ec98be 100644 --- a/tests/Monolog/Formatter/NormalizerFormatterTest.php +++ b/tests/Monolog/Formatter/NormalizerFormatterTest.php @@ -11,14 +11,17 @@ namespace Monolog\Formatter; +use PHPUnit\Framework\TestCase; +use PHPUnit\Framework\Error\Warning; + /** * @covers Monolog\Formatter\NormalizerFormatter */ -class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase +class NormalizerFormatterTest extends TestCase { public function tearDown() { - \PHPUnit_Framework_Error_Warning::$enabled = true; + Warning::$enabled = true; return parent::tearDown(); } @@ -297,7 +300,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase { if (version_compare(PHP_VERSION, '5.5.0', '<')) { // Ignore the warning that will be emitted by PHP <5.5.0 - \PHPUnit_Framework_Error_Warning::$enabled = false; + Warning::$enabled = false; } $formatter = new NormalizerFormatter(); $reflMethod = new \ReflectionMethod($formatter, 'toJson'); @@ -316,7 +319,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase { if (version_compare(PHP_VERSION, '5.5.0', '<')) { // Ignore the warning that will be emitted by PHP <5.5.0 - \PHPUnit_Framework_Error_Warning::$enabled = false; + Warning::$enabled = false; } $formatter = new NormalizerFormatter(); $reflMethod = new \ReflectionMethod($formatter, 'toJson'); diff --git a/tests/Monolog/Formatter/ScalarFormatterTest.php b/tests/Monolog/Formatter/ScalarFormatterTest.php index 2d7e634..e396bb5 100644 --- a/tests/Monolog/Formatter/ScalarFormatterTest.php +++ b/tests/Monolog/Formatter/ScalarFormatterTest.php @@ -11,7 +11,7 @@ namespace Monolog\Formatter; -class ScalarFormatterTest extends \PHPUnit_Framework_TestCase +class ScalarFormatterTest extends \PHPUnit\Framework\TestCase { private $formatter; diff --git a/tests/Monolog/Formatter/WildfireFormatterTest.php b/tests/Monolog/Formatter/WildfireFormatterTest.php index 52f15a3..0f80b42 100644 --- a/tests/Monolog/Formatter/WildfireFormatterTest.php +++ b/tests/Monolog/Formatter/WildfireFormatterTest.php @@ -13,7 +13,7 @@ namespace Monolog\Formatter; use Monolog\Logger; -class WildfireFormatterTest extends \PHPUnit_Framework_TestCase +class WildfireFormatterTest extends \PHPUnit\Framework\TestCase { /** * @covers Monolog\Formatter\WildfireFormatter::format diff --git a/tests/Monolog/Handler/SyslogHandlerTest.php b/tests/Monolog/Handler/SyslogHandlerTest.php index 8f9e46b..5efb1a9 100644 --- a/tests/Monolog/Handler/SyslogHandlerTest.php +++ b/tests/Monolog/Handler/SyslogHandlerTest.php @@ -13,7 +13,7 @@ namespace Monolog\Handler; use Monolog\Logger; -class SyslogHandlerTest extends \PHPUnit_Framework_TestCase +class SyslogHandlerTest extends \PHPUnit\Framework\TestCase { /** * @covers Monolog\Handler\SyslogHandler::__construct diff --git a/tests/Monolog/LoggerTest.php b/tests/Monolog/LoggerTest.php index d96c7b1..94d5ee8 100644 --- a/tests/Monolog/LoggerTest.php +++ b/tests/Monolog/LoggerTest.php @@ -14,7 +14,7 @@ namespace Monolog; use Monolog\Processor\WebProcessor; use Monolog\Handler\TestHandler; -class LoggerTest extends \PHPUnit_Framework_TestCase +class LoggerTest extends \PHPUnit\Framework\TestCase { /** * @covers Monolog\Logger::getName diff --git a/tests/Monolog/Processor/PsrLogMessageProcessorTest.php b/tests/Monolog/Processor/PsrLogMessageProcessorTest.php index 957aeba..46fb69a 100644 --- a/tests/Monolog/Processor/PsrLogMessageProcessorTest.php +++ b/tests/Monolog/Processor/PsrLogMessageProcessorTest.php @@ -11,7 +11,7 @@ namespace Monolog\Processor; -class PsrLogMessageProcessorTest extends \PHPUnit_Framework_TestCase +class PsrLogMessageProcessorTest extends \PHPUnit\Framework\TestCase { /** * @dataProvider getPairs diff --git a/tests/Monolog/RegistryTest.php b/tests/Monolog/RegistryTest.php index 15fdfbd..13016f4 100644 --- a/tests/Monolog/RegistryTest.php +++ b/tests/Monolog/RegistryTest.php @@ -11,7 +11,7 @@ namespace Monolog; -class RegistryTest extends \PHPUnit_Framework_TestCase +class RegistryTest extends \PHPUnit\Framework\TestCase { protected function setUp() { diff --git a/tests/Monolog/TestCase.php b/tests/Monolog/TestCase.php index 4eb7b4c..55d1c0c 100644 --- a/tests/Monolog/TestCase.php +++ b/tests/Monolog/TestCase.php @@ -11,7 +11,7 @@ namespace Monolog; -class TestCase extends \PHPUnit_Framework_TestCase +class TestCase extends \PHPUnit\Framework\TestCase { /** * @return array Record diff --git a/tests/Monolog/UtilsTest.php b/tests/Monolog/UtilsTest.php index 428e02c..3188926 100644 --- a/tests/Monolog/UtilsTest.php +++ b/tests/Monolog/UtilsTest.php @@ -11,7 +11,7 @@ namespace Monolog; -class UtilsTest extends \PHPUnit_Framework_TestCase +class UtilsTest extends \PHPUnit\Framework\TestCase { /** * @param string $expected