fix: resolve deprecation notices when using Composer 1.10(-dev)

composer.json

@@ -32,7 +32,6 @@
   "type": "library",
   "autoload": {
     "psr-4": {
-      "SendGrid\\": "lib/",
       "SendGrid\\Mail\\": "lib/mail/",
       "SendGrid\\Contacts\\": "lib/contacts/",
       "SendGrid\\Stats\\": "lib/stats/"
@@ -41,7 +40,9 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "SendGrid\\Tests\\": "test/"
-    }
+      "SendGrid\\Tests\\Integration\\": "test/integration",
+      "SendGrid\\Tests\\Unit\\": "test/unit"
+    },
+    "files": ["test/BaseTestClass.php"]
   }
 }

test/BaseTestClass.php

@@ -1,56 +1,59 @@
 <?php
 /**
- * This file contains the base class for testing the request object 
+ * This file contains the base class for testing the request object
  * generation for a /mail/send API call
- * 
+ *
  * PHP Version - 5.6, 7.0, 7.1, 7.2
  *
  * @package   SendGrid\Tests
  * @author    Elmer Thomas <dx@sendgrid.com>
  * @copyright 2018-19 Twilio SendGrid
  * @license   https://opensource.org/licenses/MIT The MIT License
  * @version   GIT: <git_id>
- * @link      http://packagist.org/packages/sendgrid/sendgrid 
+ * @link      http://packagist.org/packages/sendgrid/sendgrid
  */
 namespace SendGrid\Tests;
 
 use PHPUnit\Framework\TestCase;
+use SendGrid;
+use Swaggest\JsonDiff\Exception;
 use Swaggest\JsonDiff\JsonDiff;
 use Swaggest\JsonDiff\JsonPatch;
 
 /**
- * This class facilitates testing the request object 
+ * This class facilitates testing the request object
  * generation for a /mail/send API call
- * 
+ *
  * @package SendGrid\Mail
  */
 class BaseTestClass extends TestCase
 {
-    // @var string Twilio SendGrid API Key
+    /** @var string Twilio SendGrid API Key */
     protected static $apiKey;
-    // @var SendGrid Twilio SendGrid client
+    /** @var SendGrid Twilio SendGrid client */
     protected static $sg;
 
     /**
      * This method is run before the classes are initialised
-     * 
+     *
      * @return null
      */
     public static function setUpBeforeClass()
     {
         self::$apiKey = "SENDGRID_API_KEY";
         $host = ['host' => 'http://localhost:4010'];
-        self::$sg = new \SendGrid(self::$apiKey, $host);
+        self::$sg = new SendGrid(self::$apiKey, $host);
     }
 
     /**
-     * Compares to JSON objects and returns True if equal, 
+     * Compares to JSON objects and returns True if equal,
      * else return array of differences
-     * 
+     *
      * @param string $json1 A string representation of a JSON object
      * @param string $json2 A string representation of a JSON object
-     * 
+     *
      * @return bool|array
+     * @throws Exception
      */
     public static function compareJSONObjects($json1, $json2)
     {

test/integration/Alerts/AlertsTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace SendGrid\Tests;
+namespace SendGrid\Tests\Integration\Alerts;
+
+use SendGrid\Tests\BaseTestClass;
 
 class AlertsTest extends BaseTestClass
 {

test/integration/ApiKeys/ApiKeysTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\ApiKeys;
+namespace SendGrid\Tests\Integration\ApiKeys;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Asm/AsmGroupsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Asm;
+namespace SendGrid\Tests\Integration\Asm;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Asm/AsmSuppressionTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Asm;
+namespace SendGrid\Tests\Integration\Asm;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Campaigns/CampaignsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Campaigns;
+namespace SendGrid\Tests\Integration\Campaigns;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Categories/CategoriesTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Categories;
+namespace SendGrid\Tests\Integration\Categories;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Contacts/ContactDbTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Contacts;
+namespace SendGrid\Tests\Integration\Contacts;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/helpers/contacts/RecipientsTest.php → test/integration/Helpers/Contacts/RecipientsTest.php

@@ -1,11 +1,11 @@
 <?php
-namespace SendGrid\Tests;
+namespace SendGrid\Tests\Integration\Helpers\Contacts;
 
 use SendGrid\Tests\BaseTestClass;
 use SendGrid\Contacts\RecipientForm;
 use SendGrid\Contacts\Recipient;
 
-class RecipientsTestRecipient extends BaseTestClass
+class RecipientsTest extends BaseTestClass
 {
     public function testRecipientsForm()
     {

test/integration/helpers/stats/StatsTest.php → test/integration/Helpers/Stats/StatsTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace SendGrid\Tests;
+namespace SendGrid\Tests\Integration\Helpers\Stats;
 
 use SendGrid\Tests\BaseTestClass;
 use SendGrid\Stats\Stats;
@@ -47,7 +47,7 @@ public function testGetValues(
      * @param array $expectedSum
      * @param array $expectedSubuserMonthly
      * @dataProvider invalidValues
-     * @expectedException Exception
+     * @expectedException \Exception
      */
     public function testGetValuesFail(
         $expectedGlobal,

test/integration/Ip/IpPoolsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Ip;
+namespace SendGrid\Tests\Integration\Ip;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Ip/IpsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Ip;
+namespace SendGrid\Tests\Integration\Ip;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Ip/IpsWarmupTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Ip;
+namespace SendGrid\Tests\Integration\Ip;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Mail/MailBatchTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Mail;
+namespace SendGrid\Tests\Integration\Mail;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Mail/MailSendTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Mail;
+namespace SendGrid\Tests\Integration\Mail;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Mail/MailSettingsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Mail;
+namespace SendGrid\Tests\Integration\Mail;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Mail/MailboxProvidersTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Mail;
+namespace SendGrid\Tests\Integration\Mail;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Scopes/ScopesTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Scopes;
+namespace SendGrid\Tests\Integration\Scopes;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/SenderAuthentication/DomainAuthenticationTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace SendGrid\Tests\Whitelabel;
+namespace SendGrid\Tests\Integration\SenderAuthentication;
 
 use SendGrid\Tests\BaseTestClass;
 
-class WhitelabelDomainsTest extends BaseTestClass
+class DomainAuthenticationTest extends BaseTestClass
 {
     public function testWhitelabelDomainsPostMethod()
     {

test/integration/SenderAuthentication/LinkBrandingTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace SendGrid\Tests\Whitelabel;
+namespace SendGrid\Tests\Integration\SenderAuthentication;
 
 use SendGrid\Tests\BaseTestClass;
 
-class WhitelabelLinksTest extends BaseTestClass
+class LinkBrandingTest extends BaseTestClass
 {
     public function testWhitelabelLinksPostMethod()
     {

test/integration/SenderAuthentication/ReverseDNSTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace SendGrid\Tests\Whitelabel;
+namespace SendGrid\Tests\Integration\SenderAuthentication;
 
 use SendGrid\Tests\BaseTestClass;
 
-class WhitelabelIpsTest extends BaseTestClass
+class ReverseDNSTest extends BaseTestClass
 {
     public function testWhitelabelIpsPostMethod()
     {

test/integration/Senders/SendersTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Senders;
+namespace SendGrid\Tests\Integration\Senders;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Settings/AccessSettingsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Settings;
+namespace SendGrid\Tests\Integration\Settings;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Settings/PartnerSettingsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Settings;
+namespace SendGrid\Tests\Integration\Settings;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Settings/TrackingSettingsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Settings;
+namespace SendGrid\Tests\Integration\Settings;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Stats/BrowserStatsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Stats;
+namespace SendGrid\Tests\Integration\Stats;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Stats/ClientsStatsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Stats;
+namespace SendGrid\Tests\Integration\Stats;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Stats/DevicesStatsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Stats;
+namespace SendGrid\Tests\Integration\Stats;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Stats/GeoStatsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Stats;
+namespace SendGrid\Tests\Integration\Stats;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Stats/StatsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Stats;
+namespace SendGrid\Tests\Integration\Stats;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Subusers/SubUsersTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Subusers;
+namespace SendGrid\Tests\Integration\Subusers;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Suppression/SuppressionBlocksTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Suppression;
+namespace SendGrid\Tests\Integration\Suppression;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Suppression/SuppressionBouncesTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Suppression;
+namespace SendGrid\Tests\Integration\Suppression;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Suppression/SuppressionInvalidEmailsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Suppression;
+namespace SendGrid\Tests\Integration\Suppression;
 
 use SendGrid\Tests\BaseTestClass;
 

test/integration/Suppression/SuppressionSpamReportsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SendGrid\Tests\Suppression;
+namespace SendGrid\Tests\Integration\Suppression;
 
 use SendGrid\Tests\BaseTestClass;