main merge conflicts

Vonage · Jun 24, 2024 · 94b7fa2 · 94b7fa2
2 parents 1859210 + 060cbfe
commit 94b7fa2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -26,6 +26,12 @@
     <testsuite name="client">
       <directory>test/Client</directory>
     </testsuite>
+    <testsuite name="conversations">
+      <directory>test/Conversation</directory>
+    </testsuite>
+    <testsuite name="client">
+      <directory>test/Client</directory>
+    </testsuite>
     <testsuite name="proactive_connect">
       <directory>test/ProactiveConnect</directory>
     </testsuite>

diff --git a/src/Client.php b/src/Client.php
@@ -362,7 +362,6 @@ public static function authRequest(RequestInterface $request, Basic $credentials
 
     /**
      * @throws ClientException
-     * @deprecated Use the Vonage/JWT library if you need to generate a token
      */
     public function generateJwt($claims = []): Token
     {

diff --git a/test/Client/Credentials/Handler/GnpHandlerTest.php b/test/Client/Credentials/Handler/GnpHandlerTest.php
@@ -8,13 +8,9 @@
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Vonage\Client;
-use Vonage\Client\Credentials\Basic;
 use Vonage\Client\Credentials\Gnp;
-use Vonage\Client\Credentials\Handler\BasicQueryHandler;
 use PHPUnit\Framework\TestCase;
 use Vonage\Client\Credentials\Handler\GnpHandler;
-use Vonage\Client\Credentials\Handler\KeypairHandler;
-use Vonage\Client\Credentials\Keypair;
 use VonageTest\Psr7AssertionTrait;
 
 class GnpHandlerTest extends TestCase

diff --git a/test/SimSwap/ClientIntegrationTest.php b/test/SimSwap/ClientIntegrationTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimSwap;
+namespace VonageTest\SimSwap;
 
 use VonageTest\VonageTestCase;
 use Vonage\Client;
@@ -18,7 +18,7 @@ public function setUp(): void
     {
         $this->key = file_get_contents(__DIR__ . '/../Client/Credentials/test.key');
 
-        parent::setUp(); // TODO: Change the autogenerated stub
+        parent::setUp();
     }
 
     public function testWillConfigureClientCorrectly(): void
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * @throws ClientException
-         * @deprecated Use the Vonage/JWT library if you need to generate a token
          */
         public function generateJwt($claims = []): Token
         {
@@ Expand Down @@