Merge branch 'ojtibi-editorconfig'

Merge in pulls for order api, authorization tests and editor guidelines

.editorconfig

@@ -0,0 +1,11 @@
+# EditorConfig: Manage project indentation rules. http://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.php]
+indent_style = space
+indent_size = 4

.gitignore

@@ -4,6 +4,7 @@ build
 *.log
 
 # IDE
+.idea
 .project
 .settings
 .buildpath

lib/PayPal/Api/Order.php

@@ -0,0 +1,231 @@
+<?php
+
+namespace PayPal\Api;
+
+use PayPal\Common\PPModel;
+use PayPal\Rest\ApiContext;
+
+/**
+ * Class Order
+ * 
+ * @property string             id
+ * @property string             createTime
+ * @property string             updateTime
+ * @property string             state
+ * @property \PayPal\Api\Amount amount
+ * @property string             parentPayment
+ * @property \PayPal\Api\Links  links
+ * @property string             reasonCode
+ */
+class Order extends PPModel
+{
+    /**
+     * Set the identifier of the order transaction.
+     * 
+     * @param string $id
+     * 
+     * @return $this
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * Get the identifier of the order transaction.
+     * 
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set the time the resource was created.
+     * 
+     * @param string $create_time
+     * 
+     * @return $this
+     */
+    public function setCreateTime($create_time)
+    {
+        $this->create_time = $create_time;
+
+        return $this;
+    }
+
+    /**
+     * Get the time the resource was created.
+     * 
+     * @return string
+     */
+    public function getCreateTime()
+    {
+        return $this->create_time;
+    }
+
+    /**
+     * Set the time the resource was last updated.
+     * 
+     * @param string $update_time
+     * 
+     * @return $this
+     */
+    public function setUpdateTime($update_time)
+    {
+        $this->update_time = $update_time;
+
+        return $this;
+    }
+
+    /**
+     * Get the time the resource was last updated.
+     * 
+     * @return string
+     */
+    public function getUpdateTime()
+    {
+        return $this->update_time;
+    }
+
+    /**
+     * Set the state of the order transaction.
+     * 
+     * Allowed values are: `PENDING`, `COMPLETED`, `REFUNDED` or `PARTIALLY_REFUNDED`.
+     * 
+     * @param string $state
+     * 
+     * @return $this
+     */
+    public function setState($state)
+    {
+        $this->state = $state;
+
+        return $this;
+    }
+
+    /**
+     * Get the state of the order transaction.
+     * 
+     * Allowed values are: `PENDING`, `COMPLETED`, `REFUNDED` or `PARTIALLY_REFUNDED`.
+     * 
+     * @return string
+     */
+    public function getState()
+    {
+        return $this->state;
+    }
+
+    /**
+     * Set the amount being collected.
+     * 
+     * @param \PayPal\Api\Amount $amount
+     * 
+     * @return $this
+     */
+    public function setAmount($amount)
+    {
+        $this->amount = $amount;
+
+        return $this;
+    }
+
+    /**
+     * Get the amount being collected.
+     * 
+     * @return \PayPal\Api\Amount
+     */
+    public function getAmount()
+    {
+        return $this->amount;
+    }
+
+    /**
+     * Set ID of the payment resource on which this transaction is based.
+     * 
+     * @param string $parent_payment
+     * 
+     * @return $this
+     */
+    public function setParentPayment($parent_payment)
+    {
+        $this->parent_payment = $parent_payment;
+
+        return $this;
+    }
+
+    /**
+     * Get ID of the payment resource on which this transaction is based.
+     * 
+     * @return string
+     */
+    public function getParentPayment()
+    {
+        return $this->parent_payment;
+    }
+
+    /**
+     * Set Links
+     * 
+     * @param \PayPal\Api\Links $links
+     * 
+     * @return $this
+     */
+    public function setLinks($links)
+    {
+        $this->links = $links;
+
+        return $this;
+    }
+
+    /**
+     * Get Links
+     * 
+     * @return \PayPal\Api\Links
+     */
+    public function getLinks()
+    {
+        return $this->links;
+    }
+
+    /**
+     * Reason code for the transaction state being Pending or Reversed. Assigned in response.
+     * 
+     * Allowed values: `CHARGEBACK`, `GUARANTEE`, `BUYER_COMPLAINT`, `REFUND`,
+     * `UNCONFIRMED_SHIPPING_ADDRESS`,
+     * `ECHECK`, `INTERNATIONAL_WITHDRAWAL`,
+     * `RECEIVING_PREFERENCE_MANDATES_MANUAL_ACTION`, `PAYMENT_REVIEW`,
+     * `REGULATORY_REVIEW`, `UNILATERAL`, or `VERIFICATION_REQUIRED`
+     * (`ORDER` can also be set in the response).
+     * 
+     * @param string $reason_code
+     * 
+     * @return $this
+     */
+    public function setReasonCode($reason_code)
+    {
+        $this->reason_code = $reason_code;
+
+        return $this;
+    }
+
+    /**
+     * Reason code for the transaction state being Pending or Reversed. Assigned in response.
+     * 
+     * Allowed values: `CHARGEBACK`, `GUARANTEE`, `BUYER_COMPLAINT`, `REFUND`,
+     * `UNCONFIRMED_SHIPPING_ADDRESS`,
+     * `ECHECK`, `INTERNATIONAL_WITHDRAWAL`,
+     * `RECEIVING_PREFERENCE_MANDATES_MANUAL_ACTION`, `PAYMENT_REVIEW`,
+     * `REGULATORY_REVIEW`, `UNILATERAL`, or `VERIFICATION_REQUIRED`
+     * (`ORDER` can also be set in the response).
+     * 
+     * @return string
+     */
+    public function getReasonCode()
+    {
+        return $this->reason_code;
+    }
+}

lib/PayPal/Api/RelatedResources.php

@@ -114,4 +114,28 @@ class RelatedResources extends PPModel
     {
         return $this->refund;
     }
+
+    /**
+     * Set Order
+     * 
+     * @param \PayPal\Api\Order $order
+     * 
+     * @return $this
+     */
+    public function setOrder($order)
+    {
+        $this->order = $order;
+
+        return $this;
+    }
+
+    /**
+     * Get Order
+     * 
+     * @return \PayPal\Api\Order
+     */
+    public function getOrder()
+    {
+        return $this->order;
+    }
 }

tests/PayPal/Test/Api/AuthorizationTest.php

@@ -19,9 +19,11 @@ use PayPal\Exception\PPConnectionException;
 class AuthorizationTest extends \PHPUnit_Framework_TestCase {
 	private $authorizations = array();
 	public static $create_time = "2013-02-28T00:00:00Z";
+    public static $update_time = "2013-03-28T00:00:00Z";
 	public static $id = "AUTH-123";
 	public static $state = "Created";
 	public static $parent_payment = "PAY-12345";
+    public static $valid_until = "2013-04-28T00:00:00Z";
 	public static $currency = "USD";
 	public static $total = "1.12";
 	public static $href = "USD";
@@ -90,20 +92,24 @@ class AuthorizationTest extends \PHPUnit_Framework_TestCase {
 	public function setup() {
 		$authorization = new Authorization();
 		$authorization->setCreateTime(self::$create_time);
+        $authorization->setUpdateTime(self::$update_time);
 		$authorization->setId(self::$id);
 		$authorization->setState(self::$state);
 		$authorization->setParentPayment(self::$parent_payment);
+        $authorization->setValidUntil(self::$valid_until);
 		$this->authorizations['partial'] = $authorization;
 		$this->authorizations['full'] = self::createAuthorization();
 		
 	}
 
-	public function testGetterSetter() {		
+	public function testGetterSetter() {
 		$authorization = $this->authorizations['partial'];
 		$this->assertEquals(self::$create_time, $authorization->getCreateTime());
+        $this->assertEquals(self::$update_time, $authorization->getUpdateTime());
 		$this->assertEquals(self::$id, $authorization->getId());
 		$this->assertEquals(self::$state, $authorization->getState());
 		$this->assertEquals(self::$parent_payment, $authorization->getParentPayment());
+        $this->assertEquals(self::$valid_until, $authorization->getValidUntil());
 		
 		$authorization = $this->authorizations['full'];
 		$this->assertEquals(AmountTest::$currency, $authorization->getAmount()->getCurrency());
@@ -137,9 +143,15 @@ class AuthorizationTest extends \PHPUnit_Framework_TestCase {
 		$void = $auth->void();
 		$this->assertNotNull($void->getId());
 
+        $auth->setId(null);
+        try {
+            $auth->void();
+        } catch (\InvalidArgumentException $ex) {
+            $this->assertEquals($ex->getMessage(), "Id cannot be null");
+        }
 	}
 	
-	public function testReauthorize(){
+	public function testReauthorize() {
 		$authorization = Authorization::get('7GH53639GA425732B');
 	
 		$amount = new Amount();
@@ -147,10 +159,18 @@ class AuthorizationTest extends \PHPUnit_Framework_TestCase {
 		$amount->setTotal("1.00");
 		
 		$authorization->setAmount($amount);
-		try{
-			$reauthorization = $authorization->reauthorize();
-		}catch (PPConnectionException $ex){
+		try {
+			$authorization->reauthorize();
+		} catch (PPConnectionException $ex){
+            //var_dump($ex->getMessage());
 			$this->assertEquals(strpos($ex->getMessage(),"500"), false);
 		}
+
+        $authorization->setId(null);
+        try {
+            $authorization->reauthorize();
+        } catch (\InvalidArgumentException $ex) {
+            $this->assertEquals($ex->getMessage(), "Id cannot be null");
+        }
 	}
 }

tests/PayPal/Test/Api/OrderTest.php

@@ -0,0 +1,61 @@
+<?php
+namespace PayPal\Test\Api;
+
+use PayPal\Api\Order;
+use PayPal\Api\Amount;
+use PayPal\Api\Details;
+use PayPal\Api\Links;
+use PayPal\Test\Constants;
+
+class OrderTest extends \PHPUnit_Framework_TestCase {
+
+    private $order;
+
+    public static $id = 'O-0AA8876533760860M';
+    public static $createTime = '2014-08-25T19:24:04Z';
+    public static $updateTime = '2014-08-25T19:24:51Z';
+    public static $state = 'pending';
+    public static $parentPayment = 'PAY-0AL32935UM2331537KP5Y2VA';
+    public static $reasonCode = 'order';
+
+    public static function createOrder() {
+        $order = new Order();
+
+        $links = LinksTest::createLinks();
+
+        $order->setId(self::$id);
+        $order->setCreateTime(self::$createTime);
+        $order->setUpdateTime(self::$updateTime);
+        $order->setState(self::$state);
+        $order->setAmount(AmountTest::createAmount());
+        $order->setParentPayment(self::$parentPayment);
+        $order->setLinks(array($links));
+        $order->setReasonCode(self::$reasonCode);
+
+        return $order;
+    }
+
+    public function setup() {
+        $this->order = self::createOrder();
+    }
+
+    public function testGetterSetter() {
+        $this->assertEquals(self::$id, $this->order->getId());
+        $this->assertEquals(self::$createTime, $this->order->getCreateTime());
+        $this->assertEquals(self::$updateTime, $this->order->getUpdateTime());
+        $this->assertEquals(self::$state, $this->order->getState());
+        $this->assertEquals(AmountTest::$currency, $this->order->getAmount()->getCurrency());
+        $this->assertEquals(self::$parentPayment, $this->order->getParentPayment());
+        $this->assertEquals(LinksTest::$href, $this->order->getLinks()[0]->getHref());
+        $this->assertEquals(self::$reasonCode, $this->order->getReasonCode());
+    }
+
+    public function testSerializeDeserialize() {
+        $o1 = $this->order;
+
+        $o2 = new Order();
+        $o2->fromJson($o1->toJson());
+
+        $this->assertEquals($o1, $o2);
+    }
+}

tests/PayPal/Test/Api/RelatedResourcesTest.php

@@ -12,6 +12,7 @@ class RelatedResourcesTest extends \PHPUnit_Framework_TestCase {
 		$relatedResources = new RelatedResources();
 		$relatedResources->setAuthorization(AuthorizationTest::createAuthorization());
 		$relatedResources->setCapture(CaptureTest::createCapture());
+        $relatedResources->setOrder(OrderTest::createOrder());
 		return $relatedResources;
 	}
 	
@@ -22,6 +23,7 @@ class RelatedResourcesTest extends \PHPUnit_Framework_TestCase {
 	public function testGetterSetter() {
 		$this->assertEquals(AuthorizationTest::$create_time, $this->relatedResources->getAuthorization()->getCreateTime());
 		$this->assertEquals(CaptureTest::$create_time, $this->relatedResources->getCapture()->getCreateTime());
+        $this->assertEquals(OrderTest::$id, $this->relatedResources->getOrder()->getId());
 	}
 	
 	public function testSerializeDeserialize() {
@@ -32,4 +34,4 @@ class RelatedResourcesTest extends \PHPUnit_Framework_TestCase {
 		
 		$this->assertEquals($s1, $s2);
 	}
-}
+}