Prepare release of productcomments 9.0.0

.github/dependabot.yml

@@ -1,16 +1,23 @@
 version: 2
 updates:
-- package-ecosystem: npm
+- package-ecosystem: composer
   directory: "/"
   schedule:
     interval: daily
     time: "04:00"
   open-pull-requests-limit: 10
   target-branch: dev
-- package-ecosystem: composer
+- package-ecosystem: github-actions
   directory: "/"
   schedule:
     interval: daily
     time: "04:00"
   open-pull-requests-limit: 10
   target-branch: dev
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  target-branch: dev

.github/workflows/add-issue-to-project.yml

@@ -0,0 +1,13 @@
+name: Add Issue to Project
+
+on:
+  issues:
+    types: [ opened ]
+
+jobs:
+  add-to-project:
+    uses: PrestaShop/.github/.github/workflows/reusable-add-to-project.yml@master
+    with:
+      project-number: 47
+    secrets:
+      TOKEN: ${{ secrets.JARVIS_TOKEN }}

.github/workflows/build-release.yml

@@ -7,17 +7,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
       - name: Install composer dependencies
         run: composer install --no-dev -o
       - name: Clean-up project
-        uses: PrestaShopCorp/github-action-clean-before-deploy@v1.0
+        uses: PrestaShopCorp/github-action-clean-before-deploy@v2.0
       - name: Prepare auto-index tool
         run: composer global require prestashop/autoindex
       - name: Generate index.php
         run: ~/.composer/vendor/bin/autoindex
       - name: Create & upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ github.event.repository.name }}
           path: /home/runner/work/${{ github.event.repository.name }}
@@ -27,12 +27,12 @@ jobs:
     if: github.event_name == 'push' && (github.event.ref == 'refs/heads/main' || github.event.ref == 'refs/heads/master')
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: ${{ github.event.repository.name }}
           path: ${{ github.event.repository.name }}
       - id: release_info
-        uses: toolmantim/release-drafter@v5
+        uses: toolmantim/release-drafter@v7.7.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Prepare for Release

.github/workflows/php.yml

@@ -1,13 +1,12 @@
 name: PHP tests
 on: [push, pull_request]
 jobs:
-  # Check there is no syntax errors in the project
   php-linter:
-    name: PHP Syntax check 7.2 => 8.2
+    name: PHP Syntax check 7.2 => 8.5
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: PHP syntax checker 7.2
         uses: prestashop/github-action-php-lint/7.2@master
@@ -25,65 +24,127 @@ jobs:
         uses: prestashop/github-action-php-lint/8.1@master
 
       - name: PHP syntax checker 8.2
-        uses: prestashop/github-action-php-lint/8.2@master        
+        uses: prestashop/github-action-php-lint/8.2@master
+
+      - name: PHP syntax checker 8.3
+        uses: prestashop/github-action-php-lint/8.3@master
+
+      - name: PHP syntax checker 8.4
+        uses: prestashop/github-action-php-lint/8.4@master
+
+      - name: PHP syntax checker 8.5
+        uses: prestashop/github-action-php-lint/8.5@master
 
   # Check the PHP code follow the coding standards
   php-cs-fixer:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
     steps:
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+      - name: Run PHP-CS-Fixer
+        uses: PrestaShop/.github/.github/actions/php-ci/php-cs@master
         with:
-              php-version: '7.4'
-
-      - name: Checkout
-        uses: actions/checkout@v4
+          php-version: '7.4'
 
-      - name: Cache dependencies
-        uses: actions/cache@v4
+  # Run PHPStan against the module (PHP 7.4 – PS 8.2)
+  phpstan-74-81:
+    name: PHPStan (PHP 7.4 - 8.1)
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        presta_version: ['8.2.x']
+        php_version: ['7.4', '8.1']
+      fail-fast: false
+    env:
+      PHPRC: ${{ github.workspace }}/${{ github.event.repository.name }}/.phpstan-php-ini
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v7
         with:
-          path: vendor
-          key: php-${{ hashFiles('composer.lock') }}
-
-      - name: Install dependencies
-        run: composer install
-
-      - name: Run PHP-CS-Fixer
-        run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no
-
-  # Run PHPStan against the module and a PrestaShop release
-  phpstan:
-    name: PHPStan
+          path: ${{ github.event.repository.name }}
+
+      - name: Prepare PHP env for PrestaShop 8 (define constants before any bootstrap)
+        run: |
+          mkdir -p ${{ github.event.repository.name }}/.phpstan-php-ini
+          {
+            echo "auto_prepend_file=$GITHUB_WORKSPACE/${{ github.event.repository.name }}/tests/php/phpstan/prepend-constants.php"
+            echo "memory_limit=512M"
+          } > ${{ github.event.repository.name }}/.phpstan-php-ini/php.ini
+
+      - name: Run PHPStan
+        uses: PrestaShop/.github/.github/actions/php-ci/phpstan@master
+        with:
+          php-version: ${{ matrix.php_version }}
+          presta-version: ${{ matrix.presta_version }}
+          module-name: ${{ github.event.repository.name }}
+          phpstan-level: '5'
+          phpstan-config: tests/php/phpstan/phpstan-${{ matrix.presta_version }}.neon
+          phpstan-version: '^0.12'
+          composer-version: '2.2.18'
+
+  # Run PHPStan against the module (PHP 8.1 – 8.4)
+  phpstan-81-84:
+    name: PHPStan (PHP 8.1 - 8.4)
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        presta-versions: ['1.7.8', '8.0', 'latest']
+        presta_version: ['9.0.3']
+        php_version: ['8.1', '8.4']
+      fail-fast: false
+    env:
+      PHPRC: ${{ github.workspace }}/${{ github.event.repository.name }}/.phpstan-php-ini
     steps:
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+      - name: Checkout repository
+        uses: actions/checkout@v7
         with:
-          php-version: '7.4'
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # Add vendor folder in cache to make next builds faster
-      - name: Cache vendor folder
-        uses: actions/cache@v4
+          path: ${{ github.event.repository.name }}
+
+      - name: Prepare PHP env for PrestaShop 9.1.x and later (define constants before any bootstrap)
+        run: |
+          mkdir -p ${{ github.event.repository.name }}/.phpstan-php-ini
+          {
+            echo "auto_prepend_file=$GITHUB_WORKSPACE/${{ github.event.repository.name }}/tests/php/phpstan/prepend-constants.php"
+            echo "memory_limit=512M"
+          } > ${{ github.event.repository.name }}/.phpstan-php-ini/php.ini
+
+      - name: Run PHPStan
+        uses: PrestaShop/.github/.github/actions/php-ci/phpstan@master
         with:
-          path: vendor
-          key: php-${{ hashFiles('composer.lock') }}
+          php-version: ${{ matrix.php_version }}
+          presta-version: ${{ matrix.presta_version }}
+          module-name: ${{ github.event.repository.name }}
+          phpstan-level: '5'
+          phpstan-config: tests/php/phpstan/phpstan-${{ matrix.presta_version }}.neon
 
-      # Add composer local folder in cache to make next builds faster
-      - name: Cache composer folder
-        uses: actions/cache@v4
+  # Run PHPStan against the module (PHP 8.1 – 8.5)
+  phpstan:
+    name: PHPStan (PHP 8.1 - 8.5)
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        presta_version: ['9.1.5', '9.2.x', 'develop']
+        php_version: ['8.1', '8.5']
+      fail-fast: false
+    env:
+      PHPRC: ${{ github.workspace }}/${{ github.event.repository.name }}/.phpstan-php-ini
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v7
         with:
-          path: ~/.composer/cache
-          key: php-composer-cache
-
-      - run: composer install
-
-      # Docker images prestashop/prestashop may be used, even if the shop remains uninstalled
-      - name: Execute PHPStan on PrestaShop (Tag ${{ matrix.presta-versions }})
-        run: ./tests/phpstan.sh ${{ matrix.presta-versions }}
+          path: ${{ github.event.repository.name }}
+
+      - name: Prepare PHP env for PrestaShop 9.1.x and later (define constants before any bootstrap)
+        run: |
+          mkdir -p ${{ github.event.repository.name }}/.phpstan-php-ini
+          {
+            echo "auto_prepend_file=$GITHUB_WORKSPACE/${{ github.event.repository.name }}/tests/php/phpstan/prepend-constants.php"
+            echo "memory_limit=512M"
+          } > ${{ github.event.repository.name }}/.phpstan-php-ini/php.ini
+
+      - name: Run PHPStan
+        uses: PrestaShop/.github/.github/actions/php-ci/phpstan@master
+        with:
+          php-version: ${{ matrix.php_version }}
+          presta-version: ${{ matrix.presta_version }}
+          module-name: ${{ github.event.repository.name }}
+          phpstan-level: '5'
+          phpstan-config: tests/php/phpstan/phpstan-${{ matrix.presta_version }}.neon

ProductComment.php

@@ -29,9 +29,6 @@
 
 class ProductComment extends ObjectModel
 {
-    /** @var int */
-    public $id;
-
     /** @var int */
     public $id_product;
 

ProductCommentCriterion.php

@@ -27,7 +27,6 @@ class ProductCommentCriterion extends ObjectModel
 {
     const NAME_MAX_LENGTH = 64;
 
-    public $id;
     public $id_product_comment_criterion_type;
     public $name;
     public $active = true;

README.md

@@ -6,7 +6,7 @@ Allow users to post reviews on your products and/or rate them based on specific
 
 ## Compatibility
 
-PrestaShop: `1.7.8` or newer
+PrestaShop: `8.2.0` or newer
 
 ## Multistore compatibility
 

config.xml

@@ -2,11 +2,11 @@
 <module>
     <name>productcomments</name>
     <displayName><![CDATA[Product Comments]]></displayName>
-    <version><![CDATA[8.0.0]]></version>
+    <version><![CDATA[9.0.0]]></version>
     <description><![CDATA[Allows users to post reviews and rate products on specific criteria.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>
     <is_configurable>1</is_configurable>
     <need_instance>0</need_instance>
-	<limited_countries></limited_countries>
+    <limited_countries></limited_countries>
 </module>

config/admin/services.yml

@@ -13,6 +13,5 @@ services:
         class: 'PrestaShop\Module\ProductComment\Form\ProductCommentCriterionFormDataHandler'
         public: true
         arguments:
-            - '@product_comment_criterion_repository'
             - '@prestashop.core.admin.lang.repository'
             - '@doctrine.orm.default_entity_manager'

controllers/front/CommentGrade.php

@@ -30,20 +30,28 @@ class ProductCommentsCommentGradeModuleFrontController extends ModuleFrontContro
     public function display()
     {
         $idProducts = Tools::getValue('id_products');
-        /* @var ProductCommentRepository $productCommentRepository */
 
         header('Content-Type: application/json');
 
         if (!is_array($idProducts)) {
-            return $this->ajaxRender(null);
+            $this->ajaxRender(null);
+
+            return;
         }
 
         $idProducts = array_unique(array_map('intval', $idProducts));
 
-        $productCommentRepository = $this->context->controller->getContainer()->get('product_comment_repository');
+        /** @var ProductCommentRepository|null $commentRepository */
+        $commentRepository = $this->context->controller->getContainer()->get('product_comment_repository');
+
+        if (!$commentRepository instanceof ProductCommentRepository) {
+            $this->ajaxRender(null);
+
+            return;
+        }
 
-        $productsCommentsNb = $productCommentRepository->getCommentsNumberForProducts($idProducts, Configuration::get('PRODUCT_COMMENTS_MODERATE'));
-        $averageGrade = $productCommentRepository->getAverageGrades($idProducts, Configuration::get('PRODUCT_COMMENTS_MODERATE'));
+        $productsCommentsNb = $commentRepository->getCommentsNumberForProducts($idProducts, Configuration::get('PRODUCT_COMMENTS_MODERATE'));
+        $averageGrade = $commentRepository->getAverageGrades($idProducts, Configuration::get('PRODUCT_COMMENTS_MODERATE'));
 
         $resultFormated = [];
 

controllers/front/ListComments.php

@@ -29,6 +29,8 @@ class ProductCommentsListCommentsModuleFrontController extends ModuleFrontContro
 {
     public function display()
     {
+        header('Content-Type: application/json');
+
         $idProduct = (int) Tools::getValue('id_product');
         $page = (int) Tools::getValue('page', 1);
         $isLastNameAnonymous = Configuration::get('PRODUCT_COMMENTS_ANONYMISATION');
@@ -85,7 +87,6 @@ public function display()
             $responseArray['comments'][] = $productComment;
         }
 
-        header('Content-Type: application/json');
         $this->ajaxRender(
             json_encode(
                 $responseArray

controllers/front/PostComment.php

@@ -53,7 +53,7 @@ public function display()
                 )
             );
 
-            return false;
+            return;
         }
 
         $id_product = (int) Tools::getValue('id_product');
@@ -79,7 +79,7 @@ public function display()
                 )
             );
 
-            return false;
+            return;
         }
 
         /** @var EntityManagerInterface $entityManager */
@@ -110,7 +110,7 @@ public function display()
                 )
             );
 
-            return false;
+            return;
         }
 
         $entityManager->persist($productComment);