Merge pull request #11 from SimonFrings/tests

Clean up test suite, add .gitattributes to exclude dev files from exports and run tests on PHP 7.4 and simplify test matrix
clue · Jun 4, 2020 · 7ca296d · 7ca296d
2 parents a0d51f6 + f2db88d
commit 7ca296d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/examples/ export-ignore
+/phpunit.xml.dist export-ignore
+/tests/ export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,4 @@
 language: php
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - hhvm # ignore errors, see below
 
 # lock distro so future defaults will not break the build
 dist: trusty
@@ -16,8 +7,17 @@ matrix:
   include:
     - php: 5.3
       dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+    - php: hhvm-3.18
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
 
 sudo: false
 

diff --git a/composer.json b/composer.json
@@ -13,13 +13,16 @@
     "autoload": {
         "psr-4": { "Clue\\React\\Ssdp\\": "src/" }
     },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Ssdp\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "clue/multicast-react": "^1.0 || ^0.2",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
         "react/promise": "^2.0 || ^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^7.0 ||^6.0 || ^5.7 || ^4.8.35"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="SSDP Test Suite">
             <directory>./tests/</directory>

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Ssdp;
+
 use Clue\React\Ssdp\Client;
 use React\EventLoop\Factory;
 
@@ -37,7 +39,7 @@ interface_exists('React\EventLoop\TimerInterface') ? 'React\EventLoop\TimerInter
 
         $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
 
-        if (!($promise instanceof React\Promise\CancellablePromiseInterface)) {
+        if (!($promise instanceof \React\Promise\CancellablePromiseInterface)) {
             $this->markTestSkipped();
         }
 

diff --git a/tests/bootstrap.php → tests/TestCase.php b/tests/bootstrap.php → tests/TestCase.php
@@ -1,8 +1,8 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
+namespace Clue\Tests\React\Ssdp;
 
-class TestCase extends PHPUnit\Framework\TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     protected function expectCallableOnce()
     {