Make sure latest version works on both PHP 5.6 and 7 (#42)

ademarco · lstrojny · commit f7e727d9d694 · 2017-12-21T11:36:56.000+01:00
* Remove PHP 7 dependency. * Fix dependencies. * Revert "PHPUnit 6" This reverts commit 6c01f56. * Fix Composer versions and revert commit. * Fix PHPUnit version. * Fix fatal error tests for both PHP 7 and 5.6. * Revert "Revert "PHPUnit 6"" This reverts commit 05d95cf. * Fix tests. * Revert "Fix tests." This reverts commit 5dda0a9. * Revert "Revert "Revert "PHPUnit 6""" This reverts commit 072b6bb. * Revert "Revert "Revert "Revert "PHPUnit 6"""" This reverts commit 62230ac. * Revert "Revert "Fix tests."" This reverts commit c0a5a04. * Allow both PHPUnit 5 and 6. * Restore tests for PHP7 and fix dev dependencies. * Update HttpMockMultiPHPUnitIntegrationTest.php
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,10 @@
 language: php
 
 php:
+  - 5.6
   - 7.0
   - 7.1
   - 7.2
-  - nightly
-  - hhvm
-
-matrix:
-  allow_failures:
-    - php: hhvm
 
 before_script:
   - composer install
diff --git a/composer.json b/composer.json
@@ -13,17 +13,17 @@
         }
     ],
      "require": {
-        "php": "~7",
         "silex/silex": "~2.0",
         "guzzle/guzzle": "*",
         "symfony/process": "~3",
         "jeremeamia/superclosure": "~2",
         "lstrojny/hmmmath": ">=0.5.0"
     },
     "require-dev": {
-        "internations/kodierungsregelwerksammlung": "0.24.1",
+        "internations/kodierungsregelwerksammlung": "~0.23.0",
         "internations/testing-component": "1.0.1",
-        "phpunit/phpunit": "6.0"
+        "phpunit/phpunit": "^5.7|^6",
+        "phpunit/phpunit-mock-objects": "^3|^4"
     },
     "autoload": {
         "psr-4": {"InterNations\\Component\\HttpMock\\": "src/"}
diff --git a/tests/PHPUnit/HttpMockMultiPHPUnitIntegrationTest.php b/tests/PHPUnit/HttpMockMultiPHPUnitIntegrationTest.php
@@ -3,7 +3,6 @@
 
 use InterNations\Component\Testing\AbstractTestCase;
 use InterNations\Component\HttpMock\PHPUnit\HttpMockTrait;
-use PHPUnit\Framework\ExpectationFailedException;
 use Symfony\Component\HttpFoundation\Response;
 use PHPUnit\Framework\TestCase;
 
@@ -103,7 +102,7 @@ public function testErrorLogOutput()
         try {
             $this->tearDown();
             $this->fail('Exception expected');
-        } catch (ExpectationFailedException $e) {
+        } catch (\Exception $e) {
             $this->assertContains('HTTP mock server standard error output should be empty', $e->getMessage());
         }
     }
diff --git a/tests/PHPUnit/HttpMockPHPUnitIntegrationTest.php b/tests/PHPUnit/HttpMockPHPUnitIntegrationTest.php
@@ -3,7 +3,6 @@
 
 use InterNations\Component\HttpMock\PHPUnit\HttpMockTrait;
 use InterNations\Component\Testing\AbstractTestCase;
-use PHPUnit\Framework\ExpectationFailedException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use PHPUnit\Framework\TestCase;
@@ -103,7 +102,7 @@ public function testErrorLogOutput()
         try {
             $this->tearDown();
             $this->fail('Exception expected');
-        } catch (ExpectationFailedException $e) {
+        } catch (\Exception $e) {
             $this->assertContains('HTTP mock server standard error output should be empty', $e->getMessage());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`use InterNations\Component\Testing\AbstractTestCase;`
`5`	`5`	`use InterNations\Component\HttpMock\PHPUnit\HttpMockTrait;`
`6`		`-use PHPUnit\Framework\ExpectationFailedException;`
`7`	`6`	`use Symfony\Component\HttpFoundation\Response;`
`8`	`7`	`use PHPUnit\Framework\TestCase;`
`9`	`8`
`@@ -103,7 +102,7 @@ public function testErrorLogOutput()`
`103`	`102`	`try {`
`104`	`103`	`$this->tearDown();`
`105`	`104`	`$this->fail('Exception expected');`
`106`		`- } catch (ExpectationFailedException $e) {`
	`105`	`+ } catch (\Exception $e) {`
`107`	`106`	`$this->assertContains('HTTP mock server standard error output should be empty', $e->getMessage());`
`108`	`107`	`}`
`109`	`108`	`}`