From 8192f6868fa3a538aac9bd4e0bef189643aef6a5 Mon Sep 17 00:00:00 2001 From: peter279k Date: Mon, 9 Apr 2018 19:03:31 +0800 Subject: [PATCH 1/2] test enhancement --- .travis.yml | 8 +++++--- composer.json | 2 +- tests/QueryAuth/Credentials/CredentialsTest.php | 4 +++- tests/QueryAuth/Exception/QueryAuthExceptionTest.php | 4 +++- tests/QueryAuth/FactoryTest.php | 3 ++- tests/QueryAuth/KeyGeneratorTest.php | 4 +++- .../Request/Adapter/Incoming/SlimRequestAdapterTest.php | 4 +++- .../Adapter/Outgoing/GuzzleHttpRequestAdapterTest.php | 4 +++- .../Request/Adapter/Outgoing/GuzzleRequestAdapterTest.php | 3 ++- tests/QueryAuth/Request/RequestSignerTest.php | 3 ++- tests/QueryAuth/Request/RequestValidatorTest.php | 3 ++- tests/QueryAuth/SignatureTest.php | 4 +++- 12 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0593a0d..45b50a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,11 @@ php: - 5.4 - 5.5 - 5.6 + - 7.0 + - 7.1 + - 7.2 -script: phpunit +script: php vendor/bin/phpunit before_script: - - composer self-update - - composer install --prefer-source + - composer install -n --prefer-source diff --git a/composer.json b/composer.json index 2ef7764..7b004f0 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "guzzle/guzzle": ">=3.7.0,<=3.9.9", "guzzlehttp/guzzle": "~4", "mockery/mockery": "0.9.2", - "phpunit/phpunit": "4.*", + "phpunit/phpunit": "^4.8", "slim/slim": "2.*" }, "autoload": { diff --git a/tests/QueryAuth/Credentials/CredentialsTest.php b/tests/QueryAuth/Credentials/CredentialsTest.php index 311d447..ea71066 100644 --- a/tests/QueryAuth/Credentials/CredentialsTest.php +++ b/tests/QueryAuth/Credentials/CredentialsTest.php @@ -2,7 +2,9 @@ namespace QueryAuth\Credentials; -class CredentialsTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class CredentialsTest extends TestCase { public function testCredentials() { diff --git a/tests/QueryAuth/Exception/QueryAuthExceptionTest.php b/tests/QueryAuth/Exception/QueryAuthExceptionTest.php index 5d45c93..9fb5d10 100644 --- a/tests/QueryAuth/Exception/QueryAuthExceptionTest.php +++ b/tests/QueryAuth/Exception/QueryAuthExceptionTest.php @@ -2,7 +2,9 @@ namespace QueryAuth\Exception; -class QueryAuthExceptionTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class QueryAuthExceptionTest extends TestCase { public function testDriftExceededException() { diff --git a/tests/QueryAuth/FactoryTest.php b/tests/QueryAuth/FactoryTest.php index 88910ea..b79a57d 100644 --- a/tests/QueryAuth/FactoryTest.php +++ b/tests/QueryAuth/FactoryTest.php @@ -4,8 +4,9 @@ use QueryAuth\Factory; use RandomLib\Factory as RandomFactory; +use PHPUnit\Framework\TestCase; -class FactoryTest extends \PHPUnit_Framework_TestCase +class FactoryTest extends TestCase { private $factory; diff --git a/tests/QueryAuth/KeyGeneratorTest.php b/tests/QueryAuth/KeyGeneratorTest.php index 2893639..f080530 100644 --- a/tests/QueryAuth/KeyGeneratorTest.php +++ b/tests/QueryAuth/KeyGeneratorTest.php @@ -2,7 +2,9 @@ namespace QueryAuth; -class KeyGeneratorTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class KeyGeneratorTest extends TestCase { /** * @var KeyGenerator diff --git a/tests/QueryAuth/Request/Adapter/Incoming/SlimRequestAdapterTest.php b/tests/QueryAuth/Request/Adapter/Incoming/SlimRequestAdapterTest.php index 1f1604d..15b9de1 100644 --- a/tests/QueryAuth/Request/Adapter/Incoming/SlimRequestAdapterTest.php +++ b/tests/QueryAuth/Request/Adapter/Incoming/SlimRequestAdapterTest.php @@ -2,7 +2,9 @@ namespace QueryAuth\Request\Adapter\Incoming; -class SlimRequestAdapterTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class SlimRequestAdapterTest extends TestCase { protected $adapter; protected $adaptee; diff --git a/tests/QueryAuth/Request/Adapter/Outgoing/GuzzleHttpRequestAdapterTest.php b/tests/QueryAuth/Request/Adapter/Outgoing/GuzzleHttpRequestAdapterTest.php index 7ab56f4..f0b02e9 100644 --- a/tests/QueryAuth/Request/Adapter/Outgoing/GuzzleHttpRequestAdapterTest.php +++ b/tests/QueryAuth/Request/Adapter/Outgoing/GuzzleHttpRequestAdapterTest.php @@ -2,7 +2,9 @@ namespace QueryAuth\Request\Adapter\Outgoing; -class GuzzleHttpRequestAdapterTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class GuzzleHttpRequestAdapterTest extends TestCase { protected $adapter; protected $adaptee; diff --git a/tests/QueryAuth/Request/Adapter/Outgoing/GuzzleRequestAdapterTest.php b/tests/QueryAuth/Request/Adapter/Outgoing/GuzzleRequestAdapterTest.php index 834e148..6e62eaa 100644 --- a/tests/QueryAuth/Request/Adapter/Outgoing/GuzzleRequestAdapterTest.php +++ b/tests/QueryAuth/Request/Adapter/Outgoing/GuzzleRequestAdapterTest.php @@ -3,8 +3,9 @@ namespace QueryAuth\Request\Adapter\Outgoing; use Guzzle\Http\Message\RequestInterface as GuzzleRequestInterface; +use PHPUnit\Framework\TestCase; -class GuzzleRequestAdapterTest extends \PHPUnit_Framework_TestCase +class GuzzleRequestAdapterTest extends TestCase { protected $adapter; protected $adaptee; diff --git a/tests/QueryAuth/Request/RequestSignerTest.php b/tests/QueryAuth/Request/RequestSignerTest.php index ada1966..dce4572 100644 --- a/tests/QueryAuth/Request/RequestSignerTest.php +++ b/tests/QueryAuth/Request/RequestSignerTest.php @@ -7,8 +7,9 @@ use QueryAuth\KeyGenerator; use QueryAuth\Signature; use RandomLib\Factory as RandomFactory; +use PHPUnit\Framework\TestCase; -class RequestSignerTest extends \PHPUnit_Framework_TestCase +class RequestSignerTest extends TestCase { protected function setUp() { diff --git a/tests/QueryAuth/Request/RequestValidatorTest.php b/tests/QueryAuth/Request/RequestValidatorTest.php index ba62247..94f1116 100644 --- a/tests/QueryAuth/Request/RequestValidatorTest.php +++ b/tests/QueryAuth/Request/RequestValidatorTest.php @@ -4,8 +4,9 @@ use QueryAuth\Credentials\Credentials; use QueryAuth\Signature; +use PHPUnit\Framework\TestCase; -class RequestValidatorTest extends \PHPUnit_Framework_TestCase +class RequestValidatorTest extends TestCase { /** * @var RequestValidator diff --git a/tests/QueryAuth/SignatureTest.php b/tests/QueryAuth/SignatureTest.php index c193ba9..962c5c7 100644 --- a/tests/QueryAuth/SignatureTest.php +++ b/tests/QueryAuth/SignatureTest.php @@ -2,7 +2,9 @@ namespace QueryAuth; -class SignatureTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class SignatureTest extends TestCase { /** * @var Signature From 92c6b6752ce71c3706134358ca8559134531263a Mon Sep 17 00:00:00 2001 From: peter279k Date: Mon, 9 Apr 2018 23:54:04 +0800 Subject: [PATCH 2/2] remove 7.1, 7.2 test --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45b50a3..7619e13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ php: - 5.5 - 5.6 - 7.0 - - 7.1 - - 7.2 script: php vendor/bin/phpunit