Merge pull request #112 from Progi1984/dev

Release 4.1.1

Author: Progi1984

.github/workflows/build-release.yml

@@ -1,5 +1,4 @@
-name: Build & Release draft
-
+name: Build
 on: [push, pull_request]
 
 jobs:
@@ -9,19 +8,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2.0.0
-
       - name: Install composer dependencies
         run: composer install --no-dev -o
-
       - name: Clean-up project
         uses: PrestaShopCorp/github-action-clean-before-deploy@v1.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@v1
         with:
           name: ${{ github.event.repository.name }}
           path: ../
-
   update_release_draft:
     runs-on: ubuntu-latest
     needs: [deploy]
@@ -31,29 +32,25 @@ jobs:
         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
+              bin/hub api -X DELETE $asset
           done
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Publish to GitHub Release
         uses: actions/upload-release-asset@v1.0.1
         env:

.github/workflows/php.yml

@@ -1,42 +1,81 @@
 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
+    name: PHP Syntax check 5.6 => 8.1
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2.0.0
+
       - 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/checkout@v2.0.0
+
+      - 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
-        uses: prestashopcorp/github-action-php-cs-fixer@master
+        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: ['latest', '1.7.0.3', '1.6.1.21','1.6.1.0']
+        presta-versions: ['1.6.1.18', '1.7.1.2', '1.7.2.5', '1.7.3.4', '1.7.4.4', '1.7.5.1', '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/checkout@v2.0.0
 
+      # 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:
@@ -45,14 +84,6 @@ jobs:
 
       - run: composer install
 
-      - 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 }}
-
-      - name: Select .neon file to run with PHPStan
-        id: neon
-        run: |
-          PS_VERSION=$(docker exec temp-ps bash -c 'echo "$PS_VERSION"')
-          [[ "${PS_VERSION:0:3}" != '1.7' ]] && echo ::set-output name=filename::phpstan-PS-1.6.neon || echo ::set-output name=filename::phpstan-PS-1.7.neon
-
-      - name : Run PHPStan
-        run: docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html --workdir=/web/module phpstan/phpstan:0.12 analyse --configuration=/web/module/tests/phpstan/${{steps.neon.outputs.filename}}
+      # 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 }}

Readme.md README.mdReadme.md renamed to README.md

@@ -33,7 +33,7 @@ public function isModuleEnabled($moduleName)
     {
         $module = Module::getInstanceByName($moduleName);
 
-        if (false === $module) {
+        if (!($module instanceof Module)) {
             return false;
         }
 
@@ -78,7 +78,7 @@ public function uninstallModule($moduleName)
 
         $oldModule = Module::getInstanceByName($moduleName);
 
-        if (false === $oldModule) {
+        if (!($oldModule instanceof Module)) {
             return false;
         }
 

classes/Handler/ModuleHandler.php

@@ -90,7 +90,7 @@ public function run()
                             if (!empty($transaction)) {
                                 $ganalyticsRepository->updateData(
                                     [
-                                        'date_add' => 'NOW()',
+                                        'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
                                         'sent' => 1,
                                     ],
                                     'id_order = ' . (int) $row['id_order'] . ' AND id_shop = ' . (int) $this->context->shop->id

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -87,7 +87,7 @@ public function run()
 
         $listing = $this->context->smarty->getTemplateVars('listing');
         $productWrapper = new ProductWrapper($this->context);
-        $products = $productWrapper->wrapProductList($listing['products'], [], true);
+        $products = $productWrapper->wrapProductList(isset($listing['products']) ? $listing['products'] : [], [], true);
 
         if ($controller_name == 'order' || $controller_name == 'orderopc') {
             $this->module->js_state = 1;

classes/Hook/HookDisplayFooter.php

@@ -9,6 +9,12 @@
             "email": "contact@prestashop.com"
         }
     ],
+    "require": {
+        "php": ">=5.6"
+    },
+    "require-dev": {
+        "prestashop/php-dev-tools": "3.*"
+    },
     "config": {
         "preferred-install": "dist",
         "optimize-autoloader": true,
@@ -17,12 +23,6 @@
             "php": "5.6"
         }
     },
-    "require": {
-        "php": ">=5.6"
-    },
-    "require-dev": {
-        "prestashop/php-dev-tools": "3.*"
-    },
     "autoload": {
         "classmap": [
             "ps_googleanalytics.php",
@@ -32,4 +32,4 @@
     },
     "type": "prestashop-module",
     "author": "PrestaShop"
-}
+}

composer.json

@@ -33,7 +33,7 @@ public function init()
             (new GanalyticsRepository())->updateData(
                 [
                     'sent' => 1,
-                    'date_add' => 'NOW()',
+                    'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
                 ],
                 'id_order = ' . $orderId
             );

controllers/admin/AdminGanalyticsAjax.php

@@ -21,7 +21,10 @@
     exit;
 }
 
-require_once __DIR__ . '/vendor/autoload.php';
+$autoloadPath = __DIR__ . '/vendor/autoload.php';
+if (file_exists($autoloadPath)) {
+    require_once $autoloadPath;
+}
 
 class Ps_Googleanalytics extends Module
 {

ps_googleanalytics.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 2007-2020 PrestaShop and Contributors
+ * 2007-2020 PrestaShop SA and Contributors
  *
  * NOTICE OF LICENSE
  *
@@ -12,12 +12,18 @@
  * 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://www.prestashop.com for more information.
+ *
  * @author    PrestaShop SA <contact@prestashop.com>
  * @copyright 2007-2020 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
-header('Expires: Mon, 26 Jul 1998 05:00:00 GMT');
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
 header('Cache-Control: no-store, no-cache, must-revalidate');