Merge branch 'master' into stable

Merge in master for Shipping Address change

Author: avidas

lib/PayPal/Api/PayerInfo.php

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

tests/PayPal/Test/Api/PayerInfoTest.php

@@ -21,7 +21,7 @@ public static function createPayerInfo() {
 		$payerInfo->setLastName(self::$lastName);
 		$payerInfo->setPhone(self::$phone);
 		$payerInfo->setPayerId(self::$payerId);
-		$payerInfo->setShippingAddress(AddressTest::createAddress());
+		$payerInfo->setShippingAddress(ShippingAddressTest::createAddress());
 
 		return $payerInfo;
 	}
@@ -36,7 +36,7 @@ public function testGetterSetter() {
 		$this->assertEquals(self::$lastName, $this->payerInfo->getLastName());
 		$this->assertEquals(self::$phone, $this->payerInfo->getPhone());
 		$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() {