Merge branch 'release/1.0.0'

README.md

@@ -24,14 +24,13 @@ $urlSet->configure(array(
   'successUrl'      => 'https://www.demoshop.com/sv/success',
   'failureUrl'      => 'https://www.demoshop.com/sv/failure',
   'notificationUrl' => 'https://www.demoshop.com/sv/notify',
-  'pendingUrl'      => 'https://www.demoshop.com/sv/pending',
 ));
 
 $address = new Address;
 $address->configure(array(
   'streetAddress'   => 'Test street 1',
   'postalCode'      => '12345',
-  'postOffice'      => 'Helsinki',
+  'postalOffice'    => 'Helsinki',
   'countryCode'     => 'FI',
 ));
 
@@ -57,7 +56,7 @@ $product = new Product;
 $product->configure(array(
   'title'           => 'Test product',
   'code'            => '01234',
-  'quantity'        => 1.00,
+  'amount'          => 1.00,
   'price'           => 19.90,
   'vat'             => 23.00,
   'discount'        => 0.00,

src/Object/Address.php

@@ -33,7 +33,7 @@ class Address extends DataObject
     /**
      * @var string $postOffice
      */
-    protected $postOffice;
+    protected $postalOffice;
 
     /**
      * @var string $countryCode
@@ -48,7 +48,7 @@ public function toArray()
         return array(
             'street'       => $this->streetAddress,
             'postalCode'   => $this->postalCode,
-            'postalOffice' => $this->postOffice,
+            'postalOffice' => $this->postalOffice,
             'country'      => $this->countryCode,
         );
     }
@@ -74,13 +74,13 @@ public function getPostalCode()
     }
 
     /**
-     * Get post office.
+     * Get postal office.
      *
      * @return string The post office.
      */
-    public function getPostOffice()
+    public function getPostalOffice()
     {
-        return $this->postOffice;
+        return $this->postalOffice;
     }
 
     /**

tests/unit/ClientTest.php

@@ -133,7 +133,6 @@ protected function makeUrlSet()
             'successUrl'      => 'https://www.demoshop.com/sv/success',
             'failureUrl'      => 'https://www.demoshop.com/sv/failure',
             'notificationUrl' => 'https://www.demoshop.com/sv/notify',
-            'pendingUrl'      => 'https://www.demoshop.com/sv/pending',
         ));
 
         return $urlSet;
@@ -150,7 +149,7 @@ protected function makeAddress()
         $address->configure(array(
             'streetAddress' => 'Test street 1',
             'postalCode'    => '12345',
-            'postOffice'    => 'Helsinki',
+            'postalOffice'    => 'Helsinki',
             'countryCode'   => 'FI',
         ));