Performance is better when fetching all rows at once

.travis.yml

@@ -6,7 +6,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
- 
+
 matrix:
   fast_finish: true
   allow_failures:
@@ -30,5 +30,6 @@ notifications:
   slack: prestashop:Eovjydk55zPrwPkoQIOF0cZn
   hipchat: ec4e21c5eb82066ba8be5fd1afefde@1184657
 script:
+  - /var/www/prestashop.unit.test/tests/check_php_parse_errors.sh
   - php /var/www/prestashop.unit.test/install-dev/index_cli.php --language=en --country=us --domain=localhost --base_uri=/prestashop.unit.test --db_name=prestashop.unit.test --db_create=1 --name=prestashop.unit.test --password=123456789
   - cd /var/www/prestashop.unit.test/tests && bash getcomposer.sh && php composer.phar install && php vendor/bin/phpunit -c .

CONTRIBUTORS.md

@@ -21,6 +21,7 @@ GitHub contributors:
 - Alfonso Jimenez
 - Alphacom IT Solutions - Macedonia
 - amatosg
+- Amazzing
 - anat
 - Anatole
 - Andrew
@@ -37,6 +38,8 @@ GitHub contributors:
 - Bersam Karbasion
 - BigZ
 - BluTiGeS
+- BMS-fenaille
+- brouillon
 - Bruno Desprez
 - Bruno Leveque
 - bumbu
@@ -48,6 +51,8 @@ GitHub contributors:
 - ccauw
 - cedricfontaine
 - cedricgeffroy
+- cgordenne
+- cgordenne_wepika
 - Chen.Zhidong
 - Chris
 - Chris Gurk
@@ -73,6 +78,7 @@ GitHub contributors:
 - Daniele Giachino
 - danoosh
 - Danoosh Mir
+- David Eschmeyer
 - David Gasperoni
 - David Sivocha
 - David-Julian BUCH
@@ -88,6 +94,7 @@ GitHub contributors:
 - dlage
 - doekia
 - DOEO
+- DogSports
 - Dragan Skrbic
 - Dream me up
 - dreammeup
@@ -116,6 +123,7 @@ GitHub contributors:
 - Felipe Uribe
 - fetis
 - fird
+- firstred
 - flashmaestro
 - Florian Kwakkenbos
 - fram
@@ -204,6 +212,7 @@ GitHub contributors:
 - LyoNick
 - Leo
 - M-Mommsen
+- MacRoy
 - Madef
 - Madman
 - Mainmich
@@ -212,6 +221,7 @@ GitHub contributors:
 - marcinsz101
 - Marco Cervellin
 - Marcos
+- Marius
 - matiasiglesias
 - Mats Rynge
 - Matteo
@@ -224,6 +234,8 @@ GitHub contributors:
 - mchelh
 - mchojnacki
 - mdomenjoud
+- Mehdi BOUZIDI
+- Michael Dekker
 - Michael Hjulskov
 - Michel Courtade
 - Mickael Desgranges

admin-dev/themes/default/template/controllers/login/header.tpl

@@ -47,7 +47,7 @@
 		{foreach from=$js_files item=js_uri}
 			<script type="text/javascript" src="{$js_uri}"></script>
 		{/foreach}
-		<script type="text/javascript" src="../js/admin/login.js?{$smarty.now}"></script>
+		<script type="text/javascript" src="../js/admin/login.js?v={$smarty.const._PS_VERSION_|escape:'html':'UTF-8'}"></script>
 
 		{if (isset($js_def) && count($js_def) || isset($js_files) && count($js_files))}
 			{include file=$smarty.const._PS_ALL_THEMES_DIR_|cat:"javascript.tpl"}

admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl

@@ -73,15 +73,14 @@
 			</div>
 		</div>
 		<script type="text/javascript">
-			var id_product = {if isset($product->id)}{$product->id}{else}0{/if};
-			var id_lang_default = {$id_lang_default};
-			var product_type_pack = {Product::PTYPE_PACK};
-			var product_type_virtual = {Product::PTYPE_VIRTUAL};
-			var product_type_simple = {Product::PTYPE_SIMPLE};
+			var id_product = {if isset($product->id)}{$product->id|intval}{else}0{/if};
+			var id_lang_default = {$id_lang_default|intval};
+			var product_type_pack = {Product::PTYPE_PACK|intval};
+			var product_type_virtual = {Product::PTYPE_VIRTUAL|intval};
+			var product_type_simple = {Product::PTYPE_SIMPLE|intval};
 
-			var has_combinations = {$has_combinations};
+			var has_combinations = {$has_combinations|intval};
 
-			var toload = new Array();
 			var empty_pack_msg = '{l s='This pack is empty. You will need to add at least one product to the pack before you can save.' js=1}';
 			var empty_name_msg = '{l s='The product name is empty. You will at least need to enter a name for the default language before you can save the product.' js=1}';
 			var empty_link_rewrite_msg = '{l s='The friendly URL is empty. You will at least need to enter a friendly URL for the default language before you can save the product.' slashes=1}';
@@ -102,7 +101,6 @@
 				var display_multishop_checkboxes = false;
 			{/if}
 
-			var tabs_preloaded = new Array();
 			var tabs_to_preload = new Array();
 			var mod_evasive = {if isset($mod_evasive) && $mod_evasive}true{else}false{/if};
 			var mod_security = {if isset($mod_security) && $mod_security}true{else}false{/if};
@@ -224,8 +222,7 @@
 							tabs_to_preload.push('{$tab_name}');
 					{/if}
 				{/foreach}
-
-				// Recursively load tabs starting with the first element of stack
+				tabs_manager.tabs_to_preload = tabs_to_preload.slice(0);
 				tabs_manager.displayBulk(tabs_to_preload);
 				$('.productTabs').show();
 				$('#product-tab-content-wait').hide();

admin-dev/themes/default/template/controllers/products/images.tpl

@@ -173,6 +173,7 @@
 				return $1 ? $1 + path : $0;
 			});
 			line = line.replace(/image_path/g, path);
+			line = line.replace(/\.jpg"\s/g, '.jpg?time=' + new Date().getTime() + '" ');
 			line = line.replace(/image_position/g, position);
 			line = line.replace(/legend/g, legend);
 			line = line.replace(/icon-check-empty/g, cover);

admin-dev/themes/default/template/helpers/form/form.tpl

@@ -337,7 +337,7 @@
 										{$input.required = false}
 										{$input.desc = null}
 									{else}
-										<select name="{$input.name|escape:'html':'utf-8'}{if isset($input.multiple) && $input.multiple}[]{/if}"
+										<select name="{$input.name|escape:'html':'utf-8'}"
 												class="{if isset($input.class)}{$input.class|escape:'html':'utf-8'}{/if} fixed-width-xl"
 												id="{if isset($input.id)}{$input.id|escape:'html':'utf-8'}{else}{$input.name|escape:'html':'utf-8'}{/if}"
 												{if isset($input.multiple) && $input.multiple} multiple="multiple"{/if}

classes/Category.php

@@ -771,8 +771,7 @@ public function getProducts($id_lang, $p, $n, $order_by = null, $order_way = nul
 					AND cp.`id_category` = '.(int)$this->id
                     .($active ? ' AND product_shop.`active` = 1' : '')
                     .($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '')
-                    .($id_supplier ? ' AND p.id_supplier = '.(int)$id_supplier : '')
-                    .' GROUP BY cp.id_product';
+                    .($id_supplier ? ' AND p.id_supplier = '.(int)$id_supplier : '');
 
         if ($random === true) {
             $sql .= ' ORDER BY RAND() LIMIT '.(int)$random_number_products;
@@ -1387,7 +1386,7 @@ public function updatePosition($way, $position)
             c.`date_upd` = "'.date('Y-m-d H:i:s').'"
             WHERE c.`id_parent` = '.(int)$moved_category['id_parent'].'
             AND c.`id_category`='.(int)$moved_category['id_category']));
-        Hook::exec('actionCategoryUpdate', array('category' => $moved_category));
+        Hook::exec('actionCategoryUpdate', array('category' => new Category($moved_category['id_category'])));
         return $result;
     }
 

classes/CompareProduct.php

@@ -136,23 +136,15 @@ public static function getNumberProducts($id_compare)
      * @param string $period
      * @return void
      */
-    public static function cleanCompareProducts($period = 'week')
+    public static function cleanCompareProducts($period = null)
     {
-        if ($period === 'week') {
-            $interval = '1 WEEK';
-        } elseif ($period === 'month') {
-            $interval = '1 MONTH';
-        } elseif ($period === 'year') {
-            $interval = '1 YEAR';
-        } else {
-            return;
+        if ($period !== null) {
+            Tools::displayParameterAsDeprecated('period');
         }
 
-        if ($interval != null) {
-            Db::getInstance()->execute('
-			DELETE cp, c FROM `'._DB_PREFIX_.'compare_product` cp, `'._DB_PREFIX_.'compare` c
-			WHERE cp.date_upd < DATE_SUB(NOW(), INTERVAL 1 WEEK) AND c.`id_compare`=cp.`id_compare`');
-        }
+        Db::getInstance()->execute('
+        DELETE cp, c FROM `'._DB_PREFIX_.'compare_product` cp, `'._DB_PREFIX_.'compare` c
+        WHERE cp.date_upd < DATE_SUB(NOW(), INTERVAL 1 WEEK) AND c.`id_compare`=cp.`id_compare`');
     }
 
     /**

classes/Configuration.php

@@ -145,8 +145,8 @@ public static function loadConfiguration()
                 FROM `'._DB_PREFIX_.bqSQL(self::$definition['table']).'` c
                 LEFT JOIN `'._DB_PREFIX_.bqSQL(self::$definition['table']).'_lang` cl ON (c.`'.bqSQL(self::$definition['primary']).'` = cl.`'.bqSQL(self::$definition['primary']).'`)';
         $db = Db::getInstance();
-        $result = $db->executeS($sql, false);
-        while ($row = $db->nextRow($result)) {
+        $result = $db->executeS($sql);
+        foreach ($result as $row) {
             $lang = ($row['id_lang']) ? $row['id_lang'] : 0;
             self::$types[$row['name']] = ($lang) ? 'lang' : 'normal';
             if (!isset(self::$_cache[self::$definition['table']][$lang])) {

classes/Product.php

@@ -2269,7 +2269,7 @@ public static function getNewProducts($id_lang, $page_number = 0, $nb_products =
             $order_way = 'DESC';
         }
         if ($order_by == 'id_product' || $order_by == 'price' || $order_by == 'date_add' || $order_by == 'date_upd') {
-            $order_by_prefix = 'p';
+            $order_by_prefix = 'product_shop';
         } elseif ($order_by == 'name') {
             $order_by_prefix = 'pl';
         }
@@ -2325,11 +2325,11 @@ public static function getNewProducts($id_lang, $page_number = 0, $nb_products =
         }
         $sql->where('product_shop.`date_add` > "'.date('Y-m-d', strtotime('-'.(Configuration::get('PS_NB_DAYS_NEW_PRODUCT') ? (int)Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).' DAY')).'"');
         if (Group::isFeatureActive()) {
-            $sql->join('JOIN '._DB_PREFIX_.'category_product cp ON (cp.id_product = p.id_product)');
-            $sql->join('JOIN '._DB_PREFIX_.'category_group cg ON (cg.id_category = cp.id_category)');
-            $sql->where('cg.`id_group` '.(count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1'));
+            $groups = FrontController::getCurrentCustomerGroups();
+            $sql->where('EXISTS(SELECT 1 FROM `'._DB_PREFIX_.'category_product` cp
+				JOIN `'._DB_PREFIX_.'category_group` cg ON (cp.id_category = cg.id_category AND cg.`id_group` '.(count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1').')
+				WHERE cp.`id_product` = p.`id_product`)');
         }
-        $sql->groupBy('product_shop.id_product');
 
         $sql->orderBy((isset($order_by_prefix) ? pSQL($order_by_prefix).'.' : '').'`'.pSQL($order_by).'` '.pSQL($order_way));
         $sql->limit($nb_products, $page_number * $nb_products);
@@ -2398,7 +2398,7 @@ public static function getRandomSpecial($id_lang, $beginning = false, $ending =
             $front = false;
         }
 
-        $current_date = date('Y-m-d H:i:s');
+        $current_date = date('Y-m-d H:i:00');
         $product_reductions = Product::_getProductIdByDate((!$beginning ? $current_date : $beginning), (!$ending ? $current_date : $ending), $context, true);
 
         if ($product_reductions) {
@@ -2502,14 +2502,14 @@ public static function getPricesDrop($id_lang, $page_number = 0, $nb_products =
             $order_way = 'DESC';
         }
         if ($order_by == 'id_product' || $order_by == 'price' || $order_by == 'date_add' || $order_by == 'date_upd') {
-            $order_by_prefix = 'p';
+            $order_by_prefix = 'product_shop';
         } elseif ($order_by == 'name') {
             $order_by_prefix = 'pl';
         }
         if (!Validate::isOrderBy($order_by) || !Validate::isOrderWay($order_way)) {
             die(Tools::displayError());
         }
-        $current_date = date('Y-m-d H:i:s');
+        $current_date = date('Y-m-d H:i:00');
         $ids_product = Product::_getProductIdByDate((!$beginning ? $current_date : $beginning), (!$ending ? $current_date : $ending), $context);
 
         $tab_id_product = array();
@@ -2582,7 +2582,6 @@ public static function getPricesDrop($id_lang, $page_number = 0, $nb_products =
 		'.($front ? ' AND p.`visibility` IN ("both", "catalog")' : '').'
 		'.((!$beginning && !$ending) ? ' AND p.`id_product` IN ('.((is_array($tab_id_product) && count($tab_id_product)) ? implode(', ', $tab_id_product) : 0).')' : '').'
 		'.$sql_groups.'
-		GROUP BY p.id_product
 		ORDER BY '.(isset($order_by_prefix) ? pSQL($order_by_prefix).'.' : '').pSQL($order_by).' '.pSQL($order_way).'
 		LIMIT '.(int)($page_number * $nb_products).', '.(int)$nb_products;