diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml index 5796b3e..550cdff 100644 --- a/.github/workflows/matomo-tests.yml +++ b/.github/workflows/matomo-tests.yml @@ -1,7 +1,7 @@ # Action for running tests # This file has been automatically created. # To recreate it you can run this command -# ./console generate:test-action --plugin="Bandwidth" --php-versions="matomo5_min_php,matomo5_max_php" --schedule-cron="10 2 * * 6" +# ./console generate:test-action --plugin="Bandwidth" --php-versions="matomo6_min_php,matomo6_max_php" --schedule-cron="10 2 * * 6" name: Plugin Bandwidth Tests @@ -37,8 +37,11 @@ jobs: strategy: fail-fast: false matrix: - php: [ 'matomo5_min_php', 'matomo5_max_php' ] + php: [ 'matomo6_min_php', 'matomo6_max_php' ] target: ['minimum_required_matomo', 'maximum_supported_matomo'] + database: + - { engine: 'Mysql', version: '8.0' } + - { engine: 'Mariadb', version: '10.6' } steps: - uses: actions/checkout@v3 with: @@ -52,9 +55,11 @@ jobs: plugin-name: 'Bandwidth' php-version: ${{ matrix.php }} test-type: 'PluginTests' + mysql-engine: ${{ matrix.database.engine }} + mysql-version: ${{ matrix.database.version }} matomo-test-branch: ${{ matrix.target }} artifacts-pass: ${{ secrets.ARTIFACTS_PASS }} - upload-artifacts: ${{ matrix.php == 'matomo5_min_php' && matrix.target == 'maximum_supported_matomo' }} + upload-artifacts: ${{ matrix.php == 'matomo6_min_php' && matrix.target == 'maximum_supported_matomo' && matrix.database.engine == 'Mysql' }} UI: runs-on: ubuntu-24.04 steps: @@ -68,7 +73,9 @@ jobs: plugin-name: 'Bandwidth' matomo-test-branch: 'maximum_supported_matomo' test-type: 'UI' - php-version: 'matomo5_min_php' - node-version: '16' + mysql-engine: 'Mysql' + mysql-version: '8.0' + php-version: 'matomo6_min_php' + node-version: '24' artifacts-pass: ${{ secrets.ARTIFACTS_PASS }} upload-artifacts: true diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index dd02e7e..ae831de 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -26,7 +26,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' tools: cs2pr - name: Install dependencies run: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4431747..22354ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## Changelog +- 6.0.0 - 2026-08-09 - Compatibility with Matomo 6 - 5.0.6 - 2026-04-27 - Updated API documentation - 5.0.5 - 2026-03-02 - Updated API documentation - 5.0.4 - 2025-10-27 - Updated screenshot for Marketplace diff --git a/phpstan.neon b/phpstan.neon index 2f5613b..3d16f83 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,13 +1,12 @@ parameters: level: 1 - phpVersion: 70200 + phpVersion: 80100 tmpDir: /tmp/phpstan/Bandwidth/main paths: - . excludePaths: - tests/* - - vendor/ - - github-action-tests/ + - github-action-tests/ (?) bootstrapFiles: - ../../bootstrap-phpstan.php universalObjectCratesClasses: diff --git a/plugin.json b/plugin.json index 5bf6aa5..796051a 100644 --- a/plugin.json +++ b/plugin.json @@ -1,13 +1,13 @@ { "name": "Bandwidth", - "version": "5.0.6", + "version": "6.0.0", "description": "Monitor Bandwidth for each page, download, and measure overall traffic in bytes. For requirements check out the description.", "theme": false, "keywords": ["bandwidth", "filesize", "size", "download"], "license": "GPL v3+", "homepage": "https://matomo.org", "require": { - "matomo": ">=5.0.0-b4,<6.0.0-b1" + "matomo": ">=6.0.0-b1,<7.0.0-b1" }, "support": { "email": "hello@matomo.org", diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads.png index be58119..f4d5d86 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads_flat.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads_flat.png index 038beb9..0bc15a4 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads_flat.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads_flat.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads_no_bandwidth.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads_no_bandwidth.png index e8173be..b7c45cc 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads_no_bandwidth.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_downloads_no_bandwidth.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_no_bandwidth_on_day_but_in_month.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_no_bandwidth_on_day_but_in_month.png index c2d067a..900b58a 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_no_bandwidth_on_day_but_in_month.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_no_bandwidth_on_day_but_in_month.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_titles.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_titles.png index c11c89e..c54759b 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_titles.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_titles.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_titles_no_bandwidth.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_titles_no_bandwidth.png index 7e9cbc9..8279f09 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_titles_no_bandwidth.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_titles_no_bandwidth.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls.png index c9a5f97..19206b2 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls_flat.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls_flat.png index 76eaecd..d46c6fb 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls_flat.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls_flat.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls_no_bandwidth.png b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls_no_bandwidth.png index 297af9a..4aff974 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls_no_bandwidth.png and b/tests/UI/expected-ui-screenshots/Bandwidth_actions_page_urls_no_bandwidth.png differ diff --git a/tests/UI/expected-ui-screenshots/Bandwidth_visitors_overview.png b/tests/UI/expected-ui-screenshots/Bandwidth_visitors_overview.png index 24793be..0031125 100644 Binary files a/tests/UI/expected-ui-screenshots/Bandwidth_visitors_overview.png and b/tests/UI/expected-ui-screenshots/Bandwidth_visitors_overview.png differ