Release version 5.0.0

.github/dependabot.yml

@@ -1,13 +1,20 @@
 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

.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/php.yml

@@ -1,22 +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 5.4 => 8.1
+    name: PHP Syntax check 7.2 => 8.5
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.0.0
-
-      - name: PHP syntax checker 5.4
-        uses: prestashop/github-action-php-lint/5.6@master
-
-      - name: PHP syntax checker 5.5
-        uses: prestashop/github-action-php-lint/5.6@master
-
-      - name: PHP syntax checker 5.6
-        uses: prestashop/github-action-php-lint/5.6@master
+        uses: actions/checkout@v3.1.0
 
       - name: PHP syntax checker 7.2
         uses: prestashop/github-action-php-lint/7.2@master
@@ -33,63 +23,128 @@ jobs:
       - name: PHP syntax checker 8.1
         uses: prestashop/github-action-php-lint/8.1@master
 
+      - name: PHP syntax checker 8.2
+        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@v2.0.0
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
+  # 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@v6
         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
+          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.2.5', '1.7.3.4', '1.7.4.4', '1.7.5.1', '1.7.6', '1.7.7', '1.7.8', '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@v6
         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
+          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@v1
+  # 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@v6
         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

README.md

@@ -6,7 +6,7 @@ Help your customers get in touch when they need, add a contact form on your stor
 
 ## Compatibility
 
-PrestaShop: `1.7.2.0` or later
+PrestaShop: `8.2.0` or later
 
 ## How to test
 

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>contactform</name>
     <displayName><![CDATA[Contact form]]></displayName>
-    <version><![CDATA[4.4.3]]></version>
+    <version><![CDATA[5.0.0]]></version>
     <description><![CDATA[Adds a contact form to the "Contact us" page.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

contactform.php

@@ -54,7 +54,7 @@ public function __construct()
         $this->name = 'contactform';
         $this->author = 'PrestaShop';
         $this->tab = 'front_office_features';
-        $this->version = '4.4.3';
+        $this->version = '5.0.0';
         $this->bootstrap = true;
 
         parent::__construct();
@@ -66,7 +66,7 @@ public function __construct()
             'Modules.Contactform.Admin'
         );
         $this->ps_versions_compliancy = [
-            'min' => '1.7.2.0',
+            'min' => '8.2.0',
             'max' => _PS_VERSION_,
         ];
     }
@@ -530,7 +530,16 @@ public function sendMessage()
                         @chmod(_PS_UPLOAD_DIR_ . basename($file_attachment['rename']), 0664);
                     }
                     $cm->ip_address = (string) ip2long(Tools::getRemoteAddr());
-                    $cm->user_agent = $_SERVER['HTTP_USER_AGENT'];
+
+                    /*
+                     * Adjust user agent length depending on PrestaShop version used.
+                     * The limit was raised on 9.0.2.
+                     */
+                    if (version_compare(_PS_VERSION_, '9.0.2', '>=')) {
+                        $cm->user_agent = substr($_SERVER['HTTP_USER_AGENT'] ?? '', 0, 255);
+                    } else {
+                        $cm->user_agent = substr($_SERVER['HTTP_USER_AGENT'] ?? '', 0, 128);
+                    }
 
                     if (!$cm->add()) {
                         $this->context->controller->errors[] = $this->trans(

tests/php/phpstan/phpstan-8.2.x.neon

@@ -0,0 +1,6 @@
+includes:
+	- %currentWorkingDirectory%/tests/php/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie\:\:\$contactFormToken.#'

tests/php/phpstan/phpstan-9.0.3.neon

@@ -0,0 +1,7 @@
+includes:
+	- %currentWorkingDirectory%/tests/php/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie\:\:\$contactFormToken.#'
+    - '#Call to an undefined static method Tools\:\:stripslashes\(\).#'

tests/php/phpstan/phpstan-9.1.5.neon

@@ -0,0 +1,7 @@
+includes:
+	- %currentWorkingDirectory%/tests/php/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie\:\:\$contactFormToken.#'
+    - '#Call to an undefined static method Tools\:\:stripslashes\(\).#'

tests/php/phpstan/phpstan-9.2.x.neon

@@ -0,0 +1,7 @@
+includes:
+	- %currentWorkingDirectory%/tests/php/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie\:\:\$contactFormToken.#'
+    - '#Call to an undefined static method Tools\:\:stripslashes\(\).#'

tests/php/phpstan/phpstan-develop.neon

@@ -0,0 +1,7 @@
+includes:
+	- %currentWorkingDirectory%/tests/php/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie\:\:\$contactFormToken.#'
+    - '#Call to an undefined static method Tools\:\:stripslashes\(\).#'

tests/php/phpstan/phpstan.neon

@@ -0,0 +1,2 @@
+  # Base PHPStan configuration for the moduleExpand commentComment on line R2ResolvedCode has comments. Press enter to view.
+  # This file is included by version-specific configs

tests/php/phpstan/prepend-constants.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Defines constants required by PrestaShop config (e.g. defines_uri.inc.php) when running
+ * PHPStan outside a full request. Loaded via auto_prepend_file in CI for 9.x jobs.
+ */
+if (!defined('_THEME_NAME_')) {
+    define('_THEME_NAME_', 'classic');
+}
+if (!defined('__PS_BASE_URI__')) {
+    define('__PS_BASE_URI__', '/');
+}