Process module names in a case-insentive matter

tvdijen · Apr 22, 2024 · 556d697 · 556d697
1 parent b13dd02
commit 556d697
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/TestCase/Module.php b/src/TestCase/Module.php
@@ -54,7 +54,7 @@ public function invokeTest(): void
         $available = $this->getAvailable();
 
         foreach ($this->parsed as $module) {
-            if (in_array($module, $available)) {
+            if (in_array(strtolower($module), $available)) {
                 $state = State::OK;
                 break 1;
             }

diff --git a/src/TestConfiguration.php b/src/TestConfiguration.php
@@ -192,7 +192,8 @@ private function getAvailableApacheModulesCgi(): array
      */
     private function setAvailablePhpModules(): void
     {
-        $this->availablePhpModules = array_merge(get_loaded_extensions(), get_loaded_extensions(true));
+        $availablePhpModules = array_merge(get_loaded_extensions(), get_loaded_extensions(true));
+        $this->availablePhpModules = array_map('strtolower', $availablePhpModules);
     }
 
 

diff --git a/src/TestSuite/Modules.php b/src/TestSuite/Modules.php
@@ -36,7 +36,7 @@ class Modules extends \SimpleSAML\Module\monitor\TestSuiteFactory
     private array $storePhpDependencies = [
         'memcache' => 'memcached|memcache',
         'phpsession' => 'session',
-        'sql' => 'PDO'
+        'sql' => 'pdo'
     ];
 
     /** @var array */
@@ -45,13 +45,13 @@ class Modules extends \SimpleSAML\Module\monitor\TestSuiteFactory
         'authYubiKey' => 'curl',
 // TODO: consent only requires pdo when database backend is used..
 //       Should probably add this to required-list when processing metadata
-//        'consent' => 'PDO',
-        'consentAdmin' => 'PDO',
+//        'consent' => 'pdo',
+        'consentAdmin' => 'pdo',
         'ldap' => 'ldap',
         'ldapRadius' => ['ldap'],
         'memcacheMonitor' => 'memcached|memcache',
         'negotiate' => 'krb5',
-        'sqlauth' => 'PDO'
+        'sqlauth' => 'pdo'
     ];
 
 
@@ -79,7 +79,7 @@ protected function initialize(TestData $testData = null): void
     private function addRequiredApacheModule(string $module): void
     {
         if (!in_array($module, $this->requiredApacheModules)) {
-            $this->requiredApacheModules[] = $module;
+            $this->requiredApacheModules[] = strtolower($module);
         }
     }