Merge pull request #34 from Progi1984/improveProject
Bump version to 2.2.0 and Improve Project
This commit is contained in:
@@ -1,2 +1,3 @@
|
|||||||
/config_*.xml
|
/config_*.xml
|
||||||
/translations/*.php
|
/translations/*.php
|
||||||
|
/vendor/
|
||||||
|
|||||||
+69
@@ -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
|
||||||
+2
-1
@@ -13,7 +13,8 @@
|
|||||||
"php": ">=5.4.0"
|
"php": ">=5.4.0"
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"preferred-install": "dist"
|
"preferred-install": "dist",
|
||||||
|
"prepend-autoloader": false
|
||||||
},
|
},
|
||||||
"type": "prestashop-module"
|
"type": "prestashop-module"
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+19
@@ -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": []
|
||||||
|
}
|
||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
<module>
|
<module>
|
||||||
<name>ps_mainmenu</name>
|
<name>ps_mainmenu</name>
|
||||||
<displayName><![CDATA[Main menu]]></displayName>
|
<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>
|
<description><![CDATA[Adds a new menu to the top of your e-commerce website.]]></description>
|
||||||
<author><![CDATA[PrestaShop]]></author>
|
<author><![CDATA[PrestaShop]]></author>
|
||||||
<tab><![CDATA[front_office_features]]></tab>
|
<tab><![CDATA[front_office_features]]></tab>
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ class Ps_MainMenu extends Module implements WidgetInterface
|
|||||||
{
|
{
|
||||||
$this->name = 'ps_mainmenu';
|
$this->name = 'ps_mainmenu';
|
||||||
$this->tab = 'front_office_features';
|
$this->tab = 'front_office_features';
|
||||||
$this->version = '2.1.1';
|
$this->version = '2.2.0';
|
||||||
$this->author = 'PrestaShop';
|
$this->author = 'PrestaShop';
|
||||||
$this->imageFiles = null;
|
$this->imageFiles = null;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user