diff --git a/core/lib/Thelia/Action/Attribute.php b/core/lib/Thelia/Action/Attribute.php index 30ceea0e8..4591c2ea5 100644 --- a/core/lib/Thelia/Action/Attribute.php +++ b/core/lib/Thelia/Action/Attribute.php @@ -74,7 +74,6 @@ class Attribute extends BaseAction implements EventSubscriberInterface */ public function update(AttributeUpdateEvent $event) { - $search = AttributeQuery::create(); if (null !== $attribute = AttributeQuery::create()->findPk($event->getAttributeId())) { diff --git a/core/lib/Thelia/Action/AttributeAv.php b/core/lib/Thelia/Action/AttributeAv.php index 83d85b398..f5d320f03 100644 --- a/core/lib/Thelia/Action/AttributeAv.php +++ b/core/lib/Thelia/Action/AttributeAv.php @@ -66,7 +66,6 @@ class AttributeAv extends BaseAction implements EventSubscriberInterface */ public function update(AttributeAvUpdateEvent $event) { - $search = AttributeAvQuery::create(); if (null !== $attribute = AttributeAvQuery::create()->findPk($event->getAttributeAvId())) { diff --git a/core/lib/Thelia/Action/Cache.php b/core/lib/Thelia/Action/Cache.php index 4407c3e92..10a70f2f2 100644 --- a/core/lib/Thelia/Action/Cache.php +++ b/core/lib/Thelia/Action/Cache.php @@ -42,7 +42,7 @@ class Cache extends BaseAction implements EventSubscriberInterface $directoryBrowser = new \DirectoryIterator($dir); $fs = new Filesystem(); - $fs->remove($dir); + $fs->remove($directoryBrowser); } diff --git a/core/lib/Thelia/Action/Cart.php b/core/lib/Thelia/Action/Cart.php index c1abd3034..dbaf3409b 100644 --- a/core/lib/Thelia/Action/Cart.php +++ b/core/lib/Thelia/Action/Cart.php @@ -91,7 +91,7 @@ class Cart extends BaseAction implements EventSubscriberInterface { if (null !== $cartItemId = $event->getCartItem()) { $cart = $event->getCart(); - $cartItem = CartItemQuery::create() + CartItemQuery::create() ->filterByCartId($cart->getId()) ->filterById($cartItemId) ->delete(); diff --git a/core/lib/Thelia/Action/Config.php b/core/lib/Thelia/Action/Config.php index e925811d3..8bb1e9fbf 100644 --- a/core/lib/Thelia/Action/Config.php +++ b/core/lib/Thelia/Action/Config.php @@ -58,7 +58,6 @@ class Config extends BaseAction implements EventSubscriberInterface */ public function setValue(ConfigUpdateEvent $event) { - $search = ConfigQuery::create(); if (null !== $config = $search->findPk($event->getConfigId())) { @@ -78,7 +77,6 @@ class Config extends BaseAction implements EventSubscriberInterface */ public function modify(ConfigUpdateEvent $event) { - $search = ConfigQuery::create(); if (null !== $config = ConfigQuery::create()->findPk($event->getConfigId())) { diff --git a/core/lib/Thelia/Action/Currency.php b/core/lib/Thelia/Action/Currency.php index 3fe24326a..92ce23f99 100644 --- a/core/lib/Thelia/Action/Currency.php +++ b/core/lib/Thelia/Action/Currency.php @@ -95,7 +95,6 @@ class Currency extends BaseAction implements EventSubscriberInterface */ public function setDefault(CurrencyUpdateEvent $event) { - $search = CurrencyQuery::create(); if (null !== $currency = CurrencyQuery::create()->findPk($event->getCurrencyId())) { diff --git a/core/lib/Thelia/Action/Feature.php b/core/lib/Thelia/Action/Feature.php index 36853f444..e46239695 100644 --- a/core/lib/Thelia/Action/Feature.php +++ b/core/lib/Thelia/Action/Feature.php @@ -74,7 +74,6 @@ class Feature extends BaseAction implements EventSubscriberInterface */ public function update(FeatureUpdateEvent $event) { - $search = FeatureQuery::create(); if (null !== $feature = FeatureQuery::create()->findPk($event->getFeatureId())) { diff --git a/core/lib/Thelia/Action/FeatureAv.php b/core/lib/Thelia/Action/FeatureAv.php index c2ef4f7bc..b88c97324 100644 --- a/core/lib/Thelia/Action/FeatureAv.php +++ b/core/lib/Thelia/Action/FeatureAv.php @@ -66,7 +66,6 @@ class FeatureAv extends BaseAction implements EventSubscriberInterface */ public function update(FeatureAvUpdateEvent $event) { - $search = FeatureAvQuery::create(); if (null !== $feature = FeatureAvQuery::create()->findPk($event->getFeatureAvId())) { diff --git a/core/lib/Thelia/Action/Image.php b/core/lib/Thelia/Action/Image.php index e4e1ac8d4..e5beb2823 100644 --- a/core/lib/Thelia/Action/Image.php +++ b/core/lib/Thelia/Action/Image.php @@ -355,7 +355,7 @@ class Image extends BaseCachedFile implements EventSubscriberInterface $delta_x = $delta_y = $border_width = $border_height = 0; - if ($width_diff > 1 AND $height_diff > 1) { + if ($width_diff > 1 && $height_diff > 1) { $next_width = $width_orig; $next_height = $height_orig; diff --git a/core/lib/Thelia/Action/Message.php b/core/lib/Thelia/Action/Message.php index 4b85c7ca9..045769e58 100644 --- a/core/lib/Thelia/Action/Message.php +++ b/core/lib/Thelia/Action/Message.php @@ -68,7 +68,6 @@ class Message extends BaseAction implements EventSubscriberInterface */ public function modify(MessageUpdateEvent $event) { - $search = MessageQuery::create(); if (null !== $message = MessageQuery::create()->findPk($event->getMessageId())) { diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php index 1abe36508..fe467609b 100644 --- a/core/lib/Thelia/Action/Order.php +++ b/core/lib/Thelia/Action/Order.php @@ -334,7 +334,7 @@ class Order extends BaseAction implements EventSubscriberInterface // Build subject and body $message->build($parser, $instance); - $mail = $this->getMailer()->send($instance); + $this->getMailer()->send($instance); } } diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php index a5defe5cb..a2c24a163 100644 --- a/core/lib/Thelia/Action/Product.php +++ b/core/lib/Thelia/Action/Product.php @@ -378,7 +378,7 @@ class Product extends BaseAction implements EventSubscriberInterface */ public function deleteFeatureProductValue(FeatureProductDeleteEvent $event) { - $featureProduct = FeatureProductQuery::create() + FeatureProductQuery::create() ->filterByProductId($event->getProductId()) ->filterByFeatureId($event->getFeatureId()) ->delete() diff --git a/core/lib/Thelia/Action/Template.php b/core/lib/Thelia/Action/Template.php index c5ea6b03e..cce146ec3 100644 --- a/core/lib/Thelia/Action/Template.php +++ b/core/lib/Thelia/Action/Template.php @@ -74,7 +74,6 @@ class Template extends BaseAction implements EventSubscriberInterface */ public function update(TemplateUpdateEvent $event) { - $search = TemplateQuery::create(); if (null !== $template = TemplateQuery::create()->findPk($event->getTemplateId())) { diff --git a/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php b/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php index fb53cc92e..f13ef4d9b 100644 --- a/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php +++ b/core/lib/Thelia/Command/Output/TheliaConsoleOutput.php @@ -44,7 +44,7 @@ class TheliaConsoleOutput extends ConsoleOutput foreach ($messages as $message) { $length = ($strlen($message) > $length) ? $strlen($message) : $length; } - $ouput = array(); + $output = array(); foreach ($messages as $message) { $output[] = "<" . $style . ">" . " " . $message . str_repeat(' ', $length - $strlen($message)) . " "; } diff --git a/core/lib/Thelia/Command/UpdateCommand.php b/core/lib/Thelia/Command/UpdateCommand.php index 36f9aacb9..ecfc8277b 100644 --- a/core/lib/Thelia/Command/UpdateCommand.php +++ b/core/lib/Thelia/Command/UpdateCommand.php @@ -56,7 +56,7 @@ class UpdateCommand extends ContainerAwareCommand $update = new Update(); try { - $updatedVersions = $update->process(); + $update->process(); $output->writeln(array( '', @@ -64,8 +64,6 @@ class UpdateCommand extends ContainerAwareCommand '' )); } catch (PropelException $e) { - $errorMsg = $e->getMessage(); - $output->writeln(array( '', sprintf('Error during update process with message : %s', $e->getMessage()), diff --git a/core/lib/Thelia/Config/DefinePropel.php b/core/lib/Thelia/Config/DefinePropel.php index 05a42a504..cd057ea20 100644 --- a/core/lib/Thelia/Config/DefinePropel.php +++ b/core/lib/Thelia/Config/DefinePropel.php @@ -40,7 +40,7 @@ class DefinePropel { $connection = $this->processorConfig["connection"]; - return $conf = array( + return array( "dsn" => $connection["dsn"], "user" => $connection["user"], "password" => $connection["password"], diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index f2864f7c4..830d7bd3f 100644 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -154,9 +154,6 @@ class BaseAdminController extends BaseController // Log the problem $this->adminLogAppend(implode(",", $resources), implode(",", $accesses), "User is not granted for resources %s with accesses %s", implode(", ", $resources), implode(", ", $accesses)); - // Generate the proper response - $response = new Response(); - return $this->errorPage($this->getTranslator()->trans("Sorry, you're not allowed to perform this action"), 403); } diff --git a/core/lib/Thelia/Controller/Admin/LangController.php b/core/lib/Thelia/Controller/Admin/LangController.php index e7862badc..add908fab 100644 --- a/core/lib/Thelia/Controller/Admin/LangController.php +++ b/core/lib/Thelia/Controller/Admin/LangController.php @@ -278,7 +278,6 @@ class LangController extends BaseAdminController $data = $form->getData(); $event = new LangUrlEvent(); foreach ($data as $key => $value) { - $pos= strpos($key, LangUrlForm::LANG_PREFIX); if (false !== strpos($key, LangUrlForm::LANG_PREFIX)) { $event->addUrl(substr($key,strlen(LangUrlForm::LANG_PREFIX)), $value); } @@ -316,8 +315,6 @@ class LangController extends BaseAdminController { if (null !== $response = $this->checkAuth(AdminResources::LANGUAGE, array(), AccessManager::UPDATE)) return $response; - $error_msg = false; - ConfigQuery::create() ->filterByName('one_domain_foreach_lang') ->update(array('Value' => $activate)); diff --git a/core/lib/Thelia/Controller/Admin/SessionController.php b/core/lib/Thelia/Controller/Admin/SessionController.php index bddfd32df..2aedfe90a 100644 --- a/core/lib/Thelia/Controller/Admin/SessionController.php +++ b/core/lib/Thelia/Controller/Admin/SessionController.php @@ -25,6 +25,7 @@ namespace Thelia\Controller\Admin; use Thelia\Form\AdminLogin; use Thelia\Core\Security\Authentication\AdminUsernamePasswordFormAuthenticator; +use Thelia\Form\Exception\FormValidationException; use Thelia\Model\AdminLog; use Thelia\Core\Security\Exception\AuthenticationException; use Thelia\Tools\URL; @@ -53,7 +54,7 @@ class SessionController extends BaseAdminController $this->adminLogAppend("admin", "LOGIN", "Successful token authentication"); // Update the cookie - $cookie = $this->createAdminRememberMeCookie($user); + $this->createAdminRememberMeCookie($user); // Render the home page return $this->render("home"); diff --git a/core/lib/Thelia/Controller/Admin/TranslationsController.php b/core/lib/Thelia/Controller/Admin/TranslationsController.php index e4fcfed23..ab31f4406 100644 --- a/core/lib/Thelia/Controller/Admin/TranslationsController.php +++ b/core/lib/Thelia/Controller/Admin/TranslationsController.php @@ -38,8 +38,6 @@ class TranslationsController extends BaseAdminController { protected function renderTemplate() { - // Find modules - $modules = ModuleQuery::create()->joinI18n($this->getCurrentEditionLocale())->orderByPosition()->find(); // Get related strings, if all input data are here $item_to_translate = $this->getRequest()->get('item_to_translate'); diff --git a/core/lib/Thelia/Core/EventListener/ViewListener.php b/core/lib/Thelia/Core/EventListener/ViewListener.php index 1975eba45..948fd1267 100644 --- a/core/lib/Thelia/Core/EventListener/ViewListener.php +++ b/core/lib/Thelia/Core/EventListener/ViewListener.php @@ -115,7 +115,7 @@ class ViewListener implements EventSubscriberInterface { $request = $this->container->get('request'); - if (null === $view = $request->attributes->get('_view')) { + if (null === $request->attributes->get('_view')) { $request->attributes->set('_view', $this->findView($request)); } diff --git a/core/lib/Thelia/Core/HttpFoundation/Request.php b/core/lib/Thelia/Core/HttpFoundation/Request.php index 84cdcd760..2866ecdb3 100644 --- a/core/lib/Thelia/Core/HttpFoundation/Request.php +++ b/core/lib/Thelia/Core/HttpFoundation/Request.php @@ -34,11 +34,6 @@ use Symfony\Component\HttpFoundation\Request as BaseRequest; class Request extends BaseRequest { - private $excludeContent = array( - 'username', - 'password' - ); - public function getProductId() { return $this->get("product_id"); diff --git a/core/lib/Thelia/Core/Security/SecurityContext.php b/core/lib/Thelia/Core/Security/SecurityContext.php index 8512fac0e..2cbbf069e 100644 --- a/core/lib/Thelia/Core/Security/SecurityContext.php +++ b/core/lib/Thelia/Core/Security/SecurityContext.php @@ -104,12 +104,8 @@ class SecurityContext // Check if user's roles matches required roles $userRoles = $user->getRoles(); - $roleFound = false; - foreach ($userRoles as $role) { if (in_array($role, $roles)) { - $roleFound = true; - return true; } } diff --git a/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php b/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php index a9efad7ae..0ba86e7d0 100644 --- a/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php +++ b/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php @@ -58,8 +58,6 @@ class Argument public function setValue($value) { - $x = $value === null; - if ($value === null) { $this->value = null; } else { @@ -70,7 +68,6 @@ class Argument $this->value = (string) $value; } } - //$this->value = $value === null ? null : (string) $value; } public static function createAnyTypeArgument($name, $default=null, $mandatory=false, $empty=true) diff --git a/core/lib/Thelia/Core/Template/Loop/Attribute.php b/core/lib/Thelia/Core/Template/Loop/Attribute.php index 66964c8b8..a973aade0 100644 --- a/core/lib/Thelia/Core/Template/Loop/Attribute.php +++ b/core/lib/Thelia/Core/Template/Loop/Attribute.php @@ -79,10 +79,6 @@ class Attribute extends BaseI18nLoop implements PropelSearchLoopInterface { $search = AttributeQuery::create(); - $backendContext = $this->getBackend_context(); - - $lang = $this->getLang(); - /* manage translations */ $this->configureI18nProcessing($search); diff --git a/core/lib/Thelia/Core/Template/Loop/Document.php b/core/lib/Thelia/Core/Template/Loop/Document.php index b92318482..f30676334 100644 --- a/core/lib/Thelia/Core/Template/Loop/Document.php +++ b/core/lib/Thelia/Core/Template/Loop/Document.php @@ -219,9 +219,6 @@ class Document extends BaseI18nLoop implements PropelSearchLoopInterface if (!is_null($exclude)) $search->filterById($exclude, Criteria::NOT_IN); - // Create document processing event - $event = new DocumentEvent($this->request); - return $search; } diff --git a/core/lib/Thelia/Core/Template/Loop/ProductTemplate.php b/core/lib/Thelia/Core/Template/Loop/ProductTemplate.php index 4d6491509..41c8c00ed 100644 --- a/core/lib/Thelia/Core/Template/Loop/ProductTemplate.php +++ b/core/lib/Thelia/Core/Template/Loop/ProductTemplate.php @@ -62,12 +62,8 @@ class ProductTemplate extends BaseI18nLoop implements PropelSearchLoopInterface { $search = TemplateQuery::create(); - $backendContext = $this->getBackend_context(); - - $lang = $this->getLang(); - /* manage translations */ - $this->configureI18nProcessing($search, $columns = array('NAME')); + $this->configureI18nProcessing($search, array('NAME')); $id = $this->getId(); diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php index aa40d69df..13ee8e852 100644 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php @@ -242,7 +242,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin return $this->dataAccess("Lang", $params, $this->request->getSession()->getLang()); } - public function ConfigDataAccess($params, $smarty) + public function configDataAccess($params, $smarty) { $key = $this->getParam($params, 'key', false); @@ -253,7 +253,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin return ConfigQuery::read($key, $default); } - public function StatsAccess($params, $smarty) + public function statsAccess($params, $smarty) { if (false === array_key_exists("key", $params)) { throw new \InvalidArgumentException(sprintf("missing key attribute in stats access function")); @@ -459,8 +459,8 @@ class DataAccessFunctions extends AbstractSmartyPlugin new SmartyPluginDescriptor('function', 'lang', $this, 'langDataAccess'), new SmartyPluginDescriptor('function', 'cart', $this, 'cartDataAccess'), new SmartyPluginDescriptor('function', 'order', $this, 'orderDataAccess'), - new SmartyPluginDescriptor('function', 'config', $this, 'ConfigDataAccess'), - new SmartyPluginDescriptor('function', 'stats', $this, 'StatsAccess'), + new SmartyPluginDescriptor('function', 'config', $this, 'configDataAccess'), + new SmartyPluginDescriptor('function', 'stats', $this, 'statsAccess'), ); } diff --git a/core/lib/Thelia/Model/Cart.php b/core/lib/Thelia/Model/Cart.php index 88d2caa2e..5139057f4 100644 --- a/core/lib/Thelia/Model/Cart.php +++ b/core/lib/Thelia/Model/Cart.php @@ -68,7 +68,7 @@ class Cart extends BaseCart public function getLastCartItemAdded() { - $items = CartItemQuery::create() + return CartItemQuery::create() ->filterByCartId($this->getId()) ->orderByCreatedAt(Criteria::DESC) ->findOne() diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php index 56abca4cc..cadcda30e 100644 --- a/core/lib/Thelia/Model/Order.php +++ b/core/lib/Thelia/Model/Order.php @@ -61,7 +61,6 @@ class Order extends BaseOrder $tax = 0; /* browse all products */ - $orderProductIds = array(); foreach($this->getOrderProducts() as $orderProduct) { $taxAmountQuery = OrderProductTaxQuery::create(); diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php index 57fb9fa96..f50c7db27 100644 --- a/core/lib/Thelia/Tools/URL.php +++ b/core/lib/Thelia/Tools/URL.php @@ -284,31 +284,4 @@ class URL strtolower($clean) : $clean; } - - /** - * Genenerate the file part of a rewritten URL from a given baseString, using a view, a view id and a locale - * - * @param $view - * @param $viewId - * @param $viewLocale - * @param $baseString the string to be converted in a valid URL - * - * @return A valid file part URL. - */ - public function generateRewritenUrl($view, $viewId, $viewLocale, $baseString) - { - // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe - - // Replace all weird characters with dashes - $string = preg_replace('/[^\w\-~_\.]+/u', '-', $baseString); - - // Only allow one dash separator at a time (and make string lowercase) - $cleanString = mb_strtolower(preg_replace('/--+/u', '-', $string), 'UTF-8'); - - $urlFilePart = $cleanString . ".html"; - - // TODO : - // check if URL url already exists, and add a numeric suffix, or the like - // insert the URL in the rewriting table - } } diff --git a/core/lib/Thelia/Type/IntToCombinedIntsListType.php b/core/lib/Thelia/Type/IntToCombinedIntsListType.php index 562e160dd..71783e7ef 100644 --- a/core/lib/Thelia/Type/IntToCombinedIntsListType.php +++ b/core/lib/Thelia/Type/IntToCombinedIntsListType.php @@ -50,7 +50,6 @@ class IntToCombinedIntsListType extends BaseType return false; } - $x = 3; return true; } diff --git a/core/lib/Thelia/Type/IntToCombinedStringsListType.php b/core/lib/Thelia/Type/IntToCombinedStringsListType.php index 5c4327dc8..d4bb85ce1 100644 --- a/core/lib/Thelia/Type/IntToCombinedStringsListType.php +++ b/core/lib/Thelia/Type/IntToCombinedStringsListType.php @@ -50,7 +50,6 @@ class IntToCombinedStringsListType extends BaseType return false; } - $x = 3; return true; } diff --git a/install/faker.php b/install/faker.php index ce48914b5..53a0e477c 100644 --- a/install/faker.php +++ b/install/faker.php @@ -10,7 +10,6 @@ use Thelia\Condition\ConditionCollection; use Thelia\Coupon\Type\RemoveXAmount; use Thelia\Coupon\Type\RemoveXPercent; - require __DIR__ . '/../core/bootstrap.php'; $thelia = new Thelia\Core\Thelia("dev", true); @@ -184,7 +183,7 @@ try { ; } - for($i = 0; $i < 50; $i++) { + for ($i = 0; $i < 50; $i++) { $customer = new Thelia\Model\Customer(); $customer->createOrUpdate( rand(1,3), @@ -227,7 +226,7 @@ try { //features and features_av $featureList = array(); - for($i=0; $i<4; $i++) { + for ($i=0; $i<4; $i++) { $feature = new Thelia\Model\Feature(); $feature->setVisible(1); $feature->setPosition($i); @@ -237,7 +236,7 @@ try { $featureId = $feature->getId(); $featureList[$featureId] = array(); - for($j=0; $jsetFeature($feature); $featureAv->setPosition($j); @@ -252,7 +251,7 @@ try { //attributes and attributes_av $attributeList = array(); - for($i=0; $i<4; $i++) { + for ($i=0; $i<4; $i++) { $attribute = new Thelia\Model\Attribute(); $attribute->setPosition($i); setI18n($faker, $attribute); @@ -261,7 +260,7 @@ try { $attributeId = $attribute->getId(); $attributeList[$attributeId] = array(); - for($j=0; $jsetAttribute($attribute); $attributeAv->setPosition($j); @@ -278,7 +277,7 @@ try { setI18n($faker, $template, array("Name" => 20)); $template->save(); - foreach($attributeList as $attributeId => $attributeAvId) { + foreach ($attributeList as $attributeId => $attributeAvId) { $at = new Thelia\Model\AttributeTemplate(); $at @@ -287,7 +286,7 @@ try { ->save(); } - foreach($featureList as $featureId => $featureAvId) { + foreach ($featureList as $featureId => $featureAvId) { $ft = new Thelia\Model\FeatureTemplate(); $ft @@ -300,7 +299,7 @@ try { //folders and contents $contentIdList = array(); - for($i=0; $i<4; $i++) { + for ($i=0; $i<4; $i++) { $folder = new Thelia\Model\Folder(); $folder->setParent(0); $folder->setVisible(1); @@ -311,13 +310,13 @@ try { $image = new \Thelia\Model\FolderImage(); $image->setFolderId($folder->getId()); - generate_image($image, 1, 'folder', $folder->getId()); + generate_image($image, 'folder', $folder->getId()); $document = new \Thelia\Model\FolderDocument(); $document->setFolderId($folder->getId()); - generate_document($document, 1, 'folder', $folder->getId()); + generate_document($document, 'folder', $folder->getId()); - for($j=0; $j<3; $j++) { + for ($j=0; $j<3; $j++) { $subfolder = new Thelia\Model\Folder(); $subfolder->setParent($folder->getId()); $subfolder->setVisible(1); @@ -328,13 +327,13 @@ try { $image = new \Thelia\Model\FolderImage(); $image->setFolderId($subfolder->getId()); - generate_image($image, 1, 'folder', $subfolder->getId()); + generate_image($image, 'folder', $subfolder->getId()); $document = new \Thelia\Model\FolderDocument(); $document->setFolderId($folder->getId()); - generate_document($document, 1, 'folder', $subfolder->getId()); + generate_document($document, 'folder', $subfolder->getId()); - for($k=0; $k<4; $k++) { + for ($k=0; $k<4; $k++) { $content = new Thelia\Model\Content(); $content->addFolder($subfolder); @@ -353,11 +352,11 @@ try { $image = new \Thelia\Model\ContentImage(); $image->setContentId($contentId); - generate_image($image, 1, 'content', $contentId); + generate_image($image, 'content', $contentId); $document = new \Thelia\Model\ContentDocument(); $document->setContentId($contentId); - generate_document($document, 1, 'content', $contentId); + generate_document($document, 'content', $contentId); } } @@ -368,30 +367,30 @@ try { //categories and products $productIdList = array(); $categoryIdList = array(); - for($i=1; $i<5; $i++) { + for ($i=1; $i<5; $i++) { $category = createCategory($faker, 0, $i, $categoryIdList, $contentIdList); - for($j=1; $jgetId(), $j, $categoryIdList, $contentIdList); - for($k=0; $kdebug("pick : $pick"); - } while(in_array($pick, $alreadyPicked)); + } while (in_array($pick, $alreadyPicked)); $alreadyPicked[] = $pick; @@ -419,7 +418,7 @@ try { } //associate PSE and stocks to products - for($i=0; $isetProductId($productId); $stock->setRef($productId . '_' . $i . '_' . $faker->randomNumber(8)); @@ -441,11 +440,11 @@ try { //associate attributes - or not - to PSE $alreadyPicked = array(); - for($i=0; $i $featureAvId) { + foreach ($featureList as $featureId => $featureAvId) { $featureProduct = new Thelia\Model\FeatureProduct(); $featureProduct->setProductId($productId) ->setFeatureId($featureId); - if(count($featureAvId) > 0) { //got some av + if (count($featureAvId) > 0) { //got some av $featureProduct->setFeatureAvId( $featureAvId[array_rand($featureAvId, 1)] ); @@ -537,7 +536,7 @@ function createCategory($faker, $parent, $position, &$categoryIdList, $contentId $categoryAssociatedContent = new Thelia\Model\CategoryAssociatedContent(); do { $pick = array_rand($contentIdList, 1); - } while(in_array($pick, $alreadyPicked)); + } while (in_array($pick, $alreadyPicked)); $alreadyPicked[] = $pick; @@ -549,17 +548,17 @@ function createCategory($faker, $parent, $position, &$categoryIdList, $contentId $image = new \Thelia\Model\CategoryImage(); $image->setCategoryId($categoryId); - generate_image($image, 1, 'category', $categoryId); + generate_image($image, 'category', $categoryId); $document = new \Thelia\Model\CategoryDocument(); $document->setCategoryId($categoryId); - generate_document($document, 1, 'category', $categoryId); + generate_document($document, 'category', $categoryId); return $category; } -function generate_image($image, $position, $typeobj, $id) { - +function generate_image($image, $typeobj, $id) +{ global $faker; $image @@ -606,8 +605,8 @@ function generate_image($image, $position, $typeobj, $id) { $image->save($image_file); } -function generate_document($document, $position, $typeobj, $id) { - +function generate_document($document, $typeobj, $id) +{ global $faker; $document @@ -630,10 +629,10 @@ function setI18n($faker, &$object, $fields = array('Title' => 20, 'Description' { $localeList = $localeList = array('fr_FR', 'en_US', 'es_ES', 'it_IT'); - foreach($localeList as $locale) { + foreach ($localeList as $locale) { $object->setLocale($locale); - foreach($fields as $name => $length) { + foreach ($fields as $name => $length) { $func = "set".ucfirst(strtolower($name)); $object->$func($locale . ' : ' . $faker->text($length)); @@ -709,7 +708,6 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $coupon1->setIsAvailableOnSpecialOffers(true); $coupon1->save(); - // Coupons $coupon2 = new Thelia\Model\Coupon(); $coupon2->setCode('SPRINGBREAK'); @@ -756,7 +754,6 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $coupon2->setIsAvailableOnSpecialOffers(true); $coupon2->save(); - // Coupons $coupon3 = new Thelia\Model\Coupon(); $coupon3->setCode('OLD'); diff --git a/install/faker_100categories_1000products_4locales.php b/install/faker_100categories_1000products_4locales.php index eb98d3e10..4e31ca296 100644 --- a/install/faker_100categories_1000products_4locales.php +++ b/install/faker_100categories_1000products_4locales.php @@ -1,10 +1,4 @@ execute(); //categories and products - for($i=0; $i<100; $i++) { + for ($i=0; $i<100; $i++) { $category = new Thelia\Model\Category(); $category->setParent(0); $category->setVisible(1); @@ -138,7 +132,7 @@ try { $category->save(); - for($j=0; $j<10; $j++) { + for ($j=0; $j<10; $j++) { $product = new Thelia\Model\Product(); $product->setRef($category->getId() . '_' . $j . '_' . $faker->randomNumber(8)); $product->addCategory($category); @@ -160,14 +154,13 @@ function setI18n($faker, &$object, $fields = array('Title' => 20, 'Description' { $localeList = array('fr_FR', 'en_US', 'es_ES', 'it_IT'); - foreach($localeList as $locale) { + foreach ($localeList as $locale) { $object->setLocale($locale); - foreach($fields as $name => $length) { + foreach ($fields as $name => $length) { $func = "set$name"; $object->$func($locale . ' : ' . $faker->text($length)); } } } - diff --git a/install/faker_add_ecotax.php b/install/faker_add_ecotax.php index e158fcbfc..02feaa3d0 100644 --- a/install/faker_add_ecotax.php +++ b/install/faker_add_ecotax.php @@ -1,9 +1,4 @@ findPk($forceEcotaxFeatureId); - if(null === $feature) { + if (null === $feature) { echo "Feature `$forceEcotaxFeatureId` not found\n"; } } - if(null === $feature) { + if (null === $feature) { $feature = new \Thelia\Model\Feature(); $feature->setVisible(1); $feature->save(); @@ -51,7 +46,7 @@ try { ->filterByLocale('fr_FR') ->filterByFeature($feature) ->findOne(); - if(null === $fr) { + if (null === $fr) { $fr = new \Thelia\Model\FeatureI18n(); $fr->setLocale('fr_FR') ->setFeature($feature); @@ -63,7 +58,7 @@ try { ->filterByLocale('en_US') ->filterByFeature($feature) ->findOne(); - if(null === $us) { + if (null === $us) { $us = new \Thelia\Model\FeatureI18n(); $us->setLocale('en_US') ->setFeature($feature); @@ -74,13 +69,13 @@ try { echo "Adding ecotax\n"; $tax = null; - if(null !== $forceEcotaxId) { + if (null !== $forceEcotaxId) { $tax = \Thelia\Model\TaxQuery::create()->findPk($forceEcotaxId); - if(null === $tax) { + if (null === $tax) { echo "Tax `$forceEcotaxId` not found\n"; } } - if(null === $tax) { + if (null === $tax) { $tax = new \Thelia\Model\Tax(); $tax->setType('FeatureFixAmountTaxType') ->setSerializedRequirements( @@ -94,7 +89,7 @@ try { ->filterByLocale('fr_FR') ->filterByTax($tax) ->findOne(); - if(null === $fr) { + if (null === $fr) { $fr = new \Thelia\Model\TaxI18n(); $fr->setLocale('fr_FR') ->setTax($tax); @@ -106,7 +101,7 @@ try { ->filterByLocale('en_US') ->filterByTax($tax) ->findOne(); - if(null === $us) { + if (null === $us) { $us = new \Thelia\Model\TaxI18n(); $us->setLocale('en_US') ->setTax($tax); @@ -121,4 +116,4 @@ try { } catch (Exception $e) { echo "error : ".$e->getMessage()."\n"; $con->rollBack(); -} \ No newline at end of file +} diff --git a/install/import.php b/install/import.php index f3589e859..0efbcaa34 100644 --- a/install/import.php +++ b/install/import.php @@ -21,10 +21,6 @@ /* */ /*************************************************************************************/ -use Thelia\Condition\Implementation\MatchForTotalAmount; -use Thelia\Condition\Implementation\MatchForXArticles; - - require __DIR__ . '/../core/bootstrap.php'; $thelia = new Thelia\Core\Thelia("dev", true); @@ -45,7 +41,6 @@ try { $stmt = $con->prepare("SET foreign_key_checks = 1"); $stmt->execute(); - $categories = createCategories($con); $color = createColors($con); $brand = createBrand($con); @@ -76,8 +71,6 @@ try { createProduct($faker, $categories, $template, $color, $brand, $con); - - $con->commit(); } catch (Exception $e) { echo "error : ".$e->getMessage()."\n"; @@ -101,15 +94,14 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co ->setTaxRuleId(1) ->setTemplate($template) ; - foreach($productCategories as $productCategory) { + foreach ($productCategories as $productCategory) { $productCategory = trim($productCategory); - if(array_key_exists($productCategory, $categories)) { + if (array_key_exists($productCategory, $categories)) { $product->addCategory($categories[$productCategory]); } } - $product ->setLocale('en_US') ->setTitle($data[1]) @@ -145,14 +137,13 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co $pses = explode(";", $data[12]); - foreach ($pses as $pse) { if(empty($pse)) continue; $stock = new \Thelia\Model\ProductSaleElements(); $stock->setProduct($product); $stock->setRef($product->getId() . '_' . uniqid('', true)); $stock->setQuantity($faker->randomNumber(1,50)); - if(!empty($data[9])) { + if (!empty($data[9])) { $stock->setPromo(1); } else { $stock->setPromo(0); @@ -198,8 +189,6 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co ->save($con) ; - - } } echo "end creating products\n"; @@ -261,6 +250,7 @@ function createCategories($con) fclose($handle); } echo "categories created successfully\n"; + return $categories; } @@ -293,6 +283,7 @@ function createColors($con) fclose($handle); } echo "colors attributes created with success\n"; + return $attribute; } @@ -362,7 +353,6 @@ function clearTables($con) ->find($con); $product->delete($con); - $accessory = Thelia\Model\AccessoryQuery::create() ->find($con); $accessory->delete($con); @@ -376,4 +366,4 @@ function clearTables($con) $productPrice->delete($con); \Thelia\Model\ProductImageQuery::create()->find($con)->delete($con); -} \ No newline at end of file +} diff --git a/install/tax_faker.php b/install/tax_faker.php index f2fd02a2c..ea3080872 100644 --- a/install/tax_faker.php +++ b/install/tax_faker.php @@ -1,7 +1,4 @@ setPosition(3) ->save(); - foreach(\Thelia\Model\ProductQuery::create()->find() as $productActiveRecord) { + foreach (\Thelia\Model\ProductQuery::create()->find() as $productActiveRecord) { $productActiveRecord->setTaxRule($taxRule) ->save(); } diff --git a/web/index.php b/web/index.php index 378bf1430..d3396e10e 100644 --- a/web/index.php +++ b/web/index.php @@ -1,5 +1,5 @@ setLocale($_SESSION['install']['lang']); +$trans = new Translator($_SESSION['install']['lang']); $trans->addLoader("php", new Symfony\Component\Translation\Loader\PhpFileLoader()); $trans->addResource('php', __DIR__.'/I18n/'.$_SESSION['install']['lang'].'.php', $_SESSION['install']['lang']);