diff --git a/.gitignore b/.gitignore index 40da3e6..96aaa5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /config_*.xml /translations/*.php +/vendor/ diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..2ef459f --- /dev/null +++ b/.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 diff --git a/Readme.md b/README.md similarity index 100% rename from Readme.md rename to README.md diff --git a/composer.json b/composer.json index 567ae48..0e80c11 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ "php": ">=5.4.0" }, "config": { - "preferred-install": "dist" + "preferred-install": "dist", + "prepend-autoloader": false }, "type": "prestashop-module" } diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..6e5624a --- /dev/null +++ b/composer.lock @@ -0,0 +1,19 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "content-hash": "bb09e49201a09082865a0c9f9a79926f", + "packages": [], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.4.0" + }, + "platform-dev": [] +} diff --git a/config.xml b/config.xml index b502f86..572a703 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_mainmenu - + diff --git a/ps_mainmenu.php b/ps_mainmenu.php index 4be7cd2..7d6e47f 100644 --- a/ps_mainmenu.php +++ b/ps_mainmenu.php @@ -61,7 +61,7 @@ class Ps_MainMenu extends Module implements WidgetInterface { $this->name = 'ps_mainmenu'; $this->tab = 'front_office_features'; - $this->version = '2.1.1'; + $this->version = '2.2.0'; $this->author = 'PrestaShop'; $this->imageFiles = null;