Update travis.

Signed-off-by: crynobone <[email protected]>
orchestral · Apr 13, 2017 · b26ad99 · b26ad99
1 parent 6075a4f
commit b26ad99
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,8 @@ before_script:
   - if [[ $setup = 'coveralls' ]]; then travis_retry composer require "satooshi/php-coveralls=~0.7" --prefer-dist --no-interaction --dev; fi
 
 script:
-  - if [[ $coverage = 'yes' ]]; then phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml; fi
-  - if [[ $coverage = 'no' ]]; then phpunit -c phpunit.xml; fi
+  - if [[ $coverage = 'yes' ]]; then vendor/bin/phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml; fi
+  - if [[ $coverage = 'no' ]]; then vendor/bin/phpunit -c phpunit.xml; fi
 
 after_script:
   - if [[ $setup = 'coveralls' ]]; then php vendor/bin/coveralls -v; fi

diff --git a/composer.json b/composer.json
@@ -31,7 +31,8 @@
         "illuminate/routing": "~5.3.0",
         "illuminate/session": "~5.3.0",
         "mockery/mockery": "^0.9.4",
-        "paragonie/random_compat": "~1.1"
+        "paragonie/random_compat": "~1.1",
+        "phpunit/phpunit": "~5.7"
     },
     "replace": {
         "orchestra/support-core": "self.version",

diff --git a/tests/ArrTest.php b/tests/ArrTest.php
@@ -3,8 +3,9 @@
 namespace Orchestra\Support\TestCase;
 
 use Orchestra\Support\Arr;
+use PHPUnit\Framework\TestCase;
 
-class ArrTest extends \PHPUnit_Framework_TestCase
+class ArrTest extends TestCase
 {
     public function testExpand()
     {

diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
@@ -2,9 +2,10 @@
 
 namespace Orchestra\Support\TestCase;
 
+use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Collection;
 
-class CollectionTest extends \PHPUnit_Framework_TestCase
+class CollectionTest extends TestCase
 {
     /**
      * Test Orchestra\Support\Collection::toCsv() method.

diff --git a/tests/ExpressionTest.php b/tests/ExpressionTest.php
@@ -2,9 +2,10 @@
 
 namespace Orchestra\Support\TestCase;
 
+use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Expression;
 
-class ExpressionTest extends \PHPUnit_Framework_TestCase
+class ExpressionTest extends TestCase
 {
     /**
      * Test constructing Orchestra\Support\Expression.

diff --git a/tests/KeywordTest.php b/tests/KeywordTest.php
@@ -3,8 +3,9 @@
 namespace Orchestra\Support\TestCase;
 
 use Orchestra\Support\Keyword;
+use PHPUnit\Framework\TestCase;
 
-class KeywordTest extends \PHPUnit_Framework_TestCase
+class KeywordTest extends TestCase
 {
     /**
      * Test Orchestra\Support\Keyword signature.

diff --git a/tests/ManagerTest.php b/tests/ManagerTest.php
@@ -3,8 +3,9 @@
 namespace Orchestra\Support\TestCase;
 
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class ManagerTest extends \PHPUnit_Framework_TestCase
+class ManagerTest extends TestCase
 {
     /**
      * Teardown the test environment.

diff --git a/tests/MorphTest.php b/tests/MorphTest.php
@@ -2,7 +2,9 @@
 
 namespace Orchestra\Support\TestCase;
 
-class MorphTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class MorphTest extends TestCase
 {
     /**
      * Test MorphStub::connect() return foo_connect().

diff --git a/tests/NestyTest.php b/tests/NestyTest.php
@@ -2,11 +2,12 @@
 
 namespace Orchestra\Support\TestCase;
 
+use Orchestra\Support\Nesty;
 use Illuminate\Support\Fluent;
+use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Collection;
-use Orchestra\Support\Nesty;
 
-class NestyTest extends \PHPUnit_Framework_TestCase
+class NestyTest extends TestCase
 {
     /**
      * Stub instance.

diff --git a/tests/Providers/MiddlewareServiceProviderTest.php b/tests/Providers/MiddlewareServiceProviderTest.php
@@ -3,10 +3,11 @@
 namespace Orchestra\Support\TestCase\Providers;
 
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 use Illuminate\Container\Container;
 use Orchestra\Support\Providers\MiddlewareServiceProvider;
 
-class MiddlewareServiceProviderTest extends \PHPUnit_Framework_TestCase
+class MiddlewareServiceProviderTest extends TestCase
 {
     /**
      * Teardown the test environment.

diff --git a/tests/Providers/ServiceProviderTest.php b/tests/Providers/ServiceProviderTest.php
@@ -2,9 +2,10 @@
 
 namespace Orchestra\Support\TestCase\Providers;
 
+use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Providers\ServiceProvider;
 
-class ServiceProviderTest extends \PHPUnit_Framework_TestCase
+class ServiceProviderTest extends TestCase
 {
     /**
      * Test Orchestra\Support\Providers\PipelineServiceProvider method signature.

diff --git a/tests/Providers/Traits/PackageProviderTest.php b/tests/Providers/Traits/PackageProviderTest.php
@@ -3,10 +3,11 @@
 namespace Orchestra\Support\TestCase\Providers\Traits;
 
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 use Illuminate\Container\Container;
 use Orchestra\Support\Providers\Traits\PackageProvider;
 
-class PackageProviderTest extends \PHPUnit_Framework_TestCase
+class PackageProviderTest extends TestCase
 {
     use PackageProvider;
 

diff --git a/tests/StrTest.php b/tests/StrTest.php
@@ -3,8 +3,9 @@
 namespace Orchestra\Support\TestCase;
 
 use Orchestra\Support\Str;
+use PHPUnit\Framework\TestCase;
 
-class StrTest extends \PHPUnit_Framework_TestCase
+class StrTest extends TestCase
 {
     /**
      * Test Authorize\Str::humanize() method.

diff --git a/tests/Traits/MacroableTraitTest.php b/tests/Traits/MacroableTraitTest.php
@@ -2,9 +2,10 @@
 
 namespace Orchestra\Support\TestCase\Traits;
 
+use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Traits\MacroableTrait;
 
-class MacroableTraitTest extends \PHPUnit_Framework_TestCase
+class MacroableTraitTest extends TestCase
 {
     /**
      * Test \Orchestra\Support\Traits\MacroableTrait is executable.

diff --git a/tests/Traits/ObservableTraitTest.php b/tests/Traits/ObservableTraitTest.php
@@ -3,9 +3,10 @@
 namespace Orchestra\Support\TestCase\Traits;
 
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Traits\ObservableTrait;
 
-class ObservableTraitTest extends \PHPUnit_Framework_TestCase
+class ObservableTraitTest extends TestCase
 {
     /**
      * Teardown the test environment.

diff --git a/tests/Traits/QueryFilterTraitTest.php b/tests/Traits/QueryFilterTraitTest.php
@@ -3,9 +3,10 @@
 namespace Orchestra\Support\TestCase\Traits;
 
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Traits\QueryFilterTrait;
 
-class QueryFilterTraitTest extends \PHPUnit_Framework_TestCase
+class QueryFilterTraitTest extends TestCase
 {
     use QueryFilterTrait;
 

diff --git a/tests/Traits/ValidationTraitTest.php b/tests/Traits/ValidationTraitTest.php
@@ -2,9 +2,10 @@
 
 namespace Orchestra\Support\TestCase\Traits;
 
+use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Traits\ValidationTrait;
 
-class ValidationTraitTest extends \PHPUnit_Framework_TestCase
+class ValidationTraitTest extends TestCase
 {
     use ValidationTrait;
 

diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -3,8 +3,9 @@
 namespace Orchestra\Support\TestCase;
 
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class ValidatorTest extends \PHPUnit_Framework_TestCase
+class ValidatorTest extends TestCase
 {
     /**
      * Setup the test environment.