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="Slack" --php-versions="matomo5_min_php,matomo5_max_php" --dependent-plugins="matomo-org/plugin-CustomAlerts" --schedule-cron="0 5 * * 6"
# ./console generate:test-action --plugin="Slack" --php-versions="matomo6_min_php,matomo6_max_php" --dependent-plugins="matomo-org/plugin-CustomAlerts" --schedule-cron="0 5 * * 6"

name: Plugin Slack 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 @@ -53,9 +56,11 @@ jobs:
php-version: ${{ matrix.php }}
test-type: 'PluginTests'
matomo-test-branch: ${{ matrix.target }}
mysql-engine: ${{ matrix.database.engine }}
mysql-version: ${{ matrix.database.version }}
redis-service: true
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' }}
artifacts-protected: true
dependent-plugins: 'matomo-org/plugin-CustomAlerts'
github-token: ${{ secrets.TESTS_ACCESS_TOKEN || secrets.GITHUB_TOKEN }}
Expand All @@ -72,8 +77,10 @@ jobs:
plugin-name: 'Slack'
matomo-test-branch: 'maximum_supported_matomo'
test-type: 'UI'
php-version: 'matomo5_min_php'
node-version: '16'
php-version: 'matomo6_min_php'
node-version: '24'
mysql-engine: 'Mysql'
mysql-version: '8.0'
redis-service: true
artifacts-pass: ${{ secrets.ARTIFACTS_PASS }}
upload-artifacts: true
Expand Down
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
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.2'
php-version: '8.1'

- name: Check out github-action-tests repository
uses: actions/checkout@v4
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/tests/System/processed/
/tests/Integration/Importers/processed/
/tests/UI/processed-ui-screenshots/
/tests/UI/processed-ui-screenshots/
/vue/dist/*.umd.js
/vue/dist/*.map
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-10
- Compatibility with Matomo 6

5.1.0 - 2026-07-13
- Added code to encrypt sensitive values in database to improve security

Expand Down
2 changes: 1 addition & 1 deletion Settings/EncryptedSlackOauthTokenSetting.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function setValue($value)
$encryptedValue = $this->encryption->encryptString($normalizedValue);
$this->storage->setValue($this->name, $encryptedValue);
$backend = $this->storage->getBackend();
if ($backend instanceof PluginSettingsTable && method_exists($backend, 'saveValue')) {
if ($backend instanceof PluginSettingsTable) {
$backend->saveValue($this->name, $encryptedValue);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
parameters:
level: 5
phpVersion: 70200
phpVersion: 80100
tmpDir: /tmp/phpstan/Slack/main
paths:
- .
excludePaths:
- tests/*
- 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,10 +1,10 @@
{
"name": "Slack",
"description": "Send Matomo reports and alerts to Slack channels, keeping your team informed and ready to act in real time.",
"version": "5.1.0",
"version": "6.0.0",
"theme": false,
"require": {
"matomo": ">=5.0.0,<6.0.0-b1"
"matomo": ">=6.0.0-b1,<7.0.0-b1"
},
"authors": [
{
Expand Down
Binary file modified tests/UI/expected-ui-screenshots/CustomAlerts_empty_report.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/Slack_empty_report.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/Slack_send_via_slack.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/Slack_send_via_slack_new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/Slack_slack_report_enabled.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/Slack_slack_report_error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading