From ea834b7585cfc7378d9da56dde0f451050434cae Mon Sep 17 00:00:00 2001
From: pinguinjkeke <yaavakov@gmail.com>
Date: Tue, 18 Jul 2017 14:49:45 +0300
Subject: [PATCH] Rename CartItemInterface to OrderItemInterface and
 CartItemTaxableInterface to OrderItemTaxableInterface

---
 README.md                                                 | 8 ++++----
 src/OrderBundle/OrderBundle.php                           | 6 +++---
 src/OrderBundle/OrderInterface.php                        | 2 +-
 .../{CartItemInterface.php => OrderItemInterface.php}     | 2 +-
 ...TaxableInterface.php => OrderItemTaxableInterface.php} | 2 +-
 tests/Examples/Order.php                                  | 8 ++++----
 tests/Examples/{CartItem.php => OrderItem.php}            | 6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)
 rename src/OrderBundle/{CartItemInterface.php => OrderItemInterface.php} (98%)
 rename src/OrderBundle/{CartItemTaxableInterface.php => OrderItemTaxableInterface.php} (92%)
 rename tests/Examples/{CartItem.php => OrderItem.php} (93%)

diff --git a/README.md b/README.md
index b6cf4ff..009ba7f 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ $success = $response->isSuccess();
 ```php
 class Order extends EloquentModel implements OrderInterface
 {
-    // Должен вернуть массив товаров, реализовывающих CartItemInterface
+    // Должен вернуть массив товаров, реализовывающих OrderItemInterface
     public function getItems()
     {
         return $this->cart;
@@ -149,9 +149,9 @@ class User extends EloquentModel implements CustomerInterface
     }
 }
 ```
-Товар в корзине должен реализовывать интерфейс CartItemInterface.
+Товар в корзине должен реализовывать интерфейс OrderItemInterface.
 ```php
-class CartProduct extends EloquentModel implements CartItemInterface
+class CartProduct extends EloquentModel implements OrderItemInterface
 {
     // Название товара
     public function getName()
@@ -219,7 +219,7 @@ class CartProduct extends EloquentModel implements CartItemInterface
 }
 ```
 Если в рамках вашей системы возможно использование нескольких систем налогообложения для разных товаров
-, то взгляните на интерфейс ```CartItemTaxableInterface```.
+, то взгляните на интерфейс ```OrderItemTaxableInterface```.
 
 К методу авторизации заказа в банке необходимо прикрепить ```Omnipay\PaymentgateRu\OrderBundle\OrderBundle```
 и в качестве аргумента конструктора передать ваш заказ ```OrderInterface```
diff --git a/src/OrderBundle/OrderBundle.php b/src/OrderBundle/OrderBundle.php
index b09640e..f6c98ad 100644
--- a/src/OrderBundle/OrderBundle.php
+++ b/src/OrderBundle/OrderBundle.php
@@ -64,10 +64,10 @@ public function toArray()
     /**
      * Transform cart item to array.
      *
-     * @param CartItemInterface $cartItem
+     * @param OrderItemInterface $cartItem
      * @return array
      */
-    protected function cartItemToArray(CartItemInterface $cartItem)
+    protected function cartItemToArray(OrderItemInterface $cartItem)
     {
         $array = array(
             'positionId' => $this->positionId,
@@ -88,7 +88,7 @@ protected function cartItemToArray(CartItemInterface $cartItem)
             $array['discount']['type'] = $cartItem->getDiscountType();
         }
 
-        if ($cartItem instanceof CartItemTaxableInterface) {
+        if ($cartItem instanceof OrderItemTaxableInterface) {
             $array['tax'] = array_filter(array(
                 'taxSum' => $cartItem->getTaxSum(),
                 'taxType' => $cartItem->getTaxSum()
diff --git a/src/OrderBundle/OrderInterface.php b/src/OrderBundle/OrderInterface.php
index aa5d194..b14d144 100644
--- a/src/OrderBundle/OrderInterface.php
+++ b/src/OrderBundle/OrderInterface.php
@@ -7,7 +7,7 @@ interface OrderInterface
     /**
      * Order's cart.
      *
-     * @return CartItemInterface[]
+     * @return OrderItemInterface[]
      */
     public function getItems();
 
diff --git a/src/OrderBundle/CartItemInterface.php b/src/OrderBundle/OrderItemInterface.php
similarity index 98%
rename from src/OrderBundle/CartItemInterface.php
rename to src/OrderBundle/OrderItemInterface.php
index a4797dc..be5dce9 100644
--- a/src/OrderBundle/CartItemInterface.php
+++ b/src/OrderBundle/OrderItemInterface.php
@@ -2,7 +2,7 @@
 
 namespace Omnipay\PaymentgateRu\OrderBundle;
 
-interface CartItemInterface
+interface OrderItemInterface
 {
     /**
      * Product name.
diff --git a/src/OrderBundle/CartItemTaxableInterface.php b/src/OrderBundle/OrderItemTaxableInterface.php
similarity index 92%
rename from src/OrderBundle/CartItemTaxableInterface.php
rename to src/OrderBundle/OrderItemTaxableInterface.php
index 92f60ba..d515636 100644
--- a/src/OrderBundle/CartItemTaxableInterface.php
+++ b/src/OrderBundle/OrderItemTaxableInterface.php
@@ -2,7 +2,7 @@
 
 namespace Omnipay\PaymentgateRu\OrderBundle;
 
-interface CartItemTaxableInterface
+interface OrderItemTaxableInterface
 {
     /**
      * Tax types.
diff --git a/tests/Examples/Order.php b/tests/Examples/Order.php
index bbd0189..173c8bf 100644
--- a/tests/Examples/Order.php
+++ b/tests/Examples/Order.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Examples;
 
-use Omnipay\PaymentgateRu\OrderBundle\CartItemInterface;
+use Omnipay\PaymentgateRu\OrderBundle\OrderItemInterface;
 use Omnipay\PaymentgateRu\OrderBundle\CustomerInterface;
 use Omnipay\PaymentgateRu\OrderBundle\OrderDeliverableInterface;
 use Omnipay\PaymentgateRu\OrderBundle\OrderInterface;
@@ -52,13 +52,13 @@ public function getPostAddress()
     /**
      * Order's cart.
      *
-     * @return CartItemInterface[]
+     * @return OrderItemInterface[]
      */
     public function getItems()
     {
         return array(
-            new CartItem(3200000, 'iPhone 6S 64Gb Space Gray', 2),
-            new CartItem(1000000, 'Samsung Galaxy Note II White', 1)
+            new OrderItem(3200000, 'iPhone 6S 64Gb Space Gray', 2),
+            new OrderItem(1000000, 'Samsung Galaxy Note II White', 1)
         );
     }
 
diff --git a/tests/Examples/CartItem.php b/tests/Examples/OrderItem.php
similarity index 93%
rename from tests/Examples/CartItem.php
rename to tests/Examples/OrderItem.php
index 0cb03a1..4e8ae3f 100644
--- a/tests/Examples/CartItem.php
+++ b/tests/Examples/OrderItem.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Examples;
 
-use Omnipay\PaymentgateRu\OrderBundle\CartItemInterface;
-use Omnipay\PaymentgateRu\OrderBundle\CartItemTaxableInterface;
+use Omnipay\PaymentgateRu\OrderBundle\OrderItemInterface;
+use Omnipay\PaymentgateRu\OrderBundle\OrderItemTaxableInterface;
 
-class CartItem implements CartItemInterface, CartItemTaxableInterface
+class OrderItem implements OrderItemInterface, OrderItemTaxableInterface
 {
     /**
      * Product price.