Prepare for Matomo 6

.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="LoginLdap" --php-versions="matomo5_min_php,matomo5_max_php" --setup-script=".github/scripts/setup_ldap.sh" --has-submodules --schedule-cron="25 3 * * 6"
+# ./console generate:test-action --plugin="LoginLdap" --php-versions="matomo6_min_php,matomo6_max_php" --setup-script=".github/scripts/setup_ldap.sh" --has-submodules --schedule-cron="25 3 * * 6"
 
 name: Plugin LoginLdap 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:
@@ -53,10 +56,12 @@ jobs:
           plugin-name: 'LoginLdap'
           php-version: ${{ matrix.php }}
           test-type: 'PluginTests'
+          mysql-engine: ${{ matrix.database.engine }}
+          mysql-version: ${{ matrix.database.version }}
           matomo-test-branch: ${{ matrix.target }}
           setup-script: '.github/scripts/setup_ldap.sh'
           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:
@@ -72,7 +77,9 @@ jobs:
           matomo-test-branch: 'maximum_supported_matomo'
           setup-script: '.github/scripts/setup_ldap.sh'
           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

.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:

.gitignore

@@ -4,4 +4,6 @@ tests/System/processed/*xml
 /vue/dist/*.common.js
 /vue/dist/*.map
 /vue/dist/*.development.*
+# only the minified bundle is served; the unminified one is no longer built
+/vue/dist/*.umd.js
 .codex

CHANGELOG.md

@@ -1,5 +1,8 @@
 # LoginLdap Changelog
 
+#### LoginLdap 6.0.0
+* Compatibility with Matomo 6
+
 #### LoginLdap 5.2.4 - 2026-08-10
 - Added code to change the logic for random password generation
 

Ldap/Client.php

@@ -31,9 +31,9 @@ class Client
     );
 
     /**
-     * The LDAP connection resource. Set to the result of `ldap_connect`.
+     * The LDAP connection. Set to the result of `ldap_connect`.
      *
-     * @var resource
+     * @var \LDAP\Connection|false|null
      */
     private $connectionResource;
 

LoginLdap.php

@@ -64,7 +64,6 @@ public function getJsFiles(&$jsFiles)
     public function getStylesheetFiles(&$stylesheetFiles)
     {
         $stylesheetFiles[] = "plugins/Login/stylesheets/login.less";
-        $stylesheetFiles[] = "plugins/Login/stylesheets/variables.less";
         $stylesheetFiles[] = "plugins/LoginLdap/vue/src/Admin/Admin.less";
         $stylesheetFiles[] = "plugins/LoginLdap/vue/src/TestableField/TestableField.less";
     }

phpstan.neon

@@ -1,13 +1,12 @@
 parameters:
     level: 5
-    phpVersion: 70200
+    phpVersion: 80100
     tmpDir: /tmp/phpstan/LoginLdap/main
     paths:
         - .
     excludePaths:
         - tests/*
-        - vendor/
-        - github-action-tests/
+        - github-action-tests/ (?)
     bootstrapFiles:
         - ../../bootstrap-phpstan.php
     universalObjectCratesClasses:

plugin.json

@@ -1,13 +1,13 @@
 {
     "name": "LoginLdap",
-    "version": "5.2.4",
+    "version": "6.0.0",
     "description": "LDAP authentication and synchronization for Matomo.",
     "theme": false,
     "keywords": ["ldap", "login", "authentication", "active", "directory", "kerberos", "sso"],
     "license": "GPL v3+",
     "homepage": "https://github.com/matomo-org/plugin-LoginLdap",
     "require": {
-        "matomo": ">=5.0.0-b1,<6.0.0-b1"
+        "matomo": ">=6.0.0-b1,<7.0.0-b1"
     },
     "authors": [
         {

tests/Integration/Commands/SynchronizeUsersTest.php

@@ -105,8 +105,8 @@ public function test_CommandReportsUsersThatAreNotSynchronized_WhenUserMissing_A
         $users = $this->getLdapUserLogins();
         $this->assertEquals(array('blackwidow', 'ironman'), $users);
 
-        $this->assertRegExp("/^.*missinguser.*User.*not found.*$/", $this->applicationTester->getDisplay());
-        $this->assertRegExp("/^.*msmarvel.*LDAP entity missing required.*$/", $this->applicationTester->getDisplay());
+        $this->assertMatchesRegularExpression("/^.*missinguser.*User.*not found.*$/", $this->applicationTester->getDisplay());
+        $this->assertMatchesRegularExpression("/^.*msmarvel.*LDAP entity missing required.*$/", $this->applicationTester->getDisplay());
     }
 
     public function test_CommandSkipsExisitingUsers_IfSkipExistingOptionUsed()