Merge pull request #135 from PrestaShop/dev

Release 5.0.1

.github/workflows/build-release.yml

@@ -2,24 +2,61 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-    deploy:
-        name: build dependencies & create artifact
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/[email protected]
-
-            # Install PHP dependencies (Production ONLY)
-            - name: Install composer dependencies
-              run: composer install --no-dev -o
-
-            # Remove development files
-            - name: Clean-up project
-              uses: PrestaShopCorp/[email protected]
-
-            # Zip files and upload to artifacts list
-            - name: Create & upload artifact
-              uses: actions/upload-artifact@v1
-              with:
-                  name: ${{ github.event.repository.name }}
-                  path: ../
+  deploy:
+    name: build dependencies & create artifact
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - name: Install composer dependencies
+        run: composer install --no-dev -o
+      - name: Clean-up project
+        uses: PrestaShopCorp/[email protected]
+      - 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@v1
+        with:
+          name: ${{ github.event.repository.name }}
+          path: ../
+  update_release_draft:
+    runs-on: ubuntu-latest
+    needs: [deploy]
+    if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: ${{ github.event.repository.name }}
+      - id: release_info
+        uses: toolmantim/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Prepare for Release
+        run: |
+          cd ${{ github.event.repository.name }}
+          zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}
+      - name: Clean existing assets
+        shell: bash
+        run: |
+          curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
+          assets=`bin/hub api -t repos/${{ github.repository }}/releases/${{ steps.release_info.outputs.id }}/assets | awk '/\].url/ { print $2 }'`
+          for asset in $assets
+          do
+              bin/hub api -X DELETE $asset
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish to GitHub Release
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release_info.outputs.upload_url }}
+          asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip
+          asset_name: ${{ github.event.repository.name }}.zip
+          asset_content_type: application/zip

.github/workflows/php.yml

@@ -1,84 +1,89 @@
 name: PHP tests
 on: [push, pull_request]
 jobs:
-    # Check there is no syntax errors in the project
-    php-linter:
-        name: PHP Syntax check 5.6|7.2|7.3
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/[email protected]
-
-            - name: PHP syntax checker 5.6
-              uses: prestashop/github-action-php-lint/5.6@master
-
-            - name: PHP syntax checker 7.2
-              uses: prestashop/github-action-php-lint/7.2@master
-
-            - name: PHP syntax checker 7.3
-              uses: prestashop/github-action-php-lint/7.3@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
-              with:
-                    php-version: '7.4'
-
-            - name: Checkout
-              uses: actions/[email protected]
-
-            - name: Cache dependencies
-              uses: actions/cache@v2
-              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 --diff-format udiff
-
-    # Run PHPStan against the module and a PrestaShop release
-    phpstan:
-        name: PHPStan
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                presta-versions: ['1.7.1.0', 'latest']
-        steps:
-            - name: Checkout
-              uses: actions/[email protected]
-
-            # Add vendor folder in cache to make next builds faster
-            - name: Cache vendor folder
-              uses: actions/cache@v1
-              with:
-                  path: vendor
-                  key: php-${{ hashFiles('composer.lock') }}
-
-            # Add composer local folder in cache to make next builds faster
-            - name: Cache composer folder
-              uses: actions/cache@v1
-              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: Pull PrestaShop files (Tag ${{ matrix.presta-versions }})
-              run: docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:${{ matrix.presta-versions }}
-
-            # Clear previous instance of the module in the PrestaShop volume
-            - name: Clear previous module
-              run: docker exec -t temp-ps rm -rf /var/www/html/modules/productcomments
-
-            # Run a container for PHPStan, having access to the module content and PrestaShop sources.
-            # This tool is outside the composer.json because of the compatibility with PHP 5.6
-            - name : Run PHPStan
-              run: docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/productcomments -e _PS_ROOT_DIR_=/var/www/html --workdir=/var/www/html/modules/productcomments phpstan/phpstan:0.12 analyse --configuration=/var/www/html/modules/productcomments/tests/phpstan/phpstan.neon
+  # Check there is no syntax errors in the project
+  php-linter:
+    name: PHP Syntax check 5.6 => 8.1
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: PHP syntax checker 5.6
+        uses: prestashop/github-action-php-lint/5.6@master
+
+      - name: PHP syntax checker 7.2
+        uses: prestashop/github-action-php-lint/7.2@master
+
+      - name: PHP syntax checker 7.3
+        uses: prestashop/github-action-php-lint/7.3@master
+
+      - name: PHP syntax checker 7.4
+        uses: prestashop/github-action-php-lint/7.4@master
+
+      - name: PHP syntax checker 8.0
+        uses: prestashop/github-action-php-lint/8.0@master
+
+      - name: PHP syntax checker 8.1
+        uses: prestashop/github-action-php-lint/8.1@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
+        with:
+              php-version: '7.4'
+
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        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 --diff-format udiff
+
+  # Run PHPStan against the module and a PrestaShop release
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        presta-versions: ['1.7.6', '1.7.7', '1.7.8', 'latest']
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+
+      - name: Checkout
+        uses: actions/[email protected]
+
+      # Add vendor folder in cache to make next builds faster
+      - name: Cache vendor folder
+        uses: actions/cache@v1
+        with:
+          path: vendor
+          key: php-${{ hashFiles('composer.lock') }}
+
+      # Add composer local folder in cache to make next builds faster
+      - name: Cache composer folder
+        uses: actions/cache@v1
+        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 }}

ProductComment.php

@@ -233,7 +233,7 @@ public static function getAveragesByProduct($id_product, $id_lang)
     /**
      * Return number of comments and average grade by products
      *
-     * @return array|false
+     * @return int|false
      */
     public static function getCommentNumber($id_product)
     {
@@ -247,10 +247,10 @@ public static function getCommentNumber($id_product)
 			SELECT COUNT(`id_product_comment`) AS "nbr"
 			FROM `' . _DB_PREFIX_ . 'product_comment` pc
 			WHERE `id_product` = ' . (int) ($id_product) . ($validate ? ' AND `validate` = 1' : ''));
-            Cache::store($cache_id, $result);
+            Cache::store($cache_id, (string) $result);
         }
 
-        return Cache::retrieve($cache_id);
+        return (int) Cache::retrieve($cache_id);
     }
 
     /**
@@ -282,7 +282,7 @@ public static function getGradedCommentNumber($id_product)
     public static function getByValidate($validate = '0', $deleted = false, $p = null, $limit = null, $skip_validate = false)
     {
         $sql = '
-			SELECT pc.`id_product_comment`, pc.`id_product`, IF(c.id_customer, CONCAT(c.`firstname`, \' \',  c.`lastname`), pc.customer_name) customer_name, pc.`title`, pc.`content`, pc.`grade`, pc.`date_add`, pl.`name`
+			SELECT pc.`id_product_comment`, pc.`id_product`, c.id_customer AS customer_id, IF(c.id_customer, CONCAT(c.`firstname`, \' \',  c.`lastname`), pc.customer_name) customer_name, pc.`title`, pc.`content`, pc.`grade`, pc.`date_add`, pl.`name`
 			FROM `' . _DB_PREFIX_ . 'product_comment` pc
 			LEFT JOIN `' . _DB_PREFIX_ . 'customer` c ON (c.`id_customer` = pc.`id_customer`)
             LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` pl ON (pl.`id_product` = pc.`id_product` AND pl.`id_lang` = ' . (int) Context::getContext()->language->id . Shop::addSqlRestrictionOnLang('pl') . ')';

composer.json

@@ -10,10 +10,7 @@
     }
   ],
   "require": {
-    "php": ">=5.6.0",
-    "doctrine/cache": "^1.6",
-    "symfony/css-selector": "^3.4 || ^4.4 || ^5.0",
-    "guzzlehttp/cache-subscriber": "^0.2.0"
+    "php": ">=5.6.0"
   },
   "require-dev": {
     "prestashop/php-dev-tools": "^3.4"