Merge pull request #35 from PrestaShop/dev

Release 2.2.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+<!-----------------------------------------------------------------------------
+Thank you for contributing to the PrestaShop project! 
+
+Please take the time to edit the "Answers" rows below with the necessary information.
+
+Check out our contribution guidelines to find out how to complete it:
+https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/#pull-requests
+------------------------------------------------------------------------------>
+
+| Questions     | Answers
+| ------------- | -------------------------------------------------------
+| Description?  | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
+| Type?         | bug fix / improvement / new feature / refacto / critical
+| BC breaks?    | yes / no
+| Deprecations? | yes / no
+| Fixed ticket? | Fixes PrestaShop/Prestashop#{issue number here}.
+| How to test?  | Please indicate how to best verify that this PR is correct.
+
+<!-- Click the form's "Preview" button to make sure the table is functional in GitHub. Thank you! -->

.github/release-drafter.yml

@@ -0,0 +1,14 @@
+branches:
+  - master
+name-template: v$NEXT_PATCH_VERSION
+tag-template: v$NEXT_PATCH_VERSION
+categories:
+  - title: 🚀 Improvements
+    label: enhancement
+  - title: 🐛 Bug Fixes
+    label: bug
+change-template: '- #$NUMBER: $TITLE by @$AUTHOR'
+template: |
+  # Changes
+
+  $CHANGES

.gitignore

@@ -1,2 +1,3 @@
 /config_*.xml
 /translations/*.php
+/vendor/

.travis.yml

@@ -0,0 +1,69 @@
+language: node_js
+
+notifications:
+  email:
+    on_success: never
+
+jobs:
+  include:
+    - stage: "PHP"
+      name: "PHPStan on PS nightly and unit tests"
+      language: php
+      php: 7.2
+      script:
+        - composer install
+        # PHP syntax check
+        - bash -c '! (find . -name "*.php" ! -path "./vendor/*" -print0 | xargs -0 -n1 -P4 php -l | grep "Parse error")'
+        # PHP cs fixer
+        # - composer run lint
+        # PHP Unit
+        # - composer run test
+        # PHP Stan
+        - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:nightly
+        # - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_mainmenu
+        # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_mainmenu -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_mainmenu/tests/php/phpstan/phpstan.neon
+    - stage: "PHP"
+      name: "PHPStan on PS 1.7.5.2"
+      language: php
+      php: 7.2
+      script:
+        - composer install
+        - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.5.1
+        # - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_mainmenu
+        # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_mainmenu -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_mainmenu/tests/php/phpstan/phpstan.neon
+    - stage: "PHP"
+      name: "PHPStan on PS 1.7.4.4"
+      language: php
+      php: 7.2
+      script:
+        - composer install
+        - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.4.4
+        # - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_mainmenu
+        # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_mainmenu -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_mainmenu/tests/php/phpstan/phpstan.neon
+    - stage: "PHP"
+      name: "PHPStan on PS 1.7.3.4"
+      language: php
+      php: 7.2
+      script:
+        - composer install
+        - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.3.4
+        # - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_mainmenu
+        # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_mainmenu -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_mainmenu/tests/php/phpstan/phpstan.neon
+    - stage: "PHP"
+      name: "PHPStan on PS 1.7.2.5"
+      language: php
+      php: 7.2
+      script:
+        - composer install
+        - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.2.5
+        #- docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_mainmenu
+        #- docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_mainmenu -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_mainmenu/tests/php/phpstan/phpstan.neon
+    - stage: "PHP"
+      name: "PHPStan on PS 1.7.1.2"
+      language: php
+      php: 7.2
+      script:
+        - composer install
+        - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.1.2
+        # - docker exec -ti temp-ps rm -rf /var/www/html/modules/ps_mainmenu
+        # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/ps_mainmenu -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/ps_mainmenu/tests/php/phpstan/phpstan.neon

CONTRIBUTORS.md

@@ -0,0 +1,38 @@
+GitHub contributors:
+--------------------------------
+ - Alex Sampaio
+ - AlexEven
+ - Antoine Mille
+ - Aurélien Pelletier
+ - Axome
+ - Damien Metzger
+ - Dimitrios Karvounaris
+ - Francois Gaillard
+ - François-Marie de Jouvencel
+ - Gregory Roussac
+ - Jerome Nadaud
+ - Julien Bourdeau
+ - KoKsPfLaNzE
+ - Marius Kiznis
+ - Mathieu Ferment
+ - Matthieu Mota
+ - Maxime Biloé
+ - Michel ANTOINE
+ - Mickaël Andrieu
+ - NielsH
+ - Pablo Borowicz
+ - PrestaEdit
+ - Quetzacoalt91
+ - Rémi Gaillard
+ - Sacha Froment
+ - Samuel Marchal
+ - Thibaud Chauviere
+ - Thomas N
+ - Wayann
+ - Xavier
+ - ZiZuu.com
+ - djfm
+ - indesign47
+ - joce
+ - marionf
+ - montes

Readme.md → README.md

@@ -4,10 +4,6 @@
 
 Adds a new horizontal menu to the top of your PrestaShop.
 
-## Multistore compatibility
-
-This module is partially compatible with the multistore feature. Some of its options might not be available.
-
 ## Reporting issues
 
 You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue]. 

composer.json

@@ -13,7 +13,8 @@
     "php": ">=5.4.0"
   },
   "config": {
-    "preferred-install": "dist"
+    "preferred-install": "dist",
+    "prepend-autoloader": false
   },
   "type": "prestashop-module"
 }

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>ps_mainmenu</name>
 	<displayName><![CDATA[Main menu]]></displayName>
-	<version><![CDATA[2.1.1]]></version>
+	<version><![CDATA[2.2.0]]></version>
 	<description><![CDATA[Adds a new menu to the top of your e-commerce website.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[front_office_features]]></tab>

index.php

@@ -1,28 +1,28 @@
 <?php
-/*
-* 2007-2015 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* 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 http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2015 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
+/**
+ * 2007-2020 PrestaShop SA and Contributors
+ *
+ * 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.txt.
+ * 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://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 1997 05:00:00 GMT");
 header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");