From 9ff74bece82d5191b47e740978f31cb80112d049 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Thu, 31 Jul 2014 16:55:46 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20cs=20=09modifi=C3=A9:=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20core/lib/Thelia/ImportExport/Export/Type/OrderExport.p?=
 =?UTF-8?q?hp=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia?=
 =?UTF-8?q?/Tests/ImportExport/Export/OrderExportTest.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Thelia/ImportExport/Export/Type/OrderExport.php    |  8 ++------
 .../Tests/ImportExport/Export/OrderExportTest.php      | 10 +++-------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/core/lib/Thelia/ImportExport/Export/Type/OrderExport.php b/core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
index 8ba86d74a..e59eb5ea7 100644
--- a/core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
+++ b/core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
@@ -12,7 +12,6 @@
 
 namespace Thelia\ImportExport\Export\Type;
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Thelia\Core\FileFormat\FormatType;
 use Thelia\Core\Template\Element\BaseLoop;
@@ -22,8 +21,6 @@ use Thelia\Model\Map\CountryI18nTableMap;
 use Thelia\Model\Map\CurrencyTableMap;
 use Thelia\Model\Map\CustomerTableMap;
 use Thelia\Model\Map\CustomerTitleI18nTableMap;
-use Thelia\Model\Map\ModuleTableMap;
-use Thelia\Model\Map\OrderAddressTableMap;
 use Thelia\Model\Map\OrderCouponTableMap;
 use Thelia\Model\Map\OrderProductTableMap;
 use Thelia\Model\Map\OrderProductTaxTableMap;
@@ -251,7 +248,7 @@ class OrderExport extends ExportHandler
     }
 
     /**
-     * @param  Lang $lang
+     * @param  Lang                         $lang
      * @return ModelCriteria|array|BaseLoop
      */
     public function buildDataSet(Lang $lang)
@@ -280,7 +277,6 @@ class OrderExport extends ExportHandler
             $line["order_TOTAL_WITH_DISCOUNT"] = "";
             $line["order_TOTAL_WITH_DISCOUNT_AND_POSTAGE"] = "";
 
-
             if (null === $previous || $previous !== $line[OrderTableMap::REF]) {
                 $previous = $line[OrderTableMap::REF];
 
@@ -432,4 +428,4 @@ class OrderExport extends ExportHandler
             "tax_title",
         ];
     }
-} 
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php b/core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
index 921f5d692..740c266a1 100644
--- a/core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
+++ b/core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
@@ -16,8 +16,6 @@ use Thelia\Core\Translation\Translator;
 use Thelia\ImportExport\Export\Type\OrderExport;
 use Thelia\Model\Lang;
 use Thelia\Model\Map\OrderCouponTableMap;
-use Thelia\Model\Map\OrderProductTableMap;
-use Thelia\Model\Map\OrderProductTaxTableMap;
 use Thelia\Model\OrderCouponQuery;
 use Thelia\Model\OrderProductQuery;
 use Thelia\Model\OrderQuery;
@@ -47,11 +45,10 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
         $count = $ordersProductQuery->count();
         $this->assertEquals(count($data), $count);
 
-
         /**
          * For the rest of the test, 50 orders are much enough
          */
-        if  ($count > 50) {
+        if ($count > 50) {
             $count = 50;
         }
 
@@ -97,7 +94,6 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
             $this->assertEquals($order->getTotalAmount($tax, false, true), $row["total_with_discount"]);
             $this->assertEquals($order->getTotalAmount($tax, true, true), $row["total_discount_and_postage"]);
 
-
             $invoiceAddress = $order->getOrderAddressRelatedByInvoiceOrderAddressId();
             $deliveryAddress = $order->getOrderAddressRelatedByDeliveryOrderAddressId();
 
@@ -127,7 +123,7 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
                     ->filterByTitle($data[$i]["product_title"])
                     ->filterByTaxRuleTitle($data[$i]["tax_title"])
                     ->filterByWasInPromo($data[$i]["was_in_promo"])
-                    ->_if((bool)((int)$data[$i]["was_in_promo"]))
+                    ->_if((bool) ((int) $data[$i]["was_in_promo"]))
                         ->filterByPromoPrice($data[$i]["price"])
                     ->_else()
                         ->filterByPrice($data[$i]["price"])
@@ -146,4 +142,4 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
             }
         }
     }
-} 
\ No newline at end of file
+}