Fix tests with PHPUnit

tylercd100 · Nov 27, 2020 · 55b84d7 · 55b84d7
1 parent 7452983
commit 55b84d7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/tests/ClickatellHandlerTest.php b/tests/ClickatellHandlerTest.php
@@ -14,7 +14,7 @@ class ClickatellHandlerTest extends TestCase
 
     /** @var  ClickatellHandler */
     private $handler;
-    
+
     public function testCanBeInstantiatedAndProvidesDefaultFormatter()
     {
         $handler = new ClickatellHandler('token', '+15555555555', '+16666666666');
@@ -97,11 +97,10 @@ private function createHandler($authToken = 'token', $fromNumber = '+15555555555
     {
         $constructorArgs = array($authToken, $fromNumber, $toNumber, Logger::DEBUG, true, true, $host, $version);
         $this->res = fopen('php://memory', 'a');
-        $this->handler = $this->getMock(
-            '\Tylercd100\Monolog\Handler\ClickatellHandler',
-            array('fsockopen', 'streamSetTimeout', 'closeSocket'),
-            $constructorArgs
-        );
+        $this->handler = $this->getMockBuilder(ClickatellHandler::class)
+            ->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
+            ->setConstructorArgs($constructorArgs)
+            ->getMock();
 
         $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
         $reflectionProperty->setAccessible(true);

diff --git a/tests/PlivoHandlerTest.php b/tests/PlivoHandlerTest.php
@@ -13,7 +13,7 @@ class PlivoHandlerTest extends TestCase
     private $res;
     /** @var  PlivoHandler */
     private $handler;
-    
+
     public function testCanBeInstantiatedAndProvidesDefaultFormatter()
     {
         $handler = new PlivoHandler('token', 'auth_id', '+15555555555', '+16666666666');
@@ -97,11 +97,10 @@ private function createHandler($authToken = 'token', $authId = 'auth_id', $fromN
     {
         $constructorArgs = array($authToken, $authId, $fromNumber, $toNumber, Logger::DEBUG, true, true, $host, $version);
         $this->res = fopen('php://memory', 'a');
-        $this->handler = $this->getMock(
-            '\Tylercd100\Monolog\Handler\PlivoHandler',
-            array('fsockopen', 'streamSetTimeout', 'closeSocket'),
-            $constructorArgs
-        );
+        $this->handler = $this->getMockBuilder(PlivoHandler::class)
+            ->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
+            ->setConstructorArgs($constructorArgs)
+            ->getMock();
 
         $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
         $reflectionProperty->setAccessible(true);

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -12,6 +12,7 @@
 namespace Tylercd100\Monolog\Tests;
 
 use Monolog\Logger;
+use Monolog\Formatter\FormatterInterface;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {
@@ -50,7 +51,7 @@ protected function getMultipleRecords()
      */
     protected function getIdentityFormatter()
     {
-        $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
+        $formatter = $this->getMockBuilder(FormatterInterface::class)->getMock();
         $formatter->expects($this->any())
             ->method('format')
             ->will($this->returnCallback(function ($record) { return $record['message']; }));

diff --git a/tests/TwilioHandlerTest.php b/tests/TwilioHandlerTest.php
@@ -13,7 +13,7 @@ class TwilioHandlerTest extends TestCase
     private $res;
     /** @var  TwilioHandler */
     private $handler;
-    
+
     public function testCanBeInstantiatedAndProvidesDefaultFormatter()
     {
         $handler = new TwilioHandler('token', 'auth_id', '+15555555555', '+16666666666');
@@ -97,11 +97,10 @@ private function createHandler($authToken = 'token', $authId = 'auth_id', $fromN
     {
         $constructorArgs = array($authToken, $authId, $fromNumber, $toNumber, Logger::DEBUG, true, true, $host, $version);
         $this->res = fopen('php://memory', 'a');
-        $this->handler = $this->getMock(
-            '\Tylercd100\Monolog\Handler\TwilioHandler',
-            array('fsockopen', 'streamSetTimeout', 'closeSocket'),
-            $constructorArgs
-        );
+        $this->handler = $this->getMockBuilder(TwilioHandler::class)
+            ->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
+            ->setConstructorArgs($constructorArgs)
+            ->getMock();
 
         $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
         $reflectionProperty->setAccessible(true);