Skip to content

Commit

Permalink
Merge pull request #8 from PrestaShopCorp/dev
Browse files Browse the repository at this point in the history
Prepare release of v1.0.1
  • Loading branch information
Quetzacoalt91 authored Jul 2, 2020
2 parents 08c5c8a + 3650db8 commit bfdba46
Show file tree
Hide file tree
Showing 9 changed files with 123 additions and 195 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
- 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 : 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.11.19 analyse --configuration=/web/module/tests/phpstan/phpstan.neon
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/phpstan.neon --error-format github
11 changes: 7 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@
"email": "[email protected]"
}
],
"require": {
"php": ">=5.6"
},
"require-dev": {
"prestashop/php-dev-tools": "^2.2"
"prestashop/php-dev-tools": "~3.0"
},
"config": {
"platform": {
"php": "5.6.0"
},
"sort-packages": true,
"preferred-install": "dist",
"optimize-autoloader": true,
"prepend-autoloader": false
Expand All @@ -29,5 +27,10 @@
"controllers",
"pscartbanner.php"
]
},
"scripts": {
"set-license-header": [
"@php ./vendor/bin/header-stamp --license=\"assets/afl.txt\" --exclude=\".github,vendor\""
]
}
}
Loading

0 comments on commit bfdba46

Please sign in to comment.