Symfony6 (#1675)

Add Symfony 6 support

composer.json

@@ -61,21 +61,21 @@
         "phpmailer/phpmailer": "^6.5",
         "simplesamlphp/assert": "^0.3.0",
         "simplesamlphp/saml2": "^4.6",
-        "symfony/cache": "^5.4",
-        "symfony/config": "^5.4",
-        "symfony/console": "^5.4",
+        "symfony/cache": "^5.4||^6",
+        "symfony/config": "^5.4||^6",
+        "symfony/console": "^5.4||^6",
         "symfony/dependency-injection": "^5.4",
-        "symfony/filesystem": "^5.4",
-        "symfony/finder": "^5.4",
-        "symfony/framework-bundle": "^5.4",
-        "symfony/http-foundation": "^5.4",
-        "symfony/http-kernel": "^5.4",
-        "symfony/intl": "^5.4",
-        "symfony/routing": "^5.4",
+        "symfony/filesystem": "^5.4||^6",
+        "symfony/finder": "^5.4||^6",
+        "symfony/framework-bundle": "^5.4||^6",
+        "symfony/http-foundation": "^5.4||^6",
+        "symfony/http-kernel": "^5.4||^6",
+        "symfony/intl": "^5.4||^6",
+        "symfony/routing": "^5.4||^6",
         "symfony/translation-contracts": "^2.5",
-        "symfony/twig-bridge": "^5.4",
-        "symfony/var-exporter": "^5.4",
-        "symfony/yaml": "^5.4",
+        "symfony/twig-bridge": "^5.4||^6",
+        "symfony/var-exporter": "^5.4||^6",
+        "symfony/yaml": "^5.4||^6",
         "twig/intl-extra": "^3.3",
         "twig/twig": "^3.3.8"
     },

src/SimpleSAML/HTTP/RunnableResponse.php

@@ -67,7 +67,7 @@ class RunnableResponse extends Response
      *
      * Note: No return-type possible due to upstream limitations
      */
-    public function sendContent()
+    public function sendContent(): static
     {
         return call_user_func_array($this->callable, $this->arguments);
     }

src/SimpleSAML/Kernel.php

@@ -14,7 +14,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 /**
  * A class to create the container and handle a given request.
@@ -132,16 +132,16 @@ class Kernel extends BaseKernel
     /**
      * Import routes.
      *
-     * @param RouteCollectionBuilder $routes
+     * @param RoutingConfigurator  $routes
      */
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    protected function configureRoutes(RoutingConfigurator $routes): void
     {
         $configuration = Configuration::getInstance();
         $baseDir = $configuration->getBaseDir();
-        $routes->import($baseDir . '/routing/routes/*' . self::CONFIG_EXTS, '/', 'glob');
+        $routes->import($baseDir . '/routing/routes/*' . self::CONFIG_EXTS);
         $confDir = Module::getModuleDir($this->module) . '/routing/routes';
         if (is_dir($confDir)) {
-            $routes->import($confDir . '/**/*' . self::CONFIG_EXTS, $this->module, 'glob');
+            $routes->import($confDir . '/**/*' . self::CONFIG_EXTS)->prefix($this->module);
         }
     }
 

src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php

@@ -123,7 +123,7 @@ class MetaDataStorageHandlerSerialize extends MetaDataStorageSource
         $ret = [];
 
         $loc = new File(Path::canonicalize($this->directory . '/' . rawurlencode($set)), false);
-        if (!$this->fileSystem->exists($loc) || !$loc->isReadable()) {
+        if (!$this->fileSystem->exists($loc->getPath()) || !$loc->isReadable()) {
             Logger::warning(sprintf(
                 'Serialize metadata handler: Unable to open directory: %s',
                 var_export($loc->getPathName(), true),
@@ -208,7 +208,7 @@ class MetaDataStorageHandlerSerialize extends MetaDataStorageSource
         if (!$loc->isDir()) {
             Logger::info('Creating directory: ' . $loc);
             try {
-                $this->fileSystem->mkdir($loc, 0777);
+                $this->fileSystem->mkdir($loc->getPath(), 0777);
             } catch (IOException $e) {
                 Logger::error('Failed to create directory ' . $loc . ': ' . $e->getMessage());
                 return false;

src/SimpleSAML/XHTML/Template.php

@@ -563,7 +563,7 @@ class Template extends Response
      *
      * Note: No return type possible due to upstream limitations
      */
-    public function send()
+    public function send(): static
     {
         $this->content = $this->getContents();
         return parent::send();