end propel 2 migration

core/lib/Thelia/Core/Template/Loop/Category.php

@@ -24,7 +24,6 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;

core/lib/Thelia/Model/Customer.php

@@ -28,6 +28,7 @@ class Customer extends BaseCustomer {
      * @param int $countryId customer country id (from Country table)
      * @param string $email customer email, must be unique
      * @param string $plainPassword customer plain password, hash is made calling setPassword method. Not mandatory parameter but an exception is thrown if customer is new without password
+     * @param string $lang
      * @param int $reseller
      * @param null $sponsor
      * @param int $discount