Merge branch 'master' into release_2_1

.github/workflows/linux_tests.yml

@@ -65,7 +65,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r devices/linux/Files/requirements.txt
       - name: Test installer
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4.1.7
         with:
           name: configuration
       - shell: bash
@@ -93,35 +93,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r devices/linux/Files/requirements.txt
       - name: Test installer
-        uses: actions/download-artifact@v3
-        with:
-          name: configuration
-      - shell: bash
-        run: |
-          cat create_test_data_ttls.txt >> devices/linux/Files/main.py
-          echo "run_installer()" >> devices/linux/Files/main.py
-          cd devices/linux/Files/
-          python main.py -d -s --username eduroam_user --password eduroam_password
-  test_ubuntu_22:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      max-parallel: 5
-      matrix:
-        os: [ubuntu-22.04]
-        python-version: [3.7, 3.8, 3.9]
-    needs: [create_test_data_ttls]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r devices/linux/Files/requirements.txt
-      - name: Test installer
-        uses: actions/download-artifact@v3
+        uses: actions/[email protected]
         with:
           name: configuration
       - shell: bash
@@ -130,3 +102,4 @@ jobs:
           echo "run_installer()" >> devices/linux/Files/main.py
           cd devices/linux/Files/
           python main.py -d -s --username eduroam_user --password eduroam_password
+          

composer.json

@@ -10,14 +10,15 @@
     "require": {
         "geoip2/geoip2": "^2.9",
         "phpmailer/phpmailer": "^6.0",
-	"simplesamlphp/simplesamlphp": "^2.0",
+        "simplesamlphp/simplesamlphp": "^2.3",
         "chillerlan/php-qrcode": "^4.3",
         "pear/net_dns2": "1.5.3",
         "components/jquery": "^3.6"
     },
     "config": {
         "allow-plugins": {
-            "simplesamlphp/composer-module-installer": true
+            "simplesamlphp/composer-module-installer": true,
+            "simplesamlphp/composer-xmlprovider-installer": true
         }
     }
 }