Просмотр исходного кода

Remove assertInternalType that it is deprecated

George Mponos 7 лет назад
Родитель
Сommit
ee350961da

+ 1 - 1
tests/Monolog/Formatter/ElasticsearchFormatterTest.php

@@ -45,7 +45,7 @@ class ElasticsearchFormatterTest extends \PHPUnit\Framework\TestCase
         // Format log message
         $formatter = new ElasticsearchFormatter('my_index', 'doc_type');
         $doc = $formatter->format($msg);
-        $this->assertInternalType('array', $doc);
+        $this->assertIsArray($doc);
 
         // Record parameters
         $this->assertEquals('my_index', $doc['_index']);

+ 3 - 3
tests/Monolog/Formatter/MongoDBFormatterTest.php

@@ -122,9 +122,9 @@ class MongoDBFormatterTest extends \PHPUnit\Framework\TestCase
         $this->assertCount(5, $formattedRecord['context']['except']);
         $this->assertEquals('exception message', $formattedRecord['context']['except']['message']);
         $this->assertEquals(987, $formattedRecord['context']['except']['code']);
-        $this->assertInternalType('string', $formattedRecord['context']['except']['file']);
-        $this->assertInternalType('integer', $formattedRecord['context']['except']['code']);
-        $this->assertInternalType('string', $formattedRecord['context']['except']['trace']);
+        $this->assertIsString($formattedRecord['context']['except']['file']);
+        $this->assertIsInt($formattedRecord['context']['except']['code']);
+        $this->assertIsString($formattedRecord['context']['except']['trace']);
         $this->assertEquals('Exception', $formattedRecord['context']['except']['class']);
     }
 

+ 2 - 2
tests/Monolog/Handler/NativeMailerHandlerTest.php

@@ -87,7 +87,7 @@ class NativeMailerHandlerTest extends TestCase
         // non-empty batch
         $mailer->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
         $this->assertNotEmpty($GLOBALS['mail']);
-        $this->assertInternalType('array', $GLOBALS['mail']);
+        $this->assertIsArray($GLOBALS['mail']);
         $this->assertArrayHasKey('0', $GLOBALS['mail']);
         $params = $GLOBALS['mail'][0];
         $this->assertCount(5, $params);
@@ -103,7 +103,7 @@ class NativeMailerHandlerTest extends TestCase
         $mailer = new NativeMailerHandler('to@example.org', 'Alert: %level_name% %message%', 'from@example.org');
         $mailer->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
         $this->assertNotEmpty($GLOBALS['mail']);
-        $this->assertInternalType('array', $GLOBALS['mail']);
+        $this->assertIsArray($GLOBALS['mail']);
         $this->assertArrayHasKey('0', $GLOBALS['mail']);
         $params = $GLOBALS['mail'][0];
         $this->assertCount(5, $params);

+ 1 - 1
tests/Monolog/Handler/RavenHandlerTest.php

@@ -138,7 +138,7 @@ class RavenHandlerTest extends TestCase
 
         // check to see if its reset
         $handler->handle($recordWithNoContext);
-        $this->assertInternalType('array', $ravenClient->context->user);
+        $this->assertIsArray($ravenClient->context->user);
         $this->assertSame('test_user_id', $ravenClient->context->user['id']);
 
         // handle with null context

+ 2 - 2
tests/Monolog/Handler/Slack/SlackRecordTest.php

@@ -157,7 +157,7 @@ class SlackRecordTest extends TestCase
 
         $this->assertArrayHasKey('attachments', $data);
         $this->assertArrayHasKey(0, $data['attachments']);
-        $this->assertInternalType('array', $data['attachments'][0]);
+        $this->assertIsArray($data['attachments'][0]);
     }
 
     public function testTextEqualsMessageIfNoAttachment()
@@ -362,7 +362,7 @@ class SlackRecordTest extends TestCase
         $record = $this->getRecord(Logger::CRITICAL, 'This is a critical message.', array('exception' => new \Exception()));
         $slackRecord = new SlackRecord(null, null, true, null, false, true);
         $data = $slackRecord->getSlackData($record);
-        $this->assertInternalType('string', $data['attachments'][0]['fields'][1]['value']);
+        $this->assertIsString($data['attachments'][0]['fields'][1]['value']);
     }
 
     public function testExcludeExtraAndContextFields()

+ 3 - 2
tests/Monolog/Handler/SocketHandlerTest.php

@@ -13,6 +13,7 @@ namespace Monolog\Handler;
 
 use Monolog\Test\TestCase;
 use Monolog\Logger;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @author Pablo de Leon Belloc <pablolb@gmail.com>
@@ -20,7 +21,7 @@ use Monolog\Logger;
 class SocketHandlerTest extends TestCase
 {
     /**
-     * @var Monolog\Handler\SocketHandler
+     * @var \Monolog\Handler\SocketHandler|MockObject
      */
     private $handler;
 
@@ -247,7 +248,7 @@ class SocketHandlerTest extends TestCase
     {
         $this->setMockHandler();
         $this->writeRecord('Hello world');
-        $this->assertInternalType('resource', $this->res);
+        $this->assertIsResource($this->res);
         $this->handler->close();
         $this->assertFalse(is_resource($this->res), "Expected resource to be closed after closing handler");
     }

+ 1 - 1
tests/Monolog/Processor/HostnameProcessorTest.php

@@ -23,7 +23,7 @@ class HostnameProcessorTest extends TestCase
         $processor = new HostnameProcessor();
         $record = $processor($this->getRecord());
         $this->assertArrayHasKey('hostname', $record['extra']);
-        $this->assertInternalType('string', $record['extra']['hostname']);
+        $this->assertIsString($record['extra']['hostname']);
         $this->assertNotEmpty($record['extra']['hostname']);
         $this->assertEquals(gethostname(), $record['extra']['hostname']);
     }

+ 1 - 1
tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php

@@ -36,7 +36,7 @@ class MemoryPeakUsageProcessorTest extends TestCase
         $processor = new MemoryPeakUsageProcessor(true, false);
         $record = $processor($this->getRecord());
         $this->assertArrayHasKey('memory_peak_usage', $record['extra']);
-        $this->assertInternalType('int', $record['extra']['memory_peak_usage']);
+        $this->assertIsInt($record['extra']['memory_peak_usage']);
         $this->assertGreaterThan(0, $record['extra']['memory_peak_usage']);
     }
 }

+ 1 - 1
tests/Monolog/Processor/MemoryUsageProcessorTest.php

@@ -36,7 +36,7 @@ class MemoryUsageProcessorTest extends TestCase
         $processor = new MemoryUsageProcessor(true, false);
         $record = $processor($this->getRecord());
         $this->assertArrayHasKey('memory_usage', $record['extra']);
-        $this->assertInternalType('int', $record['extra']['memory_usage']);
+        $this->assertIsInt($record['extra']['memory_usage']);
         $this->assertGreaterThan(0, $record['extra']['memory_usage']);
     }
 }

+ 1 - 1
tests/Monolog/Processor/ProcessIdProcessorTest.php

@@ -23,7 +23,7 @@ class ProcessIdProcessorTest extends TestCase
         $processor = new ProcessIdProcessor();
         $record = $processor($this->getRecord());
         $this->assertArrayHasKey('process_id', $record['extra']);
-        $this->assertInternalType('int', $record['extra']['process_id']);
+        $this->assertIsInt($record['extra']['process_id']);
         $this->assertGreaterThan(0, $record['extra']['process_id']);
         $this->assertEquals(getmypid(), $record['extra']['process_id']);
     }