Merge pull request #4 from BernhardWebstudio/master

Upgrade dependencies, including phpunit

Author: RoccoHoward

.gitignore

@@ -2,3 +2,5 @@
 /composer.lock
 /bin/*
 /vendor/*
+
+.phpunit.result.cache

composer.json

@@ -24,14 +24,14 @@
   "require": {
     "php": "^7.1.3",
     "ext-curl": "*",
-    "jms/serializer": "^1.0",
+    "jms/serializer": "^1.0|^2.0|^3.0",
     "symfony/event-dispatcher": "^2.3|^3.0|^4.0",
     "symfony/yaml": "^2.3|^3.0|^4.0",
     "guzzlehttp/guzzle": "^6.0",
     "doctrine/collections": "^1.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0",
+    "phpunit/phpunit": "^7.0|^8.0",
     "mockery/mockery": "^1.0",
     "symfony/var-dumper": "^2.3|^3.0|^4.0"
   },

tests/Tests/Model/AbstractModelTest.php

@@ -31,7 +31,7 @@ abstract class AbstractModelTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $metaDir = __DIR__ . '/../../../src/Resources/config/serializer';
         $this->serializer = SerializerBuilder::create()->addMetadataDir($metaDir)->build();

tests/Tests/Payload/AbstractPayloadResponseTestCase.php

@@ -27,7 +27,7 @@ abstract class AbstractPayloadResponseTestCase extends \PHPUnit\Framework\TestCa
      */
     private $serializer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->serializer = new PayloadResponseSerializer();
     }

tests/Tests/Payload/AbstractPayloadTestCase.php

@@ -24,7 +24,7 @@ abstract class AbstractPayloadTestCase extends \PHPUnit\Framework\TestCase
      */
     private $payloadSerializer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->payloadSerializer = new PayloadSerializer();
     }
@@ -36,7 +36,7 @@ public function it_can_be_serialized()
     {
         $payload = $this->createPayload();
 
-        $this->assertInternalType('string', $payload->getMethod());
+        $this->assertIsString($payload->getMethod());
         $this->assertTrue(class_exists($payload->getResponseClass()));
 
         $expectedPayloadSerialized = json_encode($this->getExpectedPayloadData($payload));

tests/Tests/Payload/AbstractSearchPayloadResponseTest.php

@@ -27,7 +27,7 @@ abstract class AbstractSearchPayloadResponseTest extends \PHPUnit\Framework\Test
      */
     private $serializer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->serializer = new PayloadResponseSerializer();
     }
@@ -50,7 +50,7 @@ public function it_can_be_deserialized()
         $this->assertEquals($responseData['ok'], $actualPayloadResponse->isOk());
         if (array_key_exists('error', $responseData)) {
             $this->assertEquals($responseData['error'], $actualPayloadResponse->getError());
-            $this->assertInternalType('string', $actualPayloadResponse->getErrorExplanation());
+            $this->assertIsString($actualPayloadResponse->getErrorExplanation());
         }
         $this->assertResponse($responseData, $actualPayloadResponse);
     }

tests/Tests/Serializer/PayloadResponseSerializerTest.php

@@ -24,7 +24,7 @@ class PayloadResponseSerializerTest extends \PHPUnit\Framework\TestCase
      */
     private $payloadResponseSerializer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->payloadResponseSerializer = new PayloadResponseSerializer();
     }

tests/Tests/Serializer/PayloadSerializerTest.php

@@ -24,7 +24,7 @@ class PayloadSerializerTest extends \PHPUnit\Framework\TestCase
      */
     private $payloadSerializer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->payloadSerializer = new PayloadSerializer();
     }
@@ -39,7 +39,7 @@ public function it_can_be_serialized()
 
         $serializedPayload = $this->payloadSerializer->serialize($payload);
 
-        $this->assertInternalType('array', $serializedPayload);
+        $this->assertIsArray($serializedPayload);
         $this->assertArrayHasKey('fruit', $serializedPayload);
         $this->assertEquals($payload->getFruit(), $serializedPayload['fruit']);
     }

tests/Tests/Transport/ApiClientTest.php

@@ -22,6 +22,7 @@
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Response;
 use Mockery as Mock;
+use CL\Slack\Exception\SlackException;
 
 /**
  * @author Cas Leentfaar <[email protected]>
@@ -52,6 +53,7 @@ public function it_can_send_a_payload()
             new Client(['handler' => $handler])
         );
 
+        $eventsDispatched = [];
         $apiClient->addRequestListener(function (RequestEvent $event) use (&$eventsDispatched, $mockRequestData, $self) {
             $eventsDispatched[ApiClient::EVENT_REQUEST] = true;
             $self->assertEquals($mockRequestData, $event->getRawPayload());
@@ -68,7 +70,7 @@ public function it_can_send_a_payload()
         $apiClient->send($payload);
 
         $transaction = $historyContainer[0];
-        $requestUrl = (string) $transaction['request']->getUri();
+        $requestUrl = (string)$transaction['request']->getUri();
         $requestContentType = $transaction['request']->getHeader('content-type')[0];
         parse_str($transaction['request']->getBody(), $requestBody);
         $responseBody = json_decode($transaction['response']->getBody(), true);
@@ -85,11 +87,11 @@ public function it_can_send_a_payload()
     /**
      * @test
      *
-     * @expectedException \CL\Slack\Exception\SlackException
-     * @expectedExceptionMessage You must supply a token to send a payload, since you did not provide one during construction
      */
     public function it_can_not_send_a_payload_without_a_token()
     {
+        $this->expectException(SlackException::class);
+        $this->expectExceptionMessage("You must supply a token to send a payload, since you did not provide one during construction");
         /* @var PayloadInterface|Mock\MockInterface $mockPayload */
         $mockPayload = Mock::mock(PayloadInterface::class);