Merge pull request #25 from mikehaertl/fix-travis

Migrate tests to phpunit > 6 and remove PHP 5.3 and HHVM tests

Author: mikehaertl

Diff for: .travis.yml

@@ -1,11 +1,11 @@
 language: php
+dist: trusty
 php:
   - "7.1"
   - "7.0"
   - "5.6"
   - "5.5"
   - "5.4"
-  - "5.3"
-  - "hhvm"
 install:
+  - composer self-update
   - composer install

Diff for: README.md

@@ -5,7 +5,6 @@ php-shellcommand
 [![Latest Stable Version](https://poser.pugx.org/mikehaertl/php-shellcommand/v/stable.svg)](https://packagist.org/packages/mikehaertl/php-shellcommand)
 [![Total Downloads](https://poser.pugx.org/mikehaertl/php-shellcommand/downloads)](https://packagist.org/packages/mikehaertl/php-shellcommand)
 [![Latest Unstable Version](https://poser.pugx.org/mikehaertl/php-shellcommand/v/unstable.svg)](https://packagist.org/packages/mikehaertl/php-shellcommand)
-[![HHVM Status](http://hhvm.h4cc.de/badge/mikehaertl/php-shellcommand.png)](http://hhvm.h4cc.de/package/mikehaertl/php-shellcommand)
 [![License](https://poser.pugx.org/mikehaertl/php-shellcommand/license.svg)](https://packagist.org/packages/mikehaertl/php-shellcommand)
 
 php-shellcommand provides a simple object oriented interface to execute shell commands.

Diff for: phpunit.xml.dist

@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="vendor/autoload.php"
+         bootstrap="./tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="PHP Shell Command Test Suite">

Diff for: tests/CommandTest.php

@@ -1,7 +1,7 @@
 <?php
 use mikehaertl\shellcommand\Command;
 
-class CommandTest extends \PHPUnit_Framework_TestCase
+class CommandTest extends \PHPUnit\Framework\TestCase
 {
     public function setUp()
     {
@@ -119,13 +119,13 @@ public function testCanRunCommandWithArguments()
     public function testCanRunValidCommand()
     {
         $dir = __DIR__;
-        $command = new Command("/bin/ls $dir");
+        $command = new Command("/bin/ls $dir/Command*");
 
         $this->assertFalse($command->getExecuted());
         $this->assertTrue($command->execute());
         $this->assertTrue($command->getExecuted());
-        $this->assertEquals("CommandTest.php", $command->getOutput());
-        $this->assertEquals("CommandTest.php\n", $command->getOutput(false));
+        $this->assertEquals("$dir/CommandTest.php", $command->getOutput());
+        $this->assertEquals("$dir/CommandTest.php\n", $command->getOutput(false));
         $this->assertEmpty($command->getError());
         $this->assertEmpty($command->getStdErr());
         $this->assertEquals(0, $command->getExitCode());
@@ -170,13 +170,13 @@ public function testCanCastToString()
     public function testCanRunValidCommandWithExec()
     {
         $dir = __DIR__;
-        $command = new Command("/bin/ls $dir");
+        $command = new Command("/bin/ls $dir/Command*");
         $command->useExec = true;
 
         $this->assertFalse($command->getExecuted());
         $this->assertTrue($command->execute());
         $this->assertTrue($command->getExecuted());
-        $this->assertEquals("CommandTest.php", $command->getOutput());
+        $this->assertEquals("$dir/CommandTest.php", $command->getOutput());
         $this->assertEmpty($command->getError());
         $this->assertEmpty($command->getStdErr());
         $this->assertEquals(0, $command->getExitCode());

Diff for: tests/bootstrap.php

@@ -0,0 +1,10 @@
+<?php
+// Some travis environments use phpunit > 6
+$newClass = '\PHPUnit\Framework\TestCase';
+$oldClass = '\PHPUnit_Framework_TestCase';
+if (!class_exists($newClass) && class_exists($oldClass)) {
+    class_alias($oldClass, $newClass);
+}
+
+require __DIR__ . '/../vendor/autoload.php';
+