Up lowes PHPUnit version to 4.8.36 (first supports PHPUnit 6 FC). Rew…

…rite tests to use PHPUnit in 6.x style instead of 4.x
stecman · Oct 22, 2017 · e0fc0af · e0fc0af
1 parent 567a0dc
commit e0fc0af
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "symfony/console": "~2.3 || ~3.0 || ~4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.4 || ~5.7 || ~6.4"
+        "phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/Stecman/Component/Symfony/Console/BashCompletion/Common/CompletionHandlerTestCase.php b/tests/Stecman/Component/Symfony/Console/BashCompletion/Common/CompletionHandlerTestCase.php
@@ -2,14 +2,15 @@
 
 namespace Stecman\Component\Symfony\Console\BashCompletion\Tests\Common;
 
+use PHPUnit\Framework\TestCase;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionHandler;
 use Symfony\Component\Console\Application;
 
 /**
  * Base test case for running CompletionHandlers
  */
-abstract class CompletionHandlerTestCase extends \PHPUnit_Framework_TestCase
+abstract class CompletionHandlerTestCase extends TestCase
 {
     /**
      * @var Application

diff --git a/tests/Stecman/Component/Symfony/Console/BashCompletion/CompletionContextTest.php b/tests/Stecman/Component/Symfony/Console/BashCompletion/CompletionContextTest.php
@@ -2,10 +2,11 @@
 
 namespace Stecman\Component\Symfony\Console\BashCompletion\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Stecman\Component\Symfony\Console\BashCompletion\EnvironmentCompletionContext;
 
-class CompletionContextTest extends \PHPUnit_Framework_TestCase
+class CompletionContextTest extends TestCase
 {
 
     public function testWordBreakSplit()

diff --git a/tests/Stecman/Component/Symfony/Console/BashCompletion/HookFactoryTest.php b/tests/Stecman/Component/Symfony/Console/BashCompletion/HookFactoryTest.php
@@ -2,9 +2,10 @@
 
 namespace Stecman\Component\Symfony\Console\BashCompletion\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Stecman\Component\Symfony\Console\BashCompletion\HookFactory;
 
-class HookFactoryTest extends \PHPUnit_Framework_TestCase
+class HookFactoryTest extends TestCase
 {
     /**
      * @var HookFactory
@@ -91,9 +92,7 @@ protected function assertSyntaxIsValid($code, $syntaxCheckCommand, $context)
 
             $status = proc_close($process);
 
-            if ($status !== 0) {
-                $this->fail("Syntax check for $context failed:\n$output");
-            }
+            $this->assertSame(0, $status, "Syntax check for $context failed:\n$output");
         } else {
             throw new \RuntimeException("Failed to start process with command '$syntaxCheckCommand'");
         }