Merge pull request #8 from GenieTim/jkudish-master

Fix tests for upgraded dependencies

Author: GenieTim

.travis.yml

@@ -3,8 +3,9 @@ sudo: false
 language: php
 
 php:
-    - 7.1
     - 7.2
+    - 7.3
+    - 7.4
 
 matrix:
   fast_finish: true
@@ -14,5 +15,5 @@ before_script: composer install
 script: ./bin/phpunit --coverage-clover=coverage.clover
 
 after_script:
-  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - wget https://scrutinizer-ci.com/ocular.phar;
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover;

composer.json

@@ -22,18 +22,18 @@
     }
   ],
   "require": {
-    "php": "^7.1.3",
+    "php": "^7.2",
     "ext-curl": "*",
     "jms/serializer": "^1.0|^2.0|^3.0",
-    "symfony/event-dispatcher": "^2.3|^3.0|^4.0|^5.0",
+    "guzzlehttp/guzzle": "^6.0|^7.0",
+    "symfony/event-dispatcher": "^4.0|^5.0",
     "symfony/yaml": "^2.3|^3.0|^4.0|^5.0",
-    "guzzlehttp/guzzle": "^6.0",
     "doctrine/collections": "^1.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0|^8.0",
+    "phpunit/phpunit": "^7.0|^8.0|^9.0",
     "mockery/mockery": "^1.0",
-    "symfony/var-dumper": "^2.3|^3.0|^4.0"
+    "symfony/var-dumper": "^2.3|^3.0|^4.0|^5.0"
   },
   "suggest": {
     "hnhdigital-os//laravel-slack-api": "For easy integration with your Laravel projects"

phpunit.xml.dist

@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.7/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-  >
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>./src/CL/Slack/</directory>
+    </include>
+    <exclude>
+      <directory>./src/CL/Slack/Resources</directory>
+    </exclude>
+  </coverage>
   <testsuites>
     <testsuite name="Slack Test Suite">
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
-
   <!--<listeners>
     <listener class="Mockery\Adapter\Phpunit\TestListener"/>
   </listeners>-->
-
-  <filter>
-    <whitelist>
-      <directory>./src/CL/Slack/</directory>
-      <exclude>
-        <directory>./src/CL/Slack/Resources</directory>
-      </exclude>
-    </whitelist>
-  </filter>
 </phpunit>

src/Transport/ApiClient.php

@@ -232,7 +232,7 @@ private function doSend($method, array $data, $token = null)
         try {
             $data['token'] = $token ?: $this->token;
 
-            $this->eventDispatcher->dispatch(self::EVENT_REQUEST, new RequestEvent($data));
+            $this->eventDispatcher->dispatch(new RequestEvent($data), self::EVENT_REQUEST);
 
             $request = $this->createRequest($method, $data);
 
@@ -255,7 +255,7 @@ private function doSend($method, array $data, $token = null)
                 ));
             }
 
-            $this->eventDispatcher->dispatch(self::EVENT_RESPONSE, new ResponseEvent($responseData));
+            $this->eventDispatcher->dispatch(new ResponseEvent($responseData), self::EVENT_RESPONSE);
 
             return $responseData;
         } catch (\Exception $e) {

src/Transport/Events/RequestEvent.php

@@ -11,7 +11,8 @@
 
 namespace CL\Slack\Transport\Events;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
+
 
 /**
  * @author Cas Leentfaar <[email protected]>

src/Transport/Events/ResponseEvent.php

@@ -11,7 +11,7 @@
 
 namespace CL\Slack\Transport\Events;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * @author Cas Leentfaar <[email protected]>