From 1d9cd7ed4e7fdceaa41e3af4089d6e1191ab5919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Wed, 17 Oct 2018 16:32:11 +0200
Subject: [PATCH] Refactor SimpleSAML\ModuleControllerResolver to
SimpleSAML\Module\ControllerResolver.
---
.../ControllerResolver.php} | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
rename lib/SimpleSAML/{ModuleControllerResolver.php => Module/ControllerResolver.php} (94%)
diff --git a/lib/SimpleSAML/ModuleControllerResolver.php b/lib/SimpleSAML/Module/ControllerResolver.php
similarity index 94%
rename from lib/SimpleSAML/ModuleControllerResolver.php
rename to lib/SimpleSAML/Module/ControllerResolver.php
index a37ac9340..ba79109d1 100644
--- a/lib/SimpleSAML/ModuleControllerResolver.php
+++ b/lib/SimpleSAML/Module/ControllerResolver.php
@@ -1,15 +1,20 @@
<?php
-namespace SimpleSAML;
+namespace SimpleSAML\Module;
use SimpleSAML\Auth\AuthenticationFactory;
+use SimpleSAML\Configuration;
use SimpleSAML\Error\Exception;
+use SimpleSAML\Module;
+use SimpleSAML\Session;
+
use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
-use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+use Symfony\Component\HttpKernel\Controller\ControllerResolver as SymfonyControllerResolver;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -26,7 +31,7 @@ use Symfony\Component\Routing\RouteCollection;
*
* @package SimpleSAML
*/
-class ModuleControllerResolver extends ControllerResolver implements ArgumentResolverInterface
+class ControllerResolver extends SymfonyControllerResolver implements ArgumentResolverInterface
{
/** @var ArgumentMetadataFactory */
--
GitLab