Merge pull request #107 from jf-viguier/fix-upgrade-v4

Fix upgrade module to v4

src/Repository/ProductCommentRepository.php

@@ -51,6 +51,8 @@ class ProductCommentRepository
      */
     private $commentsMinimalTime;
 
+    const DEFAULT_COMMENTS_PER_PAGE = 5;
+
     /**
      * @param Connection $connection
      * @param string $databasePrefix
@@ -79,6 +81,9 @@ public function __construct(
      */
     public function paginate($productId, $page, $commentsPerPage, $validatedOnly)
     {
+        if (empty($commentsPerPage)) {
+            $commentsPerPage = self::DEFAULT_COMMENTS_PER_PAGE;
+        }
         /** @var QueryBuilder $qb */
         $qb = $this->connection->createQueryBuilder();
         $qb

upgrade/install-4.0.0.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
+ */
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+function upgrade_module_4_0_0($object)
+{
+    $res = true;
+    if (!Configuration::hasKey('PRODUCT_COMMENTS_COMMENTS_PER_PAGE')) {
+        $res &= (bool) Configuration::updateValue('PRODUCT_COMMENTS_COMMENTS_PER_PAGE', 5);
+    }
+    if (!Configuration::hasKey('PRODUCT_COMMENTS_USEFULNESS')) {
+        $res &= (bool) Configuration::updateValue('PRODUCT_COMMENTS_USEFULNESS', 1);
+    }
+    $res &= (bool) $object->unregisterHook('displayRightColumnProduct');
+    $res &= (bool) $object->registerHook('displayProductAdditionalInfo');
+    $res &= (bool) $object->registerHook('displayFooterProduct');
+
+    return (bool) $res;
+}