Fix prophecy to use trait, update maintainer details (#300)

* Big rewrite to extend off a new base class so the prophecy trait can be used across the suite * Update change of ownership within Vonage * remove support for PHP7.2 + PHP7.3 * remove support for PHP7.2 + PHP7.3. Build support for 8.1 * split support for older php versions as a temporary measure until we make production catch up * Update changelog
Vonage · Dec 13, 2021 · abd4047 · abd4047
1 parent 927d459
commit abd4047
Show file tree

Hide file tree

Showing 104 changed files with 236 additions and 212 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.2', '7.3', '7.4', '8.0' ]
+        php: [ '7.4', '8.0', '8.1' ]
     name: PHP ${{ matrix.php }} Test
 
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 2.10.0
+
+### Fixed
+
+* PHPUnit tests now no longer throw `prophesize()` depreciation notices
+
+### Changed
+
+* Maintainer and Contribution documents changed to reflect current ownership
+* All test cases now extend off a the new `VonageTestCase` class that implements the `ProphesizeTrait`
+
 # 2.9.3
 
 ### Fixed

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,13 +1,14 @@
 ## Maintainers
 
 If you have any problems with our library, feel free to reach out to our
-maintainers.
+maintainer.
 
-* [Chris Tankersley](https://github.com/dragonmantank)
-* [Lorna Jane Mitchell](https://github.com/lornajane)
+* [James Seconde](https://github.com/secondejk)
 
 ### Past Maintainers
 
+* [Chris Tankersley](https://github.com/dragonmantank)
+* [Lorna Jane Mitchell](https://github.com/lornajane)
 * [Tim Lytle](https://github.com/tjlytle)
 * [Micheal Heap](https://github.com/mheap)
 

diff --git a/composer.json b/composer.json
@@ -6,14 +6,9 @@
   "license": "Apache-2.0",
   "authors": [
     {
-      "name": "Chris Tankersley",
-      "email": "[email protected]",
-      "role": "Developer"
-    },
-    {
-      "name": "Lorna Mitchell",
-      "email": "[email protected]",
-      "role": "Developer"
+      "name": "James Seconde",
+      "email": "[email protected]",
+      "role": "PHP Developer Advocate"
     }
   ],
   "require": {
@@ -29,14 +24,16 @@
     "psr/log": "^1.1"
   },
   "require-dev": {
+    "php": ">=7.4",
     "guzzlehttp/guzzle": ">=6",
     "helmich/phpunit-json-assert": "^3.3",
     "php-http/mock-client": "^1.4",
     "phpstan/phpstan": "^0.12",
     "phpunit/phpunit": "^8.5|^9.4",
     "roave/security-advisories": "dev-latest",
     "squizlabs/php_codesniffer": "^3.5",
-    "softcreatr/jsonpath": "^0.6.4"
+    "softcreatr/jsonpath": "^0.6.4",
+    "phpspec/prophecy-phpunit": "^2.0"
   },
   "config": {
     "optimize-autoloader": true,
@@ -62,6 +59,6 @@
     "email": "[email protected]",
     "issues": "https://github.com/Vonage/vonage-php-sdk-core/issues",
     "source": "https://github.com/Vonage/vonage-php-sdk-core",
-    "docs": "https://developer.nexmo.com"
+    "docs": "https://developer.vonage.com"
   }
 }
diff --git a/test/Account/BalanceTest.php b/test/Account/BalanceTest.php
@@ -11,11 +11,11 @@
 
 namespace VonageTest\Account;
 
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Account\Balance;
 use Vonage\Client\Exception\Exception as ClientException;
 
-class BalanceTest extends TestCase
+class BalanceTest extends VonageTestCase
 {
     /**
      * @var Balance

diff --git a/test/Account/ClientFactoryTest.php b/test/Account/ClientFactoryTest.php
@@ -11,13 +11,13 @@
 
 namespace VonageTest\Account;
 
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Account\ClientFactory;
 use Vonage\Client;
 use Vonage\Client\APIResource;
 use Vonage\Client\Factory\MapFactory;
 
-class ClientFactoryTest extends TestCase
+class ClientFactoryTest extends VonageTestCase
 {
     /**
      * @var MapFactory

diff --git a/test/Account/ClientTest.php b/test/Account/ClientTest.php
@@ -12,8 +12,9 @@
 namespace VonageTest\Account;
 
 use Laminas\Diactoros\Response;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Vonage\Account\Client as AccountClient;
@@ -29,10 +30,11 @@
 
 use function fopen;
 
-class ClientTest extends TestCase
+class ClientTest extends VonageTestCase
 {
     use Psr7AssertionTrait;
 
+
     protected $vonageClient;
 
     /**

diff --git a/test/Account/ConfigTest.php b/test/Account/ConfigTest.php
@@ -11,10 +11,10 @@
 
 namespace VonageTest\Account;
 
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Account\Config;
 
-class ConfigTest extends TestCase
+class ConfigTest extends VonageTestCase
 {
     /**
      * @var Config

diff --git a/test/Account/PrefixPriceTest.php b/test/Account/PrefixPriceTest.php
@@ -12,10 +12,10 @@
 namespace VonageTest\Account;
 
 use Exception;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Account\PrefixPrice;
 
-class PrefixPriceTest extends TestCase
+class PrefixPriceTest extends VonageTestCase
 {
     /**
      * @dataProvider prefixPriceProvider

diff --git a/test/Account/SecretCollectionTest.php b/test/Account/SecretCollectionTest.php
@@ -11,14 +11,14 @@
 
 namespace VonageTest\Account;
 
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Account\Secret;
 use Vonage\Account\SecretCollection;
 use Vonage\InvalidResponseException;
 
 use function array_map;
 
-class SecretCollectionTest extends TestCase
+class SecretCollectionTest extends VonageTestCase
 {
     /**
      * @var array[]

diff --git a/test/Account/SecretTest.php b/test/Account/SecretTest.php
@@ -11,11 +11,11 @@
 
 namespace VonageTest\Account;
 
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Account\Secret;
 use Vonage\InvalidResponseException;
 
-class SecretTest extends TestCase
+class SecretTest extends VonageTestCase
 {
     /**
      * @var Secret

diff --git a/test/Account/SmsPriceTest.php b/test/Account/SmsPriceTest.php
@@ -11,10 +11,10 @@
 
 namespace VonageTest\Account;
 
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Account\SmsPrice;
 
-class SmsPriceTest extends TestCase
+class SmsPriceTest extends VonageTestCase
 {
     /**
      * @dataProvider smsPriceProvider

diff --git a/test/ApiErrorHandlerTest.php b/test/ApiErrorHandlerTest.php
@@ -12,13 +12,13 @@
 namespace VonageTest;
 
 use Exception;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\ApiErrorHandler;
 use Vonage\Client\Exception\Request as RequestException;
 use Vonage\Client\Exception\Server as ServerException;
 use Vonage\Client\Exception\Validation as ValidationException;
 
-class ApiErrorHandlerTest extends TestCase
+class ApiErrorHandlerTest extends VonageTestCase
 {
     /**
      * Valid HTTP responses do not throw an error

diff --git a/test/Application/ApplicationTest.php b/test/Application/ApplicationTest.php
@@ -13,7 +13,7 @@
 
 use Exception;
 use Laminas\Diactoros\Response;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Application\Application;
 use Vonage\Application\MessagesConfig;
 use Vonage\Application\RtcConfig;
@@ -22,7 +22,7 @@
 
 use function fopen;
 
-class ApplicationTest extends TestCase
+class ApplicationTest extends VonageTestCase
 {
     /**
      * @var Application

diff --git a/test/Application/ClientTest.php b/test/Application/ClientTest.php
@@ -15,7 +15,7 @@
 use Exception;
 use Laminas\Diactoros\Request;
 use Laminas\Diactoros\Response;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Prophecy\Argument;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
@@ -37,7 +37,7 @@
 use function json_decode;
 use function substr;
 
-class ClientTest extends TestCase
+class ClientTest extends VonageTestCase
 {
     use Psr7AssertionTrait;
 

diff --git a/test/Application/FilterTest.php b/test/Application/FilterTest.php
@@ -12,10 +12,10 @@
 namespace VonageTest\Application;
 
 use DateTime;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Application\Filter;
 
-class FilterTest extends TestCase
+class FilterTest extends VonageTestCase
 {
     /**
      * @dataProvider ranges

diff --git a/test/Call/CallTest.php b/test/Call/CallTest.php
@@ -12,7 +12,7 @@
 namespace VonageTest\Call;
 
 use Laminas\Diactoros\Response;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Prophecy\Argument;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
@@ -34,7 +34,7 @@
 use function json_decode;
 use function json_encode;
 
-class CallTest extends TestCase
+class CallTest extends VonageTestCase
 {
     use Psr7AssertionTrait;
 

diff --git a/test/Call/CollectionTest.php b/test/Call/CollectionTest.php
@@ -12,7 +12,7 @@
 namespace VonageTest\Call;
 
 use Laminas\Diactoros\Response;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Prophecy\Argument;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
@@ -27,7 +27,7 @@
 use function fopen;
 use function json_encode;
 
-class CollectionTest extends TestCase
+class CollectionTest extends VonageTestCase
 {
     use Psr7AssertionTrait;
 

diff --git a/test/Call/DtmfTest.php b/test/Call/DtmfTest.php
@@ -12,7 +12,7 @@
 namespace VonageTest\Call;
 
 use Laminas\Diactoros\Response;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Prophecy\Argument;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
@@ -25,7 +25,7 @@
 use function json_decode;
 use function json_encode;
 
-class DtmfTest extends TestCase
+class DtmfTest extends VonageTestCase
 {
     use Psr7AssertionTrait;
 

diff --git a/test/Call/EarmuffTest.php b/test/Call/EarmuffTest.php
@@ -12,14 +12,14 @@
 namespace VonageTest\Call;
 
 use Helmich\JsonAssert\JsonAssertions;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Call\Earmuff;
 
 use function file_get_contents;
 use function json_decode;
 use function json_encode;
 
-class EarmuffTest extends TestCase
+class EarmuffTest extends VonageTestCase
 {
     use JsonAssertions;
 

diff --git a/test/Call/EventTest.php b/test/Call/EventTest.php
@@ -11,11 +11,11 @@
 
 namespace VonageTest\Call;
 
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Call\Event;
 use VonageTest\Fixture\ResponseTrait;
 
-class EventTest extends TestCase
+class EventTest extends VonageTestCase
 {
     use ResponseTrait;
 

diff --git a/test/Call/FilterTest.php b/test/Call/FilterTest.php
@@ -12,11 +12,11 @@
 namespace VonageTest\Call;
 
 use DateTime;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Call\Filter;
 use Vonage\Conversations\Conversation;
 
-class FilterTest extends TestCase
+class FilterTest extends VonageTestCase
 {
     /**
      * @var Filter

diff --git a/test/Call/HangupTest.php b/test/Call/HangupTest.php
@@ -12,14 +12,14 @@
 namespace VonageTest\Call;
 
 use Helmich\JsonAssert\JsonAssertions;
-use PHPUnit\Framework\TestCase;
+use VonageTest\VonageTestCase;
 use Vonage\Call\Hangup;
 
 use function file_get_contents;
 use function json_decode;
 use function json_encode;
 
-class HangupTest extends TestCase
+class HangupTest extends VonageTestCase
 {
     use JsonAssertions;