diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2e1697a..28ba23f 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -2,61 +2,6 @@ name: Build on: [push, pull_request] jobs: - deploy: - name: build dependencies & create artifact - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2.0.0 - - name: Install composer dependencies - run: composer install --no-dev -o - - name: Clean-up project - uses: PrestaShopCorp/github-action-clean-before-deploy@v1.0 - - name: Prepare auto-index tool - run: | - composer global require prestashop/autoindex - - name: Generate index.php - run: | - ~/.composer/vendor/bin/autoindex - - name: Create & upload artifact - uses: actions/upload-artifact@v1 - with: - name: ${{ github.event.repository.name }} - path: ../ - update_release_draft: - runs-on: ubuntu-latest - needs: [deploy] - if: github.event_name == 'push' && github.event.ref == 'refs/heads/master' - steps: - - name: Download artifact - uses: actions/download-artifact@v1 - with: - name: ${{ github.event.repository.name }} - - id: release_info - uses: toolmantim/release-drafter@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Prepare for Release - run: | - cd ${{ github.event.repository.name }} - zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }} - - name: Clean existing assets - shell: bash - run: | - curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1 - assets=`bin/hub api -t repos/${{ github.repository }}/releases/${{ steps.release_info.outputs.id }}/assets | awk '/\].url/ { print $2 }'` - for asset in $assets - do - bin/hub api -X DELETE $asset - done - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Publish to GitHub Release - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.release_info.outputs.upload_url }} - asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip - asset_name: ${{ github.event.repository.name }}.zip - asset_content_type: application/zip \ No newline at end of file + build-and-release-draft: + name: Build & Release draft + uses: PrestaShop/.github/.github/workflows/build-release.yml@master diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c19bfb3..6912ea8 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v5 - name: PHP syntax checker 5.6 uses: prestashop/github-action-php-lint/5.6@master @@ -39,13 +39,7 @@ jobs: php-version: '7.4' - name: Checkout - uses: actions/checkout@v2.0.0 - - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: vendor - key: php-${{ hashFiles('composer.lock') }} + uses: actions/checkout@v5 - name: Install dependencies run: composer install @@ -58,6 +52,7 @@ jobs: name: PHPStan runs-on: ubuntu-latest strategy: + fail-fast: false matrix: presta-versions: ['1.7.6', '1.7.7', '1.7.8', 'latest'] steps: @@ -67,21 +62,7 @@ jobs: 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 - with: - path: vendor - key: php-${{ hashFiles('composer.lock') }} - - # Add composer local folder in cache to make next builds faster - - name: Cache composer folder - uses: actions/cache@v1 - with: - path: ~/.composer/cache - key: php-composer-cache + uses: actions/checkout@v5 - run: composer install diff --git a/README.md b/README.md index 8d917e2..1579d12 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,10 @@ Enrich your stats, add graphics presenting the evolution of your sales and orders. +## Compatibility + +PrestaShop: `1.7.6.0` or later + ## Reporting issues You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue]. diff --git a/config.xml b/config.xml index b5e1d31..0fb7dfa 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ statssales - + diff --git a/logo.gif b/logo.gif deleted file mode 100644 index 4364683..0000000 Binary files a/logo.gif and /dev/null differ diff --git a/statssales.php b/statssales.php index 303e49a..aa09ab7 100644 --- a/statssales.php +++ b/statssales.php @@ -54,7 +54,7 @@ public function __construct() { $this->name = 'statssales'; $this->tab = 'administration'; - $this->version = '2.1.0'; + $this->version = '2.1.1'; $this->author = 'PrestaShop'; $this->need_instance = 0; diff --git a/tests/phpstan/phpstan-latest.neon b/tests/phpstan/phpstan-latest.neon index 6b992b4..c604f7c 100644 --- a/tests/phpstan/phpstan-latest.neon +++ b/tests/phpstan/phpstan-latest.neon @@ -1,6 +1,2 @@ includes: - %currentWorkingDirectory%/tests/phpstan/phpstan.neon - -parameters: - ignoreErrors: - - '#Parameter \#1 \$share of static method ShopCore::addSqlRestriction\(\) expects int, string given.#' diff --git a/upgrade/upgrade-2.1.0.php b/upgrade/upgrade-2.1.0.php index 98caa50..43c27d9 100644 --- a/upgrade/upgrade-2.1.0.php +++ b/upgrade/upgrade-2.1.0.php @@ -1,4 +1,3 @@ -