Merge pull request #53 from goshippo/api-version-v4

mootrichard · web-flow · commit 091cdd3c6439 · 2017-08-02T16:16:54.000-07:00
[API V4] Remove count from the library and fix test
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.2
+1.4.2
diff --git a/examples/basic-batch-shipment.php b/examples/basic-batch-shipment.php
@@ -10,7 +10,6 @@
 Waiting for the batch to validate
 --> Batch object 6590eecf10f04c79a41bc6ffc6406b6f has status VALID
 --> batch now contains shipments: {
-    "count": 2,
     "next": null,
     "previous": null,
     "results": [
@@ -37,7 +36,6 @@
     ]
 }
 --> batch now contains shipments: {
-    "count": 1,
     "next": null,
     "previous": null,
     "results": [
diff --git a/test/AddressTest.php b/test/AddressTest.php
@@ -65,7 +65,6 @@ public function testListAll()
             'results' => '3',
             'page' => '1'
         ));
-        $this->assertFalse(is_null($list->count));
         $this->assertFalse(is_null($list->results));
     }
     
diff --git a/test/BatchTest.php b/test/BatchTest.php
@@ -111,7 +111,6 @@ private function batchCreateResponse($carrier, $metadata) {
             'default_servicelevel_token' => 'usps_priority',
             'label_filetype' => 'PDF_4x6',
             'batch_shipments' => array(
-                'count' => 0,
                 'next' => null,
                 'previous' => null,
                 'results' => array()
@@ -138,7 +137,6 @@ private function batchRetrieveResponse($batch_id) {
             'default_servicelevel_token' => 'usps_priority',
             'label_filetype' => 'PDF_4x6',
             'batch_shipments' => array(
-                'count' => 1,
                 'next' => 'https://api.goshippo.com/batches/5ef63c54f5bf45d3b1f8fb37dcb1c5f4?object_results=creation_failed&page=3',
                 'previous' => 'https://api.goshippo.com/batches/5ef63c54f5bf45d3b1f8fb37dcb1c5f4?object_results=creation_failed&page=1',
                 'results' => array(
@@ -184,7 +182,6 @@ private function batchAddResponse($batch_id) {
             'default_servicelevel_token' => 'usps_priority',
             'label_filetype' => 'PDF_4x6',
             'batch_shipments' => array(
-                'count' => 2,
                 'next' => null,
                 'previous' => null,
                 'results' => array(
@@ -232,7 +229,6 @@ private function batchRemoveResponse($batch_id) {
             'default_servicelevel_token' => 'usps_priority',
             'label_filetype' => 'PDF_4x6',
             'batch_shipments' => array(
-                'count' => 0,
                 'next' => null,
                 'previous' => null,
                 'results' => array()
@@ -259,7 +255,6 @@ private function batchPurchaseResponse($batch_id) {
             'default_servicelevel_token' => 'usps_priority',
             'label_filetype' => 'PDF_4x6',
             'batch_shipments' => array(
-                'count' => 1,
                 'next' => null,
                 'previous' => null,
                 'results' => array(
diff --git a/test/CarrierAccountTest.php b/test/CarrierAccountTest.php
@@ -5,7 +5,6 @@ class Shippo_CarrierAccountTest extends TestCase
     
     public function testListAll() {
         $list = Shippo_CarrierAccount::all();
-        $this->assertFalse(is_null($list->count));
         $this->assertFalse(is_null($list->results));
     }
 
diff --git a/test/CustomsDeclarationTest.php b/test/CustomsDeclarationTest.php
@@ -41,7 +41,6 @@ public function testListAll()
             'results' => '3',
             'page' => '1'
         ));
-        $this->assertFalse(is_null($list->count));
         $this->assertFalse(is_null($list->results));
     }
     
diff --git a/test/CustomsItemTest.php b/test/CustomsItemTest.php
@@ -41,7 +41,6 @@ public function testListAll()
             'results' => '3',
             'page' => '1'
         ));
-        $this->assertFalse(is_null($list->count));
         $this->assertFalse(is_null($list->results));
     }
     
diff --git a/test/ManifestTest.php b/test/ManifestTest.php
@@ -35,7 +35,6 @@ public function testListAll()
             'results' => '3',
             'page' => '1'
         ));
-        $this->assertFalse(is_null($list->count));
         $this->assertFalse(is_null($list->results));
     }
 
diff --git a/test/ParcelTest.php b/test/ParcelTest.php
@@ -40,7 +40,6 @@ public function testListAll()
             'results' => '3',
             'page' => '1'
         ));
-        $this->assertFalse(is_null($list->count));
         $this->assertFalse(is_null($list->results));
     }
     
diff --git a/test/ShipmentTest.php b/test/ShipmentTest.php
@@ -2,13 +2,13 @@
 
 class Shippo_ShipmentTest extends TestCase
 {
-    
+
     public function testValidCreate()
     {
         $shipment = self::getDefaultShipment();
         $this->assertEquals($shipment->status, 'SUCCESS');
     }
-    
+
     public function testInvalidCreate()
     {
         try {
@@ -20,24 +20,23 @@ public function testInvalidCreate()
             $this->assertTrue(true);
         }
     }
-    
+
     public function testRetrieve()
     {
         $shipment = self::getDefaultShipment();
         $retrieve_shipment = Shippo_Shipment::retrieve($shipment->object_id);
         $this->assertEquals($retrieve_shipment->object_id, $shipment->object_id);
     }
-    
+
     public function testListAll()
     {
         $list = Shippo_Shipment::all(array(
             'results' => '3',
             'page' => '1'
         ));
-        $this->assertFalse(is_null($list->count));
         $this->assertFalse(is_null($list->results));
     }
-    
+
     public function testListPageSize()
     {
         $pagesize = 1;
@@ -47,7 +46,7 @@ public function testListPageSize()
         ));
         $this->assertEquals(count($list->results), $pagesize);
     }
-    
+
     public static function getDefaultShipment()
     {
         $addressFrom = Shippo_AddressTest::getDefaultAddress();
@@ -57,7 +56,6 @@ public static function getDefaultShipment()
             'address_from' => $addressFrom->object_id,
             'address_to' => $addressTo->object_id,
             'parcels' => array($parcel->object_id),
-            'shipment_date' => '2013-12-03T12:00:00.000Z',
             'extra' => array(
                 'signature_confirmation' => 'True',
                 'insurance' => array(
diff --git a/test/TransactionTest.php b/test/TransactionTest.php
@@ -34,7 +34,6 @@ public function testListAll()
             'results' => '3',
             'page' => '1'
         ));
-        $this->assertFalse(is_null($list->count));
         $this->assertFalse(is_null($list->results));
     }
     

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ public function testListAll()`
`65`	`65`	`'results' => '3',`
`66`	`66`	`'page' => '1'`
`67`	`67`	`));`
`68`		`- $this->assertFalse(is_null($list->count));`
`69`	`68`	`$this->assertFalse(is_null($list->results));`
`70`	`69`	`}`
`71`	`70`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ class Shippo_CarrierAccountTest extends TestCase`
`5`	`5`
`6`	`6`	`public function testListAll() {`
`7`	`7`	`$list = Shippo_CarrierAccount::all();`
`8`		`- $this->assertFalse(is_null($list->count));`
`9`	`8`	`$this->assertFalse(is_null($list->results));`
`10`	`9`	`}`
`11`	`10`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public function testListAll()`
`41`	`41`	`'results' => '3',`
`42`	`42`	`'page' => '1'`
`43`	`43`	`));`
`44`		`- $this->assertFalse(is_null($list->count));`
`45`	`44`	`$this->assertFalse(is_null($list->results));`
`46`	`45`	`}`
`47`	`46`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public function testListAll()`
`35`	`35`	`'results' => '3',`
`36`	`36`	`'page' => '1'`
`37`	`37`	`));`
`38`		`- $this->assertFalse(is_null($list->count));`
`39`	`38`	`$this->assertFalse(is_null($list->results));`
`40`	`39`	`}`
`41`	`40`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ public function testListAll()`
`40`	`40`	`'results' => '3',`
`41`	`41`	`'page' => '1'`
`42`	`42`	`));`
`43`		`- $this->assertFalse(is_null($list->count));`
`44`	`43`	`$this->assertFalse(is_null($list->results));`
`45`	`44`	`}`
`46`	`45`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@`
`2`	`2`
`3`	`3`	`class Shippo_ShipmentTest extends TestCase`
`4`	`4`	`{`
`5`		`-`
	`5`	`+`
`6`	`6`	`public function testValidCreate()`
`7`	`7`	`{`
`8`	`8`	`$shipment = self::getDefaultShipment();`
`9`	`9`	`$this->assertEquals($shipment->status, 'SUCCESS');`
`10`	`10`	`}`
`11`		`-`
	`11`	`+`
`12`	`12`	`public function testInvalidCreate()`
`13`	`13`	`{`
`14`	`14`	`try {`
`@@ -20,24 +20,23 @@ public function testInvalidCreate()`
`20`	`20`	`$this->assertTrue(true);`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`-`
	`23`	`+`
`24`	`24`	`public function testRetrieve()`
`25`	`25`	`{`
`26`	`26`	`$shipment = self::getDefaultShipment();`
`27`	`27`	`$retrieve_shipment = Shippo_Shipment::retrieve($shipment->object_id);`
`28`	`28`	`$this->assertEquals($retrieve_shipment->object_id, $shipment->object_id);`
`29`	`29`	`}`
`30`		`-`
	`30`	`+`
`31`	`31`	`public function testListAll()`
`32`	`32`	`{`
`33`	`33`	`$list = Shippo_Shipment::all(array(`
`34`	`34`	`'results' => '3',`
`35`	`35`	`'page' => '1'`
`36`	`36`	`));`
`37`		`- $this->assertFalse(is_null($list->count));`
`38`	`37`	`$this->assertFalse(is_null($list->results));`
`39`	`38`	`}`
`40`		`-`
	`39`	`+`
`41`	`40`	`public function testListPageSize()`
`42`	`41`	`{`
`43`	`42`	`$pagesize = 1;`
`@@ -47,7 +46,7 @@ public function testListPageSize()`
`47`	`46`	`));`
`48`	`47`	`$this->assertEquals(count($list->results), $pagesize);`
`49`	`48`	`}`
`50`		`-`
	`49`	`+`
`51`	`50`	`public static function getDefaultShipment()`
`52`	`51`	`{`
`53`	`52`	`$addressFrom = Shippo_AddressTest::getDefaultAddress();`
`@@ -57,7 +56,6 @@ public static function getDefaultShipment()`
`57`	`56`	`'address_from' => $addressFrom->object_id,`
`58`	`57`	`'address_to' => $addressTo->object_id,`
`59`	`58`	`'parcels' => array($parcel->object_id),`
`60`		`- 'shipment_date' => '2013-12-03T12:00:00.000Z',`
`61`	`59`	`'extra' => array(`
`62`	`60`	`'signature_confirmation' => 'True',`
`63`	`61`	`'insurance' => array(`