diff --git a/.codecov.yml b/.codecov.yml
deleted file mode 100644
index f7f39e1..0000000
--- a/.codecov.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-coverage:
-  status:
-    project: yes
-
-comment:
-  layout: "diff"
-  behavior: once
-  require_changes: true
-  require_base: no
-  require_head: yes
-  branches: null
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..77eb073
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,16 @@
+/.github/ export-ignore
+/tools/ export-ignore
+/tests/ export-ignore
+codecov.yml export-ignore
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+phpstan.neon export-ignore
+phpstan-dev.neon export-ignore
+phpstan-baseline.neon export-ignore
+phpstan-baseline-dev.neon export-ignore
+phpcs.xml export-ignore
+phpunit.xml export-ignore
+.php_cs.dist export-ignore
+.markdownlintignore export-ignore
+.markdownlintrc export-ignore
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..ee89027
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,37 @@
+---
+
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"  # See documentation for possible values
+    directory: "/"  # Location of package manifests
+    schedule:
+      interval: "weekly"
+    groups:
+      all-actions:
+        patterns: ["*"]
+
+  - package-ecosystem: "composer"  # See documentation for possible values
+    directory: "/"  # Location of package manifests
+    schedule:
+      interval: "weekly"
+    allow:
+      # Allow both direct and indirect updates for all packages
+      - dependency-type: "all"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+        exclude-patterns:
+          - "symfony/*"
+      development-dependencies:
+        dependency-type: "development"
+      symfony:
+        patterns:
+          - "symfony/*"
diff --git a/.github/workflows/autolock-conversations.yml b/.github/workflows/autolock-conversations.yml
new file mode 100644
index 0000000..66797ba
--- /dev/null
+++ b/.github/workflows/autolock-conversations.yml
@@ -0,0 +1,25 @@
+---
+
+name: 'Lock Threads'
+
+on:  # yamllint disable-line rule:truthy
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: lock
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v6
+        with:
+          issue-inactive-days: '90'
+          pr-inactive-days: '90'
+          log-output: true
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
new file mode 100644
index 0000000..9fa884a
--- /dev/null
+++ b/.github/workflows/documentation.yml
@@ -0,0 +1,55 @@
+---
+
+name: Documentation
+
+on:  # yamllint disable-line rule:truthy
+  push:
+    branches: [master, simplesamlphp-*]
+    paths:
+      - '**.md'
+  pull_request:
+    branches: [master, simplesamlphp-*]
+    paths:
+      - '**.md'
+
+jobs:
+  quality:
+    name: Quality checks
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Lint markdown files
+        uses: nosborn/github-action-markdown-cli@v3
+        with:
+          files: .
+          ignore_path: .markdownlintignore
+
+      - name: Perform spell check
+        uses: codespell-project/actions-codespell@v2
+        with:
+          path: '**/*.md'
+          check_filenames: true
+          ignore_words_list: tekst
+
+  build:
+    name: Build documentation
+    needs: quality
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Run docs build
+        if: github.event_name != 'pull_request'
+        uses: actions/github-script@v9
+        with:
+          # Token has to be generated on a user account that controls the docs-repository.
+          # The _only_ scope to select is "Access public repositories", nothing more.
+          github-token: ${{ secrets.PAT_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: 'simplesamlphp',
+              repo: 'docs',
+              workflow_id: 'mk_docs.yml',
+              ref: 'main'
+            })
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
new file mode 100644
index 0000000..8173315
--- /dev/null
+++ b/.github/workflows/php.yml
@@ -0,0 +1,281 @@
+---
+
+name: CI
+
+on:  # yamllint disable-line rule:truthy
+  push:
+    branches: ['**']
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    branches: [master, release-*]
+    paths-ignore:
+      - '**.md'
+  workflow_dispatch:
+
+jobs:
+  phplinter:
+    name: 'PHP-Linter'
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.3', '8.4', '8.5']
+
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.5
+    with:
+      php-version: ${{ matrix.php-version }}
+
+  linter:
+    name: 'Linter'
+    strategy:
+      fail-fast: false
+
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.5
+    with:
+      enable_eslinter: false
+      enable_jsonlinter: true
+      enable_stylelinter: false
+      enable_yamllinter: true
+
+  unit-tests-linux:
+    name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
+    runs-on: ${{ matrix.operating-system }}
+    needs: [phplinter, linter]
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['8.3', '8.4', '8.5']
+
+    steps:
+      - name: Setup PHP, with composer and extensions
+        # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, \
+            memcached, openssl, pcre, posix, sodium, spl, xml
+          tools: composer
+          ini-values: error_reporting=E_ALL
+          coverage: pcov
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - uses: actions/checkout@v6
+
+      - name: Get composer cache directory
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v5
+        with:
+          path: ${{ env.COMPOSER_CACHE }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Run unit tests with coverage
+        if: ${{ matrix.php-versions == '8.5' }}
+        run: vendor/bin/phpunit
+
+      - name: Run unit tests (no coverage)
+        if: ${{ matrix.php-versions != '8.5' }}
+        run: vendor/bin/phpunit --no-coverage
+
+      - name: Save coverage data
+        if: ${{ matrix.php-versions == '8.5' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: coverage-data
+          path: ${{ github.workspace }}/build
+
+  unit-tests-windows:
+    name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
+    runs-on: ${{ matrix.operating-system }}
+    needs: [phplinter, linter]
+    strategy:
+      fail-fast: true
+      matrix:
+        operating-system: [windows-latest]
+        php-versions: ['8.3', '8.4', '8.5']
+
+    steps:
+      - name: Setup PHP, with composer and extensions
+        # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, memcached,\
+            openssl, pcre, sodium, spl, xml, zip
+          tools: composer
+          ini-values: error_reporting=E_ALL
+          coverage: none
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - uses: actions/checkout@v6
+
+      - name: Get composer cache directory
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v5
+        with:
+          path: ${{ env.COMPOSER_CACHE }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req=ext-posix
+
+      - name: Run unit tests
+        run: vendor/bin/phpunit --no-coverage
+
+  quality:
+    name: Quality control
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Setup PHP, with composer and extensions
+        id: setup-php
+        # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
+        with:
+          # Should be the higest supported version, so we can use the newest tools
+          php-version: '8.5'
+          tools: composer, composer-require-checker, composer-unused
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, \
+            memcached, openssl, pcre, posix, sodium, spl, xml
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - uses: actions/checkout@v6
+
+      - name: Get composer cache directory
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v5
+        with:
+          path: ${{ env.COMPOSER_CACHE }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Check code for hard dependencies missing in composer.json
+        run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json
+
+      - name: Check code for unused dependencies in composer.json
+        run: composer-unused
+
+      - name: PHP Code Sniffer
+        run: vendor/bin/phpcs
+
+      - name: PHPStan
+        run: |
+          vendor/bin/phpstan analyze -c phpstan.neon --debug
+
+      - name: PHPStan (testsuite)
+        run: |
+          vendor/bin/phpstan analyze -c phpstan-dev.neon --debug
+
+  security:
+    name: Security checks
+    runs-on: [ubuntu-latest]
+    steps:
+      - name: Setup PHP, with composer and extensions
+        # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
+        with:
+          # Should be the lowest supported version
+          php-version: '8.3'
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, \
+            memcached, openssl, pcre, posix, sodium, spl, xml
+          tools: composer
+          coverage: none
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - uses: actions/checkout@v6
+
+      - name: Get composer cache directory
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v5
+        with:
+          path: ${{ env.COMPOSER_CACHE }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Security check for locked dependencies
+        run: composer audit
+
+      - name: Update Composer dependencies
+        run: composer update --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Security check for updated dependencies
+        run: composer audit
+
+  coverage:
+    name: Code coverage
+    runs-on: [ubuntu-latest]
+    needs: [unit-tests-linux]
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/download-artifact@v8
+        with:
+          name: coverage-data
+          path: ${{ github.workspace }}/build
+
+      - name: Codecov
+        uses: codecov/codecov-action@v6
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          verbose: true
+
+  cleanup:
+    name: Cleanup artifacts
+    needs: [unit-tests-linux, coverage]
+    runs-on: [ubuntu-latest]
+    if: |
+      always() &&
+      needs.coverage.result == 'success' ||
+      (needs.unit-tests-linux.result == 'success' && needs.coverage.result == 'skipped')
+
+    steps:
+      - uses: geekyeggo/delete-artifact@v6
+        with:
+          name: coverage-data
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0fa63d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+.phpunit.cache/
+.phpunit.result.cache
+composer.lock
+composer.phar
+phpunit.xml.bak
+/super-linter-output/
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
diff --git a/.markdownlintignore b/.markdownlintignore
new file mode 100644
index 0000000..140fada
--- /dev/null
+++ b/.markdownlintignore
@@ -0,0 +1 @@
+vendor/*
diff --git a/.markdownlintrc b/.markdownlintrc
new file mode 100644
index 0000000..b077f0e
--- /dev/null
+++ b/.markdownlintrc
@@ -0,0 +1,4 @@
+{
+  "default": true,
+  "MD013": false
+}
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 0000000..795e2b1
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,17 @@
+<?php
+$finder = PhpCsFixer\Finder::create()
+    ->in([
+        __DIR__ . '/hooks',
+        __DIR__ . '/templates',
+        __DIR__ . '/tests',
+        __DIR__ . '/www',
+    ])
+;
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        '@PSR4' => true,
+        '@PSR5' => true,
+    ])
+    ->setFinder($finder)
+;
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1b8a9ba..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-sudo: required
-
-language: php
-
-php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-
-env:
-  - SIMPLESAMLPHP_VERSION=1.16.*
-  
-matrix:
-  include:
-    - php: 5.6
-      env: SIMPLESAMLPHP_VERSION=dev-master
-    - php: 7.0
-      env: SIMPLESAMLPHP_VERSION=dev-master
-    - php: 7.1
-      env: SIMPLESAMLPHP_VERSION=dev-master
-    - php: 7.2
-      env: SIMPLESAMLPHP_VERSION=dev-master
-    - php: 7.3
-      env: SIMPLESAMLPHP_VERSION=dev-master
-  allow_failures:
-    - env: SIMPLESAMLPHP_VERSION=dev-master
-    - php: 7.3
-
-before_script:
-  - composer require "simplesamlphp/simplesamlphp:${SIMPLESAMLPHP_VERSION}" --no-update
-  - composer update --no-interaction
-  - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then composer require --dev vimeo/psalm; fi
-
-script:
-  - bin/check-syntax.sh
-  - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit; else php vendor/phpunit/phpunit/phpunit --no-coverage; fi
-  - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then vendor/bin/psalm; fi
-
-after_success:
-  # Codecov, need to edit bash uploader for incorrect TRAVIS_PYTHON_VERSION environment variable matching, at least until codecov/codecov-bash#133 is resolved
-  - curl -s https://codecov.io/bash > .codecov
-  - sed -i -e 's/TRAVIS_.*_VERSION/^TRAVIS_.*_VERSION=/' .codecov
-  - chmod +x .codecov
-  - if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then ./.codecov -X gcov; fi
-# - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then bash <(curl -s https://codecov.io/bash); fi
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..a345e48
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,459 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
\ No newline at end of file
diff --git a/README.md b/README.md
index cea74f2..205f46a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
-SimpleSAMLphp AuthMemCookie module
-==================================
+# SimpleSAMLphp AuthMemCookie module
+
+![Build Status](https://github.com/simplesamlphp/simplesamlphp-module-memcookie/actions/workflows/php.yml/badge.svg)
+[![Coverage Status](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-memcookie/branch/master/graph/badge.svg)](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-memcookie)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-memcookie/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-memcookie/?branch=master)
+[![Type Coverage](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-memcookie/coverage.svg)](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-memcookie)
+[![Psalm Level](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-memcookie/level.svg)](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-memcookie)
 
 This module implements [Auth MemCookie](https://zenprojects.github.io/Apache-Authmemcookie-Module/) support for SimpleSAMLphp. This allows
 you to integrate SimpleSAMLphp with web applications written in languages other than PHP.
@@ -8,8 +13,7 @@ you to integrate SimpleSAMLphp with web applications written in languages other
 the attributes found in this data. It also allows you to use the default **Apache access control** features to restrict
 access to your site.
 
-Requisites
-----------
+## Requisites
 
 This module requires you to install and set up the following requirements:
 
@@ -17,31 +21,34 @@ This module requires you to install and set up the following requirements:
 * A *memcache* server.
 * [Auth MemCookie](https://zenprojects.github.io/Apache-Authmemcookie-Module/) .
 
-Installation
-------------
+## Installation
 
 Once you have installed SimpleSAMLphp, installing this module is very simple. First of all, you will need to [download
 Composer](https://getcomposer.org/) if you haven't already. After installing Composer, just execute the following
 command in the root of your SimpleSAMLphp installation:
 
-```
-./composer.phar require simplesamlphp/simplesamlphp-module-memcookie:dev-master
+```shell
+composer.phar require simplesamlphp/simplesamlphp-module-memcookie:dev-master
 ```
 
 where `dev-master` instructs Composer to install the `master` branch from the Git repository. See the
 [releases](https://github.com/simplesamlphp/simplesamlphp-module-memcookie/releases) available if you want to use a
 stable version of the module.
 
-The module is enabled by default. If you want to disable the module once installed, you just need to create a file named
-`disable` in the `modules/memcookie` directory inside your SimpleSAMLphp installation.
+## Configuration
 
-Configuration
--------------
+Next thing you need to do is to enable the module:
+
+in `config.php`, search for the `module.enable` key and set `memcookie` to true:
+
+```php
+    'module.enable' => [ 'memcookie' => true, … ],
+```
 
 The first step to use this module is to configure *Auth MemCookie* appropriately. The following example (that you can
 find also in `extra/auth_memcookie.conf`) might be helpful:
 
-```
+```apacheconf
 <Location />
     # This is a list of memcache servers which Auth MemCookie
     # should use. 
@@ -94,7 +101,7 @@ redirect you automatically to the IdP for authentication.
 In order to see all the environment variables you have available in the protected location, you can drop a PHP script
 like the following in there and access it from your browser after authenticating to your IdP:
 
-```
+```html
 <html>
  <body>
   <table>
diff --git a/bin/check-syntax.sh b/bin/check-syntax.sh
deleted file mode 100755
index 204d4ca..0000000
--- a/bin/check-syntax.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-PHP='/usr/bin/env php'
-RETURN=0
-
-# check PHP files
-for FILE in `find config-templates lib www -name "*.php"`; do
-    $PHP -l $FILE > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        echo "Syntax check failed for ${FILE}"
-        RETURN=`expr ${RETURN} + 1`
-    fi
-done
-
-exit $RETURN
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 0000000..dac692c
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,20 @@
+---
+
+coverage:
+  status:
+    project:
+      default:
+        target: 0%
+        threshold: 2%
+    patch: false
+
+comment:
+  layout: "diff"
+  behavior: once
+  require_changes: true
+  require_base: false
+  require_head: true
+  branches: null
+
+github_checks:
+  annotations: false
diff --git a/composer.json b/composer.json
index 0edd87f..20610ec 100644
--- a/composer.json
+++ b/composer.json
@@ -15,15 +15,33 @@
       "email": "jaime.perez@uninett.no"
     }
   ],
+  "autoload": {
+      "psr-4": {
+          "SimpleSAML\\Module\\memcookie\\": "src/"
+      }
+  },
   "require": {
-    "simplesamlphp/composer-module-installer": ">=1.1.6"
+    "php": "^8.3",
+    "ext-memcached": "*",
+
+    "simplesamlphp/composer-module-installer": "^1.7",
+    "simplesamlphp/simplesamlphp": "^2.5@dev",
+    "symfony/http-foundation": "^7.4"
   },
   "require-dev": {
-    "simplesamlphp/simplesamlphp": "^1.16",
-    "phpunit/phpunit": "~4.8.35"
+    "simplesamlphp/simplesamlphp-test-framework": "^1.11"
   },
   "support": {
     "issues": "https://github.com/simplesamlphp/simplesamlphp-module-memcookie/issues",
     "source": "https://github.com/simplesamlphp/simplesamlphp-module-memcookie/"
+  },
+  "config": {
+    "allow-plugins": {
+      "composer/package-versions-deprecated": true,
+      "simplesamlphp/composer-module-installer": true,
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "phpstan/extension-installer": true,
+      "simplesamlphp/composer-xmlprovider-installer": true
+    }
   }
 }
diff --git a/config-templates/authmemcookie.php b/config/module_authmemcookie.php.dist
similarity index 100%
rename from config-templates/authmemcookie.php
rename to config/module_authmemcookie.php.dist
diff --git a/default-enable b/default-enable
deleted file mode 100644
index e69de29..0000000
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..93df8ab
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<ruleset name="SimpleSAMLphp authlinkedin module ruleset">
+    <description>
+        By default it is less stringent about long lines than other coding standards
+    </description>
+
+    <file>config</file>
+    <file>src</file>
+    <file>tests</file>
+    <!-- Use this to exclude paths. You can have multiple patterns -->
+    <!--<exclude-pattern>*/tests/*</exclude-pattern>-->
+    <!--<exclude-pattern>*/other/*</exclude-pattern>-->
+
+    <!-- This is the rule we inherit from. If you want to exclude some specific rules, see the docs on how to do that -->
+    <rule ref="PSR12"/>
+    <rule ref="vendor/simplesamlphp/simplesamlphp-test-framework/phpcs-simplesamlphp.xml"/>
+</ruleset>
diff --git a/phpstan-dev.neon b/phpstan-dev.neon
new file mode 100644
index 0000000..4d29b8b
--- /dev/null
+++ b/phpstan-dev.neon
@@ -0,0 +1,4 @@
+parameters:
+  level: 9
+  paths:
+    - tests
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..a7c64bd
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,4 @@
+parameters:
+  level: 8
+  paths:
+    - src
diff --git a/phpunit.xml b/phpunit.xml
index c0985fd..5caff29 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,19 +1,21 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="tests/bootstrap.php">
-    <testsuites>
-        <testsuite name="The project's test suite">
-            <directory>tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./lib</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" />
-        <log type="coverage-html" target="build/coverage" title="PHP Coveralls" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70" />
-        <log type="coverage-clover" target="build/logs/clover.xml" />
-    </logging>
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
+      <text outputFile="php://stdout" showUncoveredFiles="true"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="The project's test suite">
+      <directory>tests/</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
-
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index 056be8f..0000000
--- a/psalm.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    name="SimpleSAMLphp Memcookie"
-    useDocblockTypes="true"
-    totallyTyped="false"
->
-    <projectFiles>
-        <directory name="config-templates" />
-        <directory name="lib" />
-        <directory name="www" />
-    </projectFiles>
-
-    <issueHandlers>
-        <LessSpecificReturnType errorLevel="info" />
-
-        <!-- level 3 issues - slightly lazy code writing, but probably low false-negatives -->
-        <DeprecatedMethod errorLevel="info" />
-
-        <MissingClosureReturnType errorLevel="info" />
-        <MissingReturnType errorLevel="info" />
-        <MissingPropertyType errorLevel="info" />
-        <InvalidDocblock errorLevel="info" />
-        <MisplacedRequiredParam errorLevel="info" />
-
-        <PropertyNotSetInConstructor errorLevel="info" />
-        <MissingConstructor errorLevel="info" />
-        <MissingClosureParamType errorLevel="info" />
-        <MissingParamType errorLevel="info" />
-        <UnusedClass errorLevel="info" />
-        <PossiblyUnusedMethod errorLevel="info" />
-    </issueHandlers>
-</psalm>
diff --git a/routing/routes/routes.yml b/routing/routes/routes.yml
new file mode 100644
index 0000000..a61186b
--- /dev/null
+++ b/routing/routes/routes.yml
@@ -0,0 +1,8 @@
+---
+
+memcookie-main:
+  path: /
+  defaults: {
+    _controller: 'SimpleSAML\Module\memcookie\Controller\Memcookie::main'
+  }
+  methods: [GET]
diff --git a/lib/AuthMemCookie.php b/src/AuthMemCookie.php
similarity index 59%
rename from lib/AuthMemCookie.php
rename to src/AuthMemCookie.php
index 07e946e..593ec0f 100644
--- a/lib/AuthMemCookie.php
+++ b/src/AuthMemCookie.php
@@ -1,34 +1,41 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SimpleSAML\Module\memcookie;
 
+use Exception;
+use Memcached;
+use SimpleSAML\Configuration;
+use SimpleSAML\Utils;
+
+use function strlen;
+
 /**
  * This is a helper class for the Auth MemCookie module.
  * It handles the configuration, and implements the logout handler.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class AuthMemCookie
 {
     /**
-     * @var AuthMemCookie This is the singleton instance of this class.
+     * @var \SimpleSAML\Module\memcookie\AuthMemCookie|null This is the singleton instance of this class.
      */
-    private static $instance = null;
-
+    private static ?AuthMemCookie $instance = null;
 
     /**
      * @var \SimpleSAML\Configuration The configuration for Auth MemCookie.
      */
-    private $config;
+    private Configuration $config;
 
 
     /**
      * This function is used to retrieve the singleton instance of this class.
      *
-     * @return AuthMemCookie The singleton instance of this class.
+     * @return \SimpleSAML\Module\memcookie\AuthMemCookie The singleton instance of this class.
      */
-    public static function getInstance()
+    public static function getInstance(): AuthMemCookie
     {
         if (self::$instance === null) {
             self::$instance = new AuthMemCookie();
@@ -44,7 +51,7 @@ public static function getInstance()
     private function __construct()
     {
         // load AuthMemCookie configuration
-        $this->config = \SimpleSAML\Configuration::getConfig('authmemcookie.php');
+        $this->config = Configuration::getConfig('module_authmemcookie.php');
     }
 
 
@@ -53,7 +60,7 @@ private function __construct()
      *
      * @return string The login type which should be used for Auth MemCookie.
      */
-    public function getAuthSource()
+    public function getAuthSource(): string
     {
         return $this->config->getString('authsource');
     }
@@ -65,12 +72,12 @@ public function getAuthSource()
      * @return string The name of the cookie.
      * @throws \Exception If the value of the 'cookiename' configuration option is invalid.
      */
-    public function getCookieName()
+    public function getCookieName(): string
     {
-        $cookieName = $this->config->getString('cookiename', 'AuthMemCookie');
-        if (!is_string($cookieName) || strlen($cookieName) === 0) {
-            throw new \Exception(
-                "Configuration option 'cookiename' contains an invalid value. This option should be a string."
+        $cookieName = $this->config->getOptionalString('cookiename', 'AuthMemCookie');
+        if (strlen($cookieName) === 0) {
+            throw new Exception(
+                "Configuration option 'cookiename' contains an invalid value. This option should be a string.",
             );
         }
 
@@ -81,13 +88,11 @@ public function getCookieName()
     /**
      * This function retrieves the name of the attribute which contains the username from the configuration.
      *
-     * @return string The name of the attribute which contains the username.
+     * @return string|null The name of the attribute which contains the username.
      */
-    public function getUsernameAttr()
+    public function getUsernameAttr(): ?string
     {
-        $usernameAttr = $this->config->getString('username', null);
-
-        return $usernameAttr;
+        return $this->config->getOptionalString('username', null);
     }
 
 
@@ -96,38 +101,32 @@ public function getUsernameAttr()
      *
      * @return string|null The name of the attribute which contains the groups.
      */
-    public function getGroupsAttr()
+    public function getGroupsAttr(): ?string
     {
-        $groupsAttr = $this->config->getString('groups', null);
-
-        return $groupsAttr;
+        return $this->config->getOptionalString('groups', null);
     }
 
 
     /**
      * This function creates and initializes a Memcache object from our configuration.
      *
-     * @return \Memcache|\Memcached A Memcache object initialized from our configuration.
+     * @return \Memcached A Memcache object initialized from our configuration.
      */
-    public function getMemcache()
+    public function getMemcache(): \Memcached
     {
-        $memcacheHost = $this->config->getString('memcache.host', '127.0.0.1');
-        $memcachePort = $this->config->getInteger('memcache.port', 11211);
+        $memcacheHost = $this->config->getOptionalString('memcache.host', '127.0.0.1');
+        $memcachePort = $this->config->getOptionalInteger('memcache.port', 11211);
 
-        $class = class_exists('\Memcache') ? '\Memcache' : (class_exists('\Memcached') ? '\Memcached' : false);
+        $class = class_exists('\Memcached') ? '\Memcached' : false;
 
         if (!$class) {
-            throw new Exception('Missing Memcached implementation. You must install either the Memcache or Memcached extension.');
+            throw new Exception('Missing Memcached implementation. You must install either the Memcached extension.');
         }
 
-        $memcache = new $class;
+        $memcache = new Memcached();
 
         foreach (explode(',', $memcacheHost) as $memcacheHost) {
-            if ($memcache instanceof \Memcached) {
-                $memcache->addServer($memcacheHost, $memcachePort);
-            } else {
-                $memcache->addServer($memcacheHost, $memcachePort, true);
-            }
+            $memcache->addServer($memcacheHost, $memcachePort);
         }
 
         return $memcache;
@@ -136,9 +135,8 @@ public function getMemcache()
 
     /**
      * This function logs the user out by deleting the session information from memcache.
-     * @return void
      */
-    private function doLogout()
+    private function doLogout(): void
     {
         $cookieName = $this->getCookieName();
 
@@ -154,15 +152,15 @@ private function doLogout()
         $memcache->delete($sessionID);
 
         // delete the session cookie
-        \SimpleSAML\Utils\HTTP::setCookie($cookieName, null);
+        $httpUtils = new Utils\HTTP();
+        $httpUtils->setCookie($cookieName, null);
     }
 
 
     /**
      * This function implements the logout handler. It deletes the information from Memcache.
-     * @return void
      */
-    public static function logoutHandler()
+    public static function logoutHandler(): void
     {
         self::getInstance()->doLogout();
     }
diff --git a/src/Controller/Memcookie.php b/src/Controller/Memcookie.php
new file mode 100644
index 0000000..6a05cec
--- /dev/null
+++ b/src/Controller/Memcookie.php
@@ -0,0 +1,174 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\Module\memcookie\Controller;
+
+use SimpleSAML\Auth;
+use SimpleSAML\Configuration;
+use SimpleSAML\Error;
+use SimpleSAML\HTTP\RunnableResponse;
+use SimpleSAML\Module\memcookie\AuthMemCookie;
+use SimpleSAML\Session;
+use SimpleSAML\Utils;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Controller class for the memcookie module.
+ *
+ * This class serves the different views available in the module.
+ *
+ * @package simplesamlphp/simplesamlphp-module-memcookie
+ */
+class Memcookie
+{
+    /**
+     * @var \SimpleSAML\Auth\Simple|string
+     * @psalm-var \SimpleSAML\Auth\Simple|class-string
+     */
+    protected $auth_simple = Auth\Simple::class;
+
+    /** @var \SimpleSAML\Configuration */
+    protected Configuration $config;
+
+    /**
+     * @var \SimpleSAML\Utils\HTTP
+     */
+    protected $http_utils;
+
+    /** @var \SimpleSAML\Session */
+    protected Session $session;
+
+
+    /**
+     * Controller constructor.
+     *
+     * It initializes the global configuration and session for the controllers implemented here.
+     *
+     * @param \SimpleSAML\Configuration $config The configuration to use by the controllers.
+     * @param \SimpleSAML\Session $session The session to use by the controllers.
+     *
+     * @throws \Exception
+     */
+    public function __construct(
+        Configuration $config,
+        Session $session,
+    ) {
+        $this->config = $config;
+        $this->session = $session;
+        $this->http_utils = new Utils\HTTP();
+    }
+
+
+    /**
+     * Inject the \SimpleSAML\Auth\Simple dependency.
+     *
+     * @param \SimpleSAML\Auth\Simple $authSimple
+     */
+    public function setAuthSimple(Auth\Simple $authSimple): void
+    {
+        $this->auth_simple = $authSimple;
+    }
+
+
+    /**
+     * Inject the \SimpleSAML\Utils\HTTP dependency.
+     *
+     * @param \SimpleSAML\Utils\HTTP $httpUtils
+     */
+    public function setHttpUtils(Utils\HTTP $httpUtils): void
+    {
+        $this->http_utils = $httpUtils;
+    }
+
+
+    /**
+     * This method implements an script which can be used to authenticate users with Auth MemCookie.
+     * See: https://zenprojects.github.io/Apache-Authmemcookie-Module/
+     *
+     * The configuration for this script is stored in config/module_authmemcookie.php.
+     *
+     * The file extra/auth_memcookie.conf contains an example of how Auth Memcookie can be configured
+     * to use SimpleSAMLphp.
+     *
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @return \SimpleSAML\HTTP\RunnableResponse
+     */
+    public function main(Request $request): RunnableResponse
+    {
+        // load SimpleSAMLphp configuration
+        $ssp_cf = $this->config::getInstance();
+
+        // load Auth MemCookie configuration
+        $amc_cf = AuthMemCookie::getInstance();
+
+        $sourceId = $amc_cf->getAuthSource();
+        $simple = $this->auth_simple;
+
+        /** @var \SimpleSAML\Auth\Simple $s */
+        $s = new $simple($sourceId);
+
+        // check if the user is authorized. We attempt to authenticate the user if not
+        $s->requireAuth();
+
+        // generate session id and save it in a cookie
+        $randomUtils = new Utils\Random();
+        $sessionID = $randomUtils->generateID();
+        $cookieName = $amc_cf->getCookieName();
+        $this->http_utils->setCookie($cookieName, $sessionID);
+
+        // generate the authentication information
+        $attributes = $s->getAttributes();
+
+        $authData = [];
+
+        // username
+        $usernameAttr = $amc_cf->getUsernameAttr();
+        if ($usernameAttr === null || !array_key_exists($usernameAttr, $attributes)) {
+            throw new Error\Exception(
+                "The user doesn't have an attribute named '" . $usernameAttr .
+                "'. This attribute is expected to contain the username.",
+            );
+        }
+        $authData['UserName'] = $attributes[$usernameAttr];
+
+        // groups
+        $groupsAttr = $amc_cf->getGroupsAttr();
+        if ($groupsAttr !== null) {
+            if (!array_key_exists($groupsAttr, $attributes)) {
+                throw new Error\Exception(
+                    "The user doesn't have an attribute named '" . $groupsAttr .
+                    "'. This attribute is expected to contain the groups the user is a member of.",
+                );
+            }
+            $authData['Groups'] = $attributes[$groupsAttr];
+        } else {
+            $authData['Groups'] = [];
+        }
+
+        $authData['RemoteIP'] = $request->server->get('REMOTE_ADDR');
+
+        foreach ($attributes as $n => $v) {
+            $authData['ATTR_' . $n] = $v;
+        }
+
+        // store the authentication data in the memcache server
+        $data = '';
+        foreach ($authData as $n => $v) {
+            if (is_array($v)) {
+                $v = implode(':', $v);
+            }
+            $data .= $n . '=' . $v . "\r\n";
+        }
+
+        $memcache = $amc_cf->getMemcache();
+        $expirationTime = $s->getAuthData('Expire');
+        $memcache->set($sessionID, $data, $expirationTime ?? 0);
+
+        // register logout handler
+        $this->session->registerLogoutHandler($sourceId, '\SimpleSAML\Module\memcookie\AuthMemCookie', 'logoutHandler');
+
+        // redirect the user back to this page to signal that the login is completed
+        return new RunnableResponse([$this->http_utils, 'redirectTrustedURL'], [$this->http_utils->getSelfURL()]);
+    }
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0fda7dc..216a5c6 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 $projectRoot = dirname(__DIR__);
-require_once($projectRoot.'/vendor/autoload.php');
+require_once($projectRoot . '/vendor/autoload.php');
 
 // Symlink module into ssp vendor lib so that templates and urls can resolve correctly
-$linkPath = $projectRoot.'/vendor/simplesamlphp/simplesamlphp/modules/memcookie';
+$linkPath = $projectRoot . '/vendor/simplesamlphp/simplesamlphp/modules/memcookie';
 if (file_exists($linkPath) === false) {
     echo "Linking '$linkPath' to '$projectRoot'\n";
     symlink($projectRoot, $linkPath);
diff --git a/tests/src/Controller/MemcookieTest.php b/tests/src/Controller/MemcookieTest.php
new file mode 100644
index 0000000..56d479c
--- /dev/null
+++ b/tests/src/Controller/MemcookieTest.php
@@ -0,0 +1,143 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\Test\Module\memcookie\Controller;
+
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\Auth;
+use SimpleSAML\Configuration;
+use SimpleSAML\Module\memcookie\Controller;
+use SimpleSAML\Session;
+use SimpleSAML\Utils;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Set of tests for the controllers in the "memcookie" module.
+ *
+ * @package SimpleSAML\Test
+ */
+final class MemcookieTest extends TestCase
+{
+    /** @var \SimpleSAML\Configuration */
+    protected Configuration $authsources;
+
+    /** @var \SimpleSAML\Configuration */
+    protected Configuration $config;
+
+    /** @var \SimpleSAML\Utils\HTTP */
+    protected Utils\HTTP $http_utils;
+
+    /** @var \SimpleSAML\Configuration */
+    protected Configuration $module_config;
+
+    /** @var \SimpleSAML\Session */
+    protected Session $session;
+
+
+    /**
+     * Set up for each test.
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->config = Configuration::loadFromArray(
+            [
+                'module.enable' => ['memcookie' => true],
+            ],
+            '[ARRAY]',
+            'simplesaml',
+        );
+
+        $session = $this->createMock(Session::class);
+        $session->method('getData')->willReturn(['default-sp' => []]);
+        $this->session = $session;
+
+
+        $this->authsources = Configuration::loadFromArray(
+            [
+                'default-sp' => ['saml:SP'],
+            ],
+            '[ARRAY]',
+            'simplesaml',
+        );
+        Configuration::setPreLoadedConfig($this->authsources, 'authsources.php', 'simplesaml');
+
+        $this->http_utils = new class () extends Utils\HTTP {
+            /** @param array<mixed> $params */
+            public function setCookie(string $name, ?string $value, ?array $params = null, bool $throw = true): void
+            {
+                // stub
+            }
+
+
+            /** @param array<mixed> $parameters */
+            public function redirectTrustedURL(string $url, array $parameters = []): void
+            {
+                // stub
+            }
+        };
+
+        $this->module_config = Configuration::loadFromArray(
+            [
+                'authsource' => 'default-sp',
+                'cookiename' => 'AuthMemCookie',
+                'username' => 'uid',
+                'groups' => null,
+                'memcache.host' => '127.0.0.1',
+                'memcache.port' => 11211,
+            ],
+            '[ARRAY]',
+            'simplesaml',
+        );
+        Configuration::setPreLoadedConfig($this->module_config, 'module_authmemcookie.php', 'simplesaml');
+    }
+
+
+    /**
+     * Test that a valid requests results in a RunnableResponse
+     * @return void
+     */
+    public function testMemcookie(): void
+    {
+        $sysUtils = new Utils\System();
+        if ($sysUtils->getOS() === $sysUtils::WINDOWS) {
+            $this->markTestSkipped(
+                'This test can only run on Linux because of the availability of the memcached-extension.',
+            );
+        }
+
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['REQUEST_URI'] = '/module.php/memcookie/';
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+
+        $request = Request::create(
+            '/module.php/memcookie/',
+            'GET',
+            [],
+        );
+
+        $c = new Controller\Memcookie($this->config, $this->session);
+        $c->setHttpUtils($this->http_utils);
+        $c->setAuthSimple(new class ('admin') extends Auth\Simple {
+            /** @param array<mixed> $params */
+            public function requireAuth(array $params = []): void
+            {
+                // stub
+            }
+
+
+            /** @return array<mixed> */
+            public function getAttributes(): array
+            {
+                return ['uid' => ['dduck']];
+            }
+        });
+
+        $response = $c->main($request);
+
+        $this->assertTrue($response->isSuccessful());
+    }
+}
diff --git a/tools/composer-require-checker.json b/tools/composer-require-checker.json
new file mode 100644
index 0000000..eed71aa
--- /dev/null
+++ b/tools/composer-require-checker.json
@@ -0,0 +1,4 @@
+{
+  "symbol-whitelist": [
+  ]
+}
diff --git a/tools/linters/.yaml-lint.yml b/tools/linters/.yaml-lint.yml
new file mode 100644
index 0000000..630095a
--- /dev/null
+++ b/tools/linters/.yaml-lint.yml
@@ -0,0 +1,7 @@
+---
+
+extends: default
+
+rules:
+  line-length:
+    max: 120
diff --git a/www/auth.php b/www/auth.php
deleted file mode 100644
index 9235245..0000000
--- a/www/auth.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-use SimpleSAML\Utils;
-use SimpleSAML\Module\memcookie\AuthMemCookie;
-
-/**
- * This file implements an script which can be used to authenticate users with Auth MemCookie.
- * See: https://zenprojects.github.io/Apache-Authmemcookie-Module/
- *
- * The configuration for this script is stored in config/authmemcookie.php.
- *
- * The file extra/auth_memcookie.conf contains an example of how Auth Memcookie can be configured
- * to use SimpleSAMLphp.
- */
-
-// load SimpleSAMLphp configuration
-$ssp_cf = \SimpleSAML\Configuration::getInstance();
-
-// load Auth MemCookie configuration
-$amc_cf = AuthMemCookie::getInstance();
-
-$sourceId = $amc_cf->getAuthSource();
-$s = new SimpleSAML\Auth\Simple($sourceId);
-
-// check if the user is authorized. We attempt to authenticate the user if not
-$s->requireAuth();
-
-// generate session id and save it in a cookie
-$sessionID = Utils\Random::generateID();
-$cookieName = $amc_cf->getCookieName();
-Utils\HTTP::setCookie($cookieName, $sessionID);
-
-// generate the authentication information
-$attributes = $s->getAttributes();
-
-$authData = [];
-
-// username
-$usernameAttr = $amc_cf->getUsernameAttr();
-if (!array_key_exists($usernameAttr, $attributes)) {
-    throw new \SimpleSAML\Error\Exception(
-        "The user doesn't have an attribute named '".$usernameAttr.
-        "'. This attribute is expected to contain the username."
-    );
-}
-$authData['UserName'] = $attributes[$usernameAttr];
-
-// groups
-$groupsAttr = $amc_cf->getGroupsAttr();
-if ($groupsAttr !== null) {
-    if (!array_key_exists($groupsAttr, $attributes)) {
-        throw new \SimpleSAML\Error\Exception(
-            "The user doesn't have an attribute named '".$groupsAttr.
-            "'. This attribute is expected to contain the groups the user is a member of."
-        );
-    }
-    $authData['Groups'] = $attributes[$groupsAttr];
-} else {
-    $authData['Groups'] = [];
-}
-
-$authData['RemoteIP'] = $_SERVER['REMOTE_ADDR'];
-
-foreach ($attributes as $n => $v) {
-    $authData['ATTR_'.$n] = $v;
-}
-
-// store the authentication data in the memcache server
-$data = '';
-foreach ($authData as $n => $v) {
-    if (is_array($v)) {
-        $v = implode(':', $v);
-    }
-    $data .= $n.'='.$v."\r\n";
-}
-
-$memcache = $amc_cf->getMemcache();
-$expirationTime = $s->getAuthData('Expire');
-if ($memcache instanceof \Memcached) {
-    $memcache->set($sessionID, $data, $expirationTime);
-} else {
-    $memcache->set($sessionID, $data, 0, $expirationTime);
-}
-
-// register logout handler
-$session = \SimpleSAML\Session::getSessionFromRequest();
-$session->registerLogoutHandler($sourceId, '\SimpleSAML\Module\memcookie\AuthMemCookie', 'logoutHandler');
-
-// redirect the user back to this page to signal that the login is completed
-Utils\HTTP::redirectTrustedURL(Utils\HTTP::getSelfURL());