Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .github/workflows/matomo-tests.yml
Original file line number Diff line number Diff line change
@@ -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="TreemapVisualization" --php-versions="matomo5_min_php,matomo5_max_php" --schedule-cron="5 2 * * 6"
# ./console generate:test-action --plugin="TreemapVisualization" --php-versions="matomo6_min_php,matomo6_max_php" --schedule-cron="5 2 * * 6"

name: Plugin TreemapVisualization Tests

Expand Down Expand Up @@ -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:
Expand All @@ -52,9 +55,11 @@ jobs:
plugin-name: 'TreemapVisualization'
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:
Expand All @@ -69,7 +74,9 @@ jobs:
plugin-name: 'TreemapVisualization'
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
2 changes: 1 addition & 1 deletion .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## Changelog

# 6.0.0 - 2026-08-09
- Compatibility with Matomo 6

# 5.0.7 - 2026-04-27
- Updated API documentation

Expand Down
5 changes: 2 additions & 3 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
parameters:
level: 1
phpVersion: 70200
phpVersion: 80100
tmpDir: /tmp/phpstan/TreemapVisualization/main
paths:
- .
excludePaths:
- tests/*
- vendor/
- github-action-tests/
- github-action-tests/ (?)
bootstrapFiles:
- ../../bootstrap-phpstan.php
universalObjectCratesClasses:
Expand Down
4 changes: 2 additions & 2 deletions plugin.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "TreemapVisualization",
"version": "5.0.7",
"version": "6.0.0",
"description": "Visualise any report in Matomo as a Treemap. Click on the Treemap icon in each report to load the visualisation.",
"keywords": ["treemap", "graph", "visualization", "infovis", "jit"],
"license": "GPL v3+",
"homepage": "https://matomo.org",
"require": {
"matomo": ">=5.0.0-b1,<6.0.0-b1"
"matomo": ">=6.0.0-b1,<7.0.0-b1"
},
"support": {
"email": "hello@matomo.org",
Expand Down
Binary file modified tests/UI/expected-ui-screenshots/Treemap_actions_treemap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/UI/expected-ui-screenshots/Treemap_initial_treemap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/UI/expected-ui-screenshots/Treemap_normal_treemap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading