From 06986a7c05567c9d0e5fc6d4c1d1de7211450c02 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Thu, 16 Jan 2020 09:45:36 -0500 Subject: [PATCH 1/7] Testing against newer php versions --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7982182..5a2ca8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,11 @@ php: - 5.4 - 5.5 - 5.6 + - 7.0 + - 7.1 + - 7.2 + - 7.3 + - 7.4 - hhvm env: @@ -17,4 +22,4 @@ install: matrix: allow_failures: - php: hhvm - fast_finish: true \ No newline at end of file + fast_finish: true From 17008c113f119d18560057e2b2f105f34b4e1f11 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Thu, 16 Jan 2020 09:53:47 -0500 Subject: [PATCH 2/7] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a2ca8b..b16b833 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: php php: - - 5.4 - - 5.5 - 5.6 - 7.0 - 7.1 From c3573d7098a9ea8d0cd7e1b776d0fc8512bdd91e Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 16 Jan 2020 10:09:55 -0500 Subject: [PATCH 3/7] Updated test case namespaces for PHP compatibility --- test/Auth/CtctOAuth2UnitTest.php | 2 +- test/Services/AccountServiceUnitTest.php | 3 ++- test/Services/ActivityServiceUnitTest.php | 3 ++- test/Services/CampaignScheduleServiceUnitTest.php | 3 ++- test/Services/CampaignTrackingServiceUnitTest.php | 3 ++- test/Services/ContactServiceUnitTest.php | 3 ++- test/Services/ContactTrackingServiceUnitTest.php | 3 ++- test/Services/EmailCampaignServiceUnitTest.php | 3 ++- test/Services/LibraryServiceUnitTest.php | 3 ++- test/Services/ListServiceUnitTest.php | 3 ++- 10 files changed, 19 insertions(+), 10 deletions(-) diff --git a/test/Auth/CtctOAuth2UnitTest.php b/test/Auth/CtctOAuth2UnitTest.php index 70d9c82..fdd8c12 100644 --- a/test/Auth/CtctOAuth2UnitTest.php +++ b/test/Auth/CtctOAuth2UnitTest.php @@ -7,7 +7,7 @@ use GuzzleHttp\Stream\Stream; use GuzzleHttp\Subscriber\Mock; -class CtctOAuth2UnitTest extends PHPUnit_Framework_TestCase +class CtctOAuth2UnitTest extends \PHPUnit\Framework\TestCase { /** * @var Client diff --git a/test/Services/AccountServiceUnitTest.php b/test/Services/AccountServiceUnitTest.php index 7f51d6d..d81d23a 100644 --- a/test/Services/AccountServiceUnitTest.php +++ b/test/Services/AccountServiceUnitTest.php @@ -6,8 +6,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class AccountServiceUnitTest extends PHPUnit_Framework_TestCase +class AccountServiceUnitTest extends TestCase { /** * @var Client diff --git a/test/Services/ActivityServiceUnitTest.php b/test/Services/ActivityServiceUnitTest.php index 8874639..f4da0ad 100644 --- a/test/Services/ActivityServiceUnitTest.php +++ b/test/Services/ActivityServiceUnitTest.php @@ -4,8 +4,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class ActivityServiceUnitTest extends PHPUnit_Framework_TestCase +class ActivityServiceUnitTest extends TestCase { /** * @var Client diff --git a/test/Services/CampaignScheduleServiceUnitTest.php b/test/Services/CampaignScheduleServiceUnitTest.php index 2cdbc6c..8e93233 100755 --- a/test/Services/CampaignScheduleServiceUnitTest.php +++ b/test/Services/CampaignScheduleServiceUnitTest.php @@ -8,8 +8,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class CampaignScheduleServiceUnitTest extends PHPUnit_Framework_TestCase +class CampaignScheduleServiceUnitTest extends TestCase { /** * @var Client diff --git a/test/Services/CampaignTrackingServiceUnitTest.php b/test/Services/CampaignTrackingServiceUnitTest.php index c3a3e20..59b1c2d 100755 --- a/test/Services/CampaignTrackingServiceUnitTest.php +++ b/test/Services/CampaignTrackingServiceUnitTest.php @@ -13,8 +13,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class CampaignTrackingServiceUnitTest extends PHPUnit_Framework_TestCase +class CampaignTrackingServiceUnitTest extends TestCase { /** * @var Client diff --git a/test/Services/ContactServiceUnitTest.php b/test/Services/ContactServiceUnitTest.php index 48cc217..37b3c86 100755 --- a/test/Services/ContactServiceUnitTest.php +++ b/test/Services/ContactServiceUnitTest.php @@ -8,8 +8,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class ContactServiceUnitTest extends PHPUnit_Framework_TestCase +class ContactServiceUnitTest extends TestCase { /** * @var Client diff --git a/test/Services/ContactTrackingServiceUnitTest.php b/test/Services/ContactTrackingServiceUnitTest.php index 36801bc..2dfd024 100755 --- a/test/Services/ContactTrackingServiceUnitTest.php +++ b/test/Services/ContactTrackingServiceUnitTest.php @@ -13,8 +13,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class ContactTrackingServiceUnitTest extends PHPUnit_Framework_TestCase +class ContactTrackingServiceUnitTest extends TestCase { /** * @var Client diff --git a/test/Services/EmailCampaignServiceUnitTest.php b/test/Services/EmailCampaignServiceUnitTest.php index ac2407e..f6aae5f 100755 --- a/test/Services/EmailCampaignServiceUnitTest.php +++ b/test/Services/EmailCampaignServiceUnitTest.php @@ -9,8 +9,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class EmailMarketingServiceUnitTest extends PHPUnit_Framework_TestCase +class EmailMarketingServiceUnitTest extends TestCase { /** * @var Client diff --git a/test/Services/LibraryServiceUnitTest.php b/test/Services/LibraryServiceUnitTest.php index fda7742..1efc520 100644 --- a/test/Services/LibraryServiceUnitTest.php +++ b/test/Services/LibraryServiceUnitTest.php @@ -9,8 +9,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class LibraryServiceUnitTest extends PHPUnit_Framework_TestCase +class LibraryServiceUnitTest extends TestCase { /** * @var Client diff --git a/test/Services/ListServiceUnitTest.php b/test/Services/ListServiceUnitTest.php index 1073dd9..f515792 100755 --- a/test/Services/ListServiceUnitTest.php +++ b/test/Services/ListServiceUnitTest.php @@ -8,8 +8,9 @@ use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Stream\Stream; use GuzzleHttp\Message\Response; +use PHPUnit\Framework\TestCase; -class ListServiceUnitTest extends PHPUnit_Framework_TestCase +class ListServiceUnitTest extends TestCase { /** * @var Client From 5c75ca0462e401a875758449ab8881c6b6fe7187 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 16 Jan 2020 10:10:56 -0500 Subject: [PATCH 4/7] Loosening dev requirements for running tests --- .travis.yml | 3 +-- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b16b833..2bbd476 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.6 - 7.0 - 7.1 - 7.2 @@ -20,4 +19,4 @@ install: matrix: allow_failures: - php: hhvm - fast_finish: true + fast_finish: true \ No newline at end of file diff --git a/composer.json b/composer.json index 8bc7064..b308944 100755 --- a/composer.json +++ b/composer.json @@ -8,10 +8,10 @@ "require": { "php": ">=5.4.0", "ext-curl": "*", - "guzzlehttp/guzzle": "^5.1.0" + "guzzlehttp/guzzle": "^5.1.0|^6.0" }, "require-dev": { - "phpunit/phpunit": "4.4.1" + "phpunit/phpunit": "^7.0|^6.0" }, "authors": [ { From 24b6a30bf36c04fd9bd9219b640b3e336add8ecc Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 16 Jan 2020 10:16:53 -0500 Subject: [PATCH 5/7] Using guzzle version that fits the php version --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bbd476..501b956 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,17 +6,16 @@ php: - 7.2 - 7.3 - 7.4 + - nightly - hhvm -env: - - GUZZLE_VERSION="5.1.0" - before_script: composer install install: - - composer require guzzlehttp/guzzle:${GUZZLE_VERSION} + - composer show guzzlehttp/guzzle matrix: allow_failures: - php: hhvm + - php: nightly fast_finish: true \ No newline at end of file From 48d7c05835d917a21e0e0353c773041e530abad9 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 16 Jan 2020 10:20:49 -0500 Subject: [PATCH 6/7] Using guzzle version that fits the php version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 501b956..b9c65b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ php: - nightly - hhvm -before_script: composer install +before_script: travis_retry composer update --no-interaction --prefer-source install: - composer show guzzlehttp/guzzle From 0a867b967c4e20a65203a60c4a06fc8c6b141ee6 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 16 Jan 2020 10:25:02 -0500 Subject: [PATCH 7/7] Now always updating guzzle --- .travis.yml | 4 +--- composer.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9c65b6..495a677 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,8 @@ php: - nightly - hhvm -before_script: travis_retry composer update --no-interaction --prefer-source - install: - - composer show guzzlehttp/guzzle + - travis_retry composer update --no-interaction --prefer-source matrix: allow_failures: diff --git a/composer.json b/composer.json index b308944..b466911 100755 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "require": { "php": ">=5.4.0", "ext-curl": "*", - "guzzlehttp/guzzle": "^5.1.0|^6.0" + "guzzlehttp/guzzle": "^5.1.0" }, "require-dev": { "phpunit/phpunit": "^7.0|^6.0"