Fix unit tests

tvdijen · tvdijen · commit cd94b19502de · 2025-04-14T23:58:35.000+02:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -38,8 +38,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
         uses: actions/cache@v4
@@ -60,7 +59,7 @@ jobs:
       - name: Decide whether to run code coverage or not
         if: ${{ matrix.php-versions != '7.4' || matrix.operating-system != 'ubuntu-latest' }}
         run: |
-          echo "NO_COVERAGE=--no-coverage" >> $GITHUB_ENV
+          echo "NO_COVERAGE=--no-coverage" >> "$GITHUB_ENV"
 
       - name: Run unit tests
         run: |
@@ -90,8 +89,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
         uses: actions/cache@v4
@@ -130,8 +128,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
         uses: actions/cache@v4
@@ -158,7 +155,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           extensions: intl, ldap, mbstring, xml
           tools: composer:v2
 
@@ -168,8 +165,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
         uses: actions/cache@v4
@@ -199,7 +195,7 @@ jobs:
 
       - name: Psalm
         continue-on-error: true
-        uses: docker://vimeo/psalm-github-actions
+        run: php vendor/bin/psalm
 
       - name: Psalter
         continue-on-error: true
diff --git a/lib/Auth/Ldap.php b/lib/Auth/Ldap.php
@@ -618,8 +618,12 @@ public function setOption($option, $value): void
      * The array of attributes and their values.
      * @see http://no.php.net/manual/en/function.ldap-read.php
      */
-    public function getAttributes(string $dn, $attributes = null, array $binaryAttributes = [], int $maxsize = null): array
-    {
+    public function getAttributes(
+        string $dn,
+        $attributes = null,
+        array $binaryAttributes = [],
+        int $maxsize = null
+    ): array {
         // Preparations, including a pretty debug message...
         $description = 'all attributes';
         if (is_array($attributes)) {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,22 +1,20 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="./tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./lib</directory>
+    </include>
     <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">
+    <testsuite name="Unit tests">
       <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/src</directory>
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
   <logging/>
-  <source>
-    <include>
-      <directory suffix=".php">./lib</directory>
-    </include>
-  </source>
 </phpunit>
