tests: update for psr14 with cron looking at config page (simplesamlphp#2568)

* tests: update for psr14 with cron looking at config page

* put those around the right way

* I found that the key in $response->data['summary'] is different

In testRunCorrectKey() doing var_dump($response->data['summary']);

```
array(1) {
  'cron info' =>
  string(57) "Cron did run tag [daily] at Fri, 28 Nov..."
}
```

It seems before that the keys were just numeric [1] so maybe we should
change runTag to do this (or duplicate the keys with numeric) to be
non breaking?

[1] https://github.com/simplesamlphp/simplesamlphp/blob/87bd56f96bf570689cd27f8de6dcad81a93ed8f5/modules/cron/hooks/hook_cron.php#L21

* I think this might fix this CI failure

* make cron a core module to see if the 2 tests pass in CI

* make the module listenerprovider use the core modules list by def

* we do not want to make that temporary change perm

* test

* see it early

* test2

* test3

* test4

* allow instance to be remade

* cleanup

Author: monkeyiq

src/SimpleSAML/Configuration.php

@@ -365,7 +365,6 @@ public static function getInstance(string $instancename = 'simplesaml'): Configu
         if (array_key_exists($instancename, self::$instance)) {
             return self::$instance[$instancename];
         }
-
         if ($instancename === 'simplesaml') {
             try {
                 return self::getConfig();

src/SimpleSAML/Event/Dispatcher/ModuleEventDispatcherFactory.php

@@ -19,4 +19,12 @@ public static function getInstance(): EventDispatcher
 
         return self::$instance;
     }
-}
+
+    public static function testingRemakeInstance(): EventDispatcher
+    {
+        $provider = new ModuleListenerProvider();
+        self::$instance = new EventDispatcher($provider);
+        return self::$instance;
+    }
+    
+}

src/SimpleSAML/Event/Provider/ModuleListenerProvider.php

@@ -6,6 +6,7 @@
 
 use Psr\EventDispatcher\ListenerProviderInterface;
 use SimpleSAML\Configuration;
+use SimpleSAML\Module;
 
 class ModuleListenerProvider implements ListenerProviderInterface
 {
@@ -15,7 +16,7 @@ class ModuleListenerProvider implements ListenerProviderInterface
     public function __construct()
     {
         $configuration = Configuration::getInstance();
-        $enabledModules = $configuration->getArray('module.enable', []);
+        $enabledModules = $configuration->getOptionalArray('module.enable', Module::$core_modules);
         $this->discoverListeners($enabledModules);
     }
 
@@ -127,4 +128,4 @@ private function getClassNameFromFile(string $file, string $moduleName): ?string
         $className = "SimpleSAML\\Module\\{$moduleName}\\Event\\Listener\\{$basename}";
         return $className;
     }
-}
+}

tests/modules/cron/src/Controller/CronTest.php

@@ -13,6 +13,7 @@
 use SimpleSAML\Session;
 use SimpleSAML\Utils;
 use SimpleSAML\XHTML\Template;
+use SimpleSAML\Event\Dispatcher\ModuleEventDispatcherFactory;
 
 /**
  * Set of tests for the controllers in the "cron" module.
@@ -65,13 +66,18 @@ public function requireAdmin(): void
                     'key' => 'verysecret',
                     'allowed_tags' => ['daily'],
                     'sendemail' => false,
+                    'module.enable' => ['cron' => true],
+                    'debug_message' => true,
                 ],
                 '[ARRAY]',
                 'simplesaml',
             ),
             'module_cron.php',
             'simplesaml',
         );
+
+        ModuleEventDispatcherFactory::testingRemakeInstance();
+
     }
 
 
@@ -101,6 +107,7 @@ public function testInfo(): void
      */
     public function testRunCorrectKey(): void
     {
+    
         $_SERVER['REQUEST_URI'] = '/module.php/cron/run/daily/verysecret';
 
         $c = new Controller\Cron($this->config, $this->session);
@@ -112,7 +119,8 @@ public function testRunCorrectKey(): void
         $this->assertFalse($response->data['mail_required']);
         $this->assertArrayHasKey('time', $response->data);
         $this->assertCount(1, $response->data['summary']);
-        $this->assertEquals('Cron did run tag [daily] at ' . $response->data['time'], $response->data['summary'][0]);
+        
+        $this->assertEquals('Cron did run tag [daily] at ' . $response->data['time'], $response->data['summary']['cron info']);
     }
 
 

tests/src/SimpleSAML/ModuleTest.php

@@ -11,6 +11,11 @@
 use SimpleSAML\Module;
 use Symfony\Component\Filesystem\Path;
 
+use SimpleSAML\Event\Dispatcher\ModuleEventDispatcherFactory;
+use SimpleSAML\Module\admin\Event\ConfigPageEvent;
+use SimpleSAML\XHTML\Template;
+use SimpleSAML\Locale\Translate;
+
 /**
  */
 #[CoversClass(Module::class)]
@@ -121,11 +126,33 @@ public function testResolveClass(): void
      */
     public function testGetModuleHooks(): void
     {
-        $hooks = Module::getModuleHooks('cron');
-        $this->assertArrayHasKey('configpage', $hooks);
-        $this->assertEquals('cron_hook_configpage', $hooks['configpage']['func']);
-        $expectedFile = Path::canonicalize(dirname(__DIR__, 3) . '/modules/cron/hooks/hook_configpage.php');
-        $this->assertEquals($expectedFile, $hooks['configpage']['file']);
+        $c = Configuration::loadFromArray(
+            [
+                'assets' => [ 'salt' => '1234567890'],
+                'module.enable' => ['saml' => true, 'admin' => true, 'cron' => true,],
+            ], '', 'simplesaml');
+        Configuration::setPreLoadedConfig($c);
+        $t = new Template($c, 'admin:config.twig');
+        $t->data = [
+            'links' => [
+                [
+                    'href' => Module::getModuleURL('admin/diagnostics'),
+                    'text' => Translate::noop('Diagnostics on hostname, port and protocol'),
+                ],
+                [
+                    'href' => Module::getModuleURL('admin/phpinfo'),
+                    'text' => Translate::noop('Information on your PHP installation'),
+                ],
+            ],
+        ];
+
+        $eventDispatcher = ModuleEventDispatcherFactory::getInstance();
+        $event = $eventDispatcher->dispatch(new ConfigPageEvent($t));
+        $t = $event->getTemplate();
+        $this->assertEquals(
+            \SimpleSAML\Locale\Translate::noop('Cron module information page'),
+            $t->data['links'][2]['text']);
+
     }