Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions lib/EasyPost/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,7 @@ public static function create_and_verify($params = null, $apiKey = null)
$url = self::classUrl($class);
list($response, $apiKey) = $requestor->request('post', $url . '/create_and_verify', $params);

if (isset($response['address'])) {
$verifiedAddress = Util::convertToEasyPostObject($response['address'], $apiKey);

return $verifiedAddress;
} else {
return Util::convertToEasyPostObject($response, $apiKey);
}
return Util::convertToEasyPostObject($response['address'], $apiKey);
}

/**
Expand All @@ -118,12 +112,6 @@ public function verify()
$url = $this->instanceUrl() . '/verify';
list($response, $apiKey) = $requestor->request('get', $url, null);

if (isset($response['address'])) {
$verifiedAddress = Util::convertToEasyPostObject($response['address'], $apiKey);

return $verifiedAddress;
} else {
return Util::convertToEasyPostObject($response, $apiKey);
}
return Util::convertToEasyPostObject($response['address'], $apiKey);
}
}
15 changes: 15 additions & 0 deletions test/EasyPost/AddressTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,19 @@ public function testVerify()
$this->assertStringMatchesFormat('adr_%s', $address->id);
$this->assertEquals('388 Townsend St', $address->street1);
}

/**
* Test we throw an error for an invalid address verification.
*/
public function testVerifyInvalid()
{
VCR::insertCassette('addresses/verifyInvalid.yml');

try {
$address = Address::create(['street1' => 'invalid']);
$address->verify();
} catch (\EasyPost\Error $error) {
$this->assertEquals('Unable to verify address.', $error->getMessage());
}
}
}
151 changes: 151 additions & 0 deletions test/cassettes/addresses/verifyInvalid.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.