Merge branch 'miketramontano-master'

Merge in Shipping Address docs change
This commit is contained in:
Avi Das
2014-07-22 14:26:50 -05:00
2 changed files with 6 additions and 6 deletions

View File

@@ -241,7 +241,7 @@ class PayerInfo extends PPModel
* Set Shipping Address * Set Shipping Address
* Shipping address of the Payer from their PayPal Account * Shipping address of the Payer from their PayPal Account
* *
* @param \PayPal\Api\Address $shipping_address * @param \PayPal\Api\ShippingAddress $shipping_address
* *
* @return $this * @return $this
*/ */
@@ -256,7 +256,7 @@ class PayerInfo extends PPModel
* Get Shipping Address * Get Shipping Address
* Shipping address of the Payer from their PayPal Account * Shipping address of the Payer from their PayPal Account
* *
* @return \PayPal\Api\Address * @return \PayPal\Api\ShippingAddress
*/ */
public function getShippingAddress() public function getShippingAddress()
{ {
@@ -267,7 +267,7 @@ class PayerInfo extends PPModel
* Set Shipping Address * Set Shipping Address
* Shipping address of the Payer from their PayPal Account * Shipping address of the Payer from their PayPal Account
* *
* @param \PayPal\Api\Address $shipping_address * @param \PayPal\Api\ShippingAddress $shipping_address
* *
* @deprecated Use setShippingAddress * @deprecated Use setShippingAddress
* *
@@ -286,7 +286,7 @@ class PayerInfo extends PPModel
* *
* @deprecated Use getShippingAddress * @deprecated Use getShippingAddress
* *
* @return \PayPal\Api\Address * @return \PayPal\Api\ShippingAddress
*/ */
public function getShipping_address() public function getShipping_address()
{ {

View File

@@ -21,7 +21,7 @@ class PayerInfoTest extends \PHPUnit_Framework_TestCase {
$payerInfo->setLastName(self::$lastName); $payerInfo->setLastName(self::$lastName);
$payerInfo->setPhone(self::$phone); $payerInfo->setPhone(self::$phone);
$payerInfo->setPayerId(self::$payerId); $payerInfo->setPayerId(self::$payerId);
$payerInfo->setShippingAddress(AddressTest::createAddress()); $payerInfo->setShippingAddress(ShippingAddressTest::createAddress());
return $payerInfo; return $payerInfo;
} }
@@ -36,7 +36,7 @@ class PayerInfoTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals(self::$lastName, $this->payerInfo->getLastName()); $this->assertEquals(self::$lastName, $this->payerInfo->getLastName());
$this->assertEquals(self::$phone, $this->payerInfo->getPhone()); $this->assertEquals(self::$phone, $this->payerInfo->getPhone());
$this->assertEquals(self::$payerId, $this->payerInfo->getPayerId()); $this->assertEquals(self::$payerId, $this->payerInfo->getPayerId());
$this->assertEquals(AddressTest::$line1, $this->payerInfo->getShippingAddress()->getLine1()); $this->assertEquals(ShippingAddressTest::$line1, $this->payerInfo->getShippingAddress()->getLine1());
} }
public function testSerializeDeserialize() { public function testSerializeDeserialize() {