Replace deprecated methods with their replacements

Signed-off-by: Ghazanfar Mir <[email protected]>
GhazanfarMir · Aug 6, 2019 · a6e86a9 · a6e86a9
1 parent 0167bfc
commit a6e86a9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/tests/Features/CompaniesHouseBaseTest.php b/tests/Features/CompaniesHouseBaseTest.php
@@ -45,5 +45,7 @@ public function setUp(): void
         $this->api = new CompaniesHouse($this->client);
 
         $this->platform = getenv('PLATFORM');
+
+        $this->assertTrue(true);
     }
 }
diff --git a/tests/Features/CompanyTest.php b/tests/Features/CompanyTest.php
@@ -2,6 +2,8 @@
 
 namespace GhazanfarMir\CompaniesHouse\Tests\Features;
 
+use GhazanfarMir\CompaniesHouse\Exceptions\InvalidResourceException;
+
 class CompanyTest extends CompaniesHouseBaseTest
 {
     /**
@@ -22,9 +24,9 @@ public function get_company_profile_by_company_number()
 
         $companies = $this->api->company($this->number)->get();
 
-        $this->assertArrayHasKey('company_name', (array) $companies);
+        $this->assertArrayHasKey('company_name', (array)$companies);
 
-        $this->assertArrayHasKey('company_status', (array) $companies);
+        $this->assertArrayHasKey('company_status', (array)$companies);
     }
 
     /**
@@ -38,7 +40,7 @@ public function get_company_registered_address()
             return;
         }
 
-        $address = (array) $this->api->company($this->number)->registered_office_address();
+        $address = (array)$this->api->company($this->number)->registered_office_address();
 
         $this->assertArrayHasKey('postal_code', $address);
         $this->assertArrayHasKey('country', $address);
@@ -60,9 +62,9 @@ public function get_company_officers()
 
         $officers = $this->api->company($this->number)->officers();
 
-        $this->assertArrayHasKey('total_results', (array) $officers);
-        $this->assertArrayHasKey('name', (array) $officers->items[0]);
-        $this->assertArrayHasKey('address', (array) $officers->items[0]);
+        $this->assertArrayHasKey('total_results', (array)$officers);
+        $this->assertArrayHasKey('name', (array)$officers->items[0]);
+        $this->assertArrayHasKey('address', (array)$officers->items[0]);
     }
 
     /**
@@ -78,30 +80,34 @@ public function get_uk_establishment_companies()
 
         $establishments = $this->api->company($this->number)->uk_establishments();
 
-        $this->assertArrayHasKey('items', (array) $establishments);
+        $this->assertArrayHasKey('items', (array)$establishments);
     }
 
     /**
-     * @expectedException \GhazanfarMir\CompaniesHouse\Exceptions\InvalidResourceException
      * @test
      */
     public function get_company_registers()
     {
+        $this->expectException(InvalidResourceException::class);
+
         if ($this->platform == 'travis') {
             throw new \GhazanfarMir\CompaniesHouse\Exceptions\InvalidResourceException;
 
+
             return;
         }
 
         $this->api->company($this->number)->registers();
     }
 
     /**
-     * @expectedException \GhazanfarMir\CompaniesHouse\Exceptions\InvalidResourceException
      * @test
      */
     public function get_company_exemptions()
     {
+
+        $this->expectException(InvalidResourceException::class);
+
         if ($this->platform == 'travis') {
             throw new \GhazanfarMir\CompaniesHouse\Exceptions\InvalidResourceException;