Enable PSR-4 for tests.

Lucas Michot · Lucas Michot · commit 05bb07d58365 · 2021-03-03T23:03:56.000+01:00
diff --git a/composer.json b/composer.json
@@ -27,5 +27,10 @@
         "psr-4": {
             "MessageBird\\": "src/MessageBird/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
     }
 }
diff --git a/tests/Integration/Balance/BalanceTest.php b/tests/Integration/Balance/BalanceTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Balance;
+
+use Tests\Integration\BaseTest;
+
 class BalanceTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/BaseTest.php b/tests/Integration/BaseTest.php
@@ -1,13 +1,15 @@
 <?php
 
+namespace Tests\Integration;
+
 use PHPUnit\Framework\TestCase;
 
 class BaseTest extends TestCase
 {
     /** @var \MessageBird\Client */
     protected $client;
 
-    /** @var PHPUnit_Framework_MockObject_MockObject */
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
     protected $mockClient;
 
     protected function setUp()
diff --git a/tests/Integration/Chat/ChatTest.php b/tests/Integration/Chat/ChatTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Chat;
+
+use Tests\Integration\BaseTest;
+
 class ChatTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/Contacts/ContactTest.php b/tests/Integration/Contacts/ContactTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Contacts;
+
+use Tests\Integration\BaseTest;
+
 class ContactTest extends BaseTest
 {
     protected function setUp()
@@ -70,7 +75,7 @@ public function testContactGetGroups()
     {
         $this->mockClient->method('performHttpRequest')
             ->with(
-                $this->equalTo(MessageBird\Common\HttpClient::REQUEST_GET), $this->equalTo('contacts/contact_id/groups'), $this->anything(), $this->anything()
+                $this->equalTo(\MessageBird\Common\HttpClient::REQUEST_GET), $this->equalTo('contacts/contact_id/groups'), $this->anything(), $this->anything()
             )
             ->willReturn([
                 200,
@@ -112,7 +117,7 @@ public function testContactGetMessages()
     {
         $this->mockClient->method('performHttpRequest')
             ->with(
-                $this->equalTo(MessageBird\Common\HttpClient::REQUEST_GET), $this->equalTo('contacts/contact_id/messages'), $this->anything(), $this->anything()
+                $this->equalTo(\MessageBird\Common\HttpClient::REQUEST_GET), $this->equalTo('contacts/contact_id/messages'), $this->anything(), $this->anything()
             )
             ->willReturn([
                 200,
diff --git a/tests/Integration/Conversation/ConversationContentTest.php b/tests/Integration/Conversation/ConversationContentTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace Tests\Integration\Conversation;
+
 use MessageBird\Objects\Conversation\Content;
 use MessageBird\Objects\Conversation\Message;
+use Tests\Integration\BaseTest;
 
 /**
  * Tests the static factories in Content.
diff --git a/tests/Integration/Conversation/ConversationMessageTest.php b/tests/Integration/Conversation/ConversationMessageTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace Tests\Integration\Conversation;
+
 use MessageBird\Client;
 use MessageBird\Objects\Conversation\Content;
 use MessageBird\Objects\Conversation\Message;
+use Tests\Integration\BaseTest;
 
 class ConversationMessageTest extends BaseTest
 {
diff --git a/tests/Integration/Conversation/ConversationTest.php b/tests/Integration/Conversation/ConversationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Integration\Conversation;
+
 use MessageBird\Client;
 use MessageBird\Objects\BaseList;
 use MessageBird\Objects\Conversation\Channel;
@@ -8,6 +10,7 @@
 use MessageBird\Objects\Conversation\Conversation;
 use MessageBird\Objects\Conversation\Message;
 use MessageBird\Objects\Conversation\MessageReference;
+use Tests\Integration\BaseTest;
 
 class ConversationTest extends BaseTest
 {
diff --git a/tests/Integration/Conversation/ConversationWebhookTest.php b/tests/Integration/Conversation/ConversationWebhookTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Tests\Integration\Conversation;
+
 use MessageBird\Objects\Conversation\Webhook;
+use Tests\Integration\BaseTest;
 
 class ConversationWebhookTest extends BaseTest
 {
diff --git a/tests/Integration/Groups/GroupTest.php b/tests/Integration/Groups/GroupTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Groups;
+
+use Tests\Integration\BaseTest;
+
 class GroupTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/Hlr/HlrTest.php b/tests/Integration/Hlr/HlrTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Hlr;
+
+use Tests\Integration\BaseTest;
+
 class HlrTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/HttpClientTest.php b/tests/Integration/HttpClientTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Integration;
+
 use MessageBird\Client;
 use MessageBird\Common\HttpClient;
 
@@ -18,7 +20,7 @@ public function testHttpClient()
 
     public function testHttpClientInvalidTimeout()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Timeout must be an int > 0, got "integer 0".$/');
         new HttpClient(Client::ENDPOINT, 0);
     }
diff --git a/tests/Integration/Lookup/LookupTest.php b/tests/Integration/Lookup/LookupTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Lookup;
+
+use Tests\Integration\BaseTest;
+
 class LookupTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/Messages/MessagesTest.php b/tests/Integration/Messages/MessagesTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Messages;
+
+use Tests\Integration\BaseTest;
+
 class MessageTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/Mms/MmsTest.php b/tests/Integration/Mms/MmsTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Mms;
+
+use Tests\Integration\BaseTest;
+
 class MmsTest extends BaseTest
 {
     public function testCreateMmsFail()
diff --git a/tests/Integration/Numbers/AvailablePhoneNumbersTest.php b/tests/Integration/Numbers/AvailablePhoneNumbersTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Numbers;
+
+use Tests\Integration\BaseTest;
+
 class AvailablePhoneNumbersTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/Numbers/PhoneNumbersTest.php b/tests/Integration/Numbers/PhoneNumbersTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Numbers;
+
+use Tests\Integration\BaseTest;
+
 class PhoneNumbersTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/PartnerAccount/AccountTest.php b/tests/Integration/PartnerAccount/AccountTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Tests\Integration\PartnerAccount;
+
+use Tests\Integration\BaseTest;
+
 class AccountTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/ResponseErrorTest.php b/tests/Integration/ResponseErrorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Integration;
+
 use MessageBird\Common\ResponseError;
 use MessageBird\Exceptions\MessageBirdException;
 use MessageBird\Objects\Base;
diff --git a/tests/Integration/Verify/VerifyTest.php b/tests/Integration/Verify/VerifyTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\Verify;
+
+use Tests\Integration\BaseTest;
+
 class VerifyTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Integration/Voice/VoiceTest.php b/tests/Integration/Voice/VoiceTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Tests\Integration\Voice;
+
+use Tests\Integration\BaseTest;
+
 class VoiceTest extends BaseTest
 {
     /** @var \MessageBird\Client client */
diff --git a/tests/Integration/VoiceMessages/VoiceMessagesTest.php b/tests/Integration/VoiceMessages/VoiceMessagesTest.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Tests\Integration\VoiceMessages;
+
+use Tests\Integration\BaseTest;
+
 class VoiceMessagesTest extends BaseTest
 {
     protected function setUp()
diff --git a/tests/Unit/RequestValidatorTest.php b/tests/Unit/RequestValidatorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Unit;
+
 use MessageBird\Objects\SignedRequest;
 use MessageBird\RequestValidator;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/SignedRequestTest.php b/tests/Unit/SignedRequestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Unit;
+
 use MessageBird\Objects\SignedRequest;
 use PHPUnit\Framework\TestCase;
 

Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,10 @@`
`27`	`27`	`"psr-4": {`
`28`	`28`	`"MessageBird\\": "src/MessageBird/"`
`29`	`29`	`}`
	`30`	`+ },`
	`31`	`+ "autoload-dev": {`
	`32`	`+ "psr-4": {`
	`33`	`+ "Tests\\": "tests/"`
	`34`	`+ }`
`30`	`35`	`}`
`31`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,9 @@`
`1`	`1`	`<?php`
	`2`	`+`
	`3`	`+namespace Tests\Integration\Contacts;`
	`4`	`+`
	`5`	`+use Tests\Integration\BaseTest;`
	`6`	`+`
`2`	`7`	`class ContactTest extends BaseTest`
`3`	`8`	`{`
`4`	`9`	`protected function setUp()`
`@@ -70,7 +75,7 @@ public function testContactGetGroups()`
`70`	`75`	`{`
`71`	`76`	`$this->mockClient->method('performHttpRequest')`
`72`	`77`	`->with(`
`73`		`- $this->equalTo(MessageBird\Common\HttpClient::REQUEST_GET), $this->equalTo('contacts/contact_id/groups'), $this->anything(), $this->anything()`
	`78`	`+ $this->equalTo(\MessageBird\Common\HttpClient::REQUEST_GET), $this->equalTo('contacts/contact_id/groups'), $this->anything(), $this->anything()`
`74`	`79`	`)`
`75`	`80`	`->willReturn([`
`76`	`81`	`200,`
`@@ -112,7 +117,7 @@ public function testContactGetMessages()`
`112`	`117`	`{`
`113`	`118`	`$this->mockClient->method('performHttpRequest')`
`114`	`119`	`->with(`
`115`		`- $this->equalTo(MessageBird\Common\HttpClient::REQUEST_GET), $this->equalTo('contacts/contact_id/messages'), $this->anything(), $this->anything()`
	`120`	`+ $this->equalTo(\MessageBird\Common\HttpClient::REQUEST_GET), $this->equalTo('contacts/contact_id/messages'), $this->anything(), $this->anything()`
`116`	`121`	`)`
`117`	`122`	`->willReturn([`
`118`	`123`	`200,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+namespace Tests\Integration\Conversation;`
	`4`	`+`
`3`	`5`	`use MessageBird\Objects\Conversation\Webhook;`
	`6`	`+use Tests\Integration\BaseTest;`
`4`	`7`
`5`	`8`	`class ConversationWebhookTest extends BaseTest`
`6`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+namespace Tests\Integration;`
	`4`	`+`
`3`	`5`	`use MessageBird\Client;`
`4`	`6`	`use MessageBird\Common\HttpClient;`
`5`	`7`
`@@ -18,7 +20,7 @@ public function testHttpClient()`
`18`	`20`
`19`	`21`	`public function testHttpClientInvalidTimeout()`
`20`	`22`	`{`
`21`		`- $this->expectException(InvalidArgumentException::class);`
	`23`	`+ $this->expectException(\InvalidArgumentException::class);`
`22`	`24`	`$this->expectExceptionMessageRegExp('/^Timeout must be an int > 0, got "integer 0".$/');`
`23`	`25`	`new HttpClient(Client::ENDPOINT, 0);`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+namespace Tests\Integration\PartnerAccount;`
	`4`	`+`
	`5`	`+use Tests\Integration\BaseTest;`
	`6`	`+`
`3`	`7`	`class AccountTest extends BaseTest`
`4`	`8`	`{`
`5`	`9`	`protected function setUp()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+namespace Tests\Integration\Voice;`
	`4`	`+`
	`5`	`+use Tests\Integration\BaseTest;`
	`6`	`+`
`3`	`7`	`class VoiceTest extends BaseTest`
`4`	`8`	`{`
`5`	`9`	`/** @var \MessageBird\Client client */`