Remove ParamConverterListener in favor of controller.service_arguments-tag.

src/QafooLabs/Bundle/NoFrameworkBundle/DependencyInjection/Configuration.php

@@ -15,7 +15,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritDoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('qafoo_labs_no_framework');

src/QafooLabs/Bundle/NoFrameworkBundle/Request/FormRequestFactoryInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace QafooLabs\Bundle\NoFrameworkBundle\Request;
+
+use QafooLabs\MVC\FormRequest;
+
+/**
+ * Class SymfonyFormRequest
+ *
+ * @package App\Form
+ */
+interface FormRequestFactoryInterface
+{
+    public function createFormRequest(): FormRequest;
+}

src/QafooLabs/Bundle/NoFrameworkBundle/Request/SymfonyFormRequestFactory.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace QafooLabs\Bundle\NoFrameworkBundle\Request;
+
+use QafooLabs\MVC\FormRequest;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Class SymfonyFormRequestFactory to creates a SymfonyFormRequest via the Symfony request_stack.
+ */
+final class SymfonyFormRequestFactory implements FormRequestFactoryInterface
+{
+    /**
+     * @var \Symfony\Component\HttpFoundation\RequestStack
+     */
+    private $requestStack;
+
+    /**
+     * @var \Symfony\Component\Form\FormFactoryInterface
+     */
+    private $formFactory;
+
+    public function __construct(RequestStack $requestStack, FormFactoryInterface $formFactory)
+    {
+        $this->requestStack = $requestStack;
+        $this->formFactory  = $formFactory;
+    }
+
+    public function createFormRequest(): FormRequest
+    {
+        return new SymfonyFormRequest($this->requestStack->getCurrentRequest(), $this->formFactory);
+    }
+}

src/QafooLabs/Bundle/NoFrameworkBundle/Resources/config/services.xml

@@ -70,18 +70,27 @@
             <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="100" />
         </service>
 
-        <service id="qafoo_labs_noframework.param_converter.service_provider" class="QafooLabs\Bundle\NoFrameworkBundle\ParamConverter\SymfonyServiceProvider">
-            <argument type="service" id="service_container" />
+        <service id="qafoo_labs_noframework.turbolinks_listener" class="QafooLabs\Bundle\NoFrameworkBundle\EventListener\TurbolinksListener">
+            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
         </service>
 
-        <service id="qafoo_labs_noframework.param_converter_listener" class="QafooLabs\Bundle\NoFrameworkBundle\EventListener\ParamConverterListener">
-            <argument type="service" id="qafoo_labs_noframework.param_converter.service_provider" />
+        <service id="QafooLabs\Bundle\NoFrameworkBundle\Request\SymfonyFormRequestFactory">
+            <argument type="service" id="request_stack"/>
+            <argument type="service" id="form.factory" />
+        </service>
 
-            <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
+        <service id="QafooLabs\Bundle\NoFrameworkBundle\Request\SymfonyFormRequest">
+            <factory service="QafooLabs\Bundle\NoFrameworkBundle\Request\SymfonyFormRequestFactory" method="createFormRequest" />
         </service>
 
-        <service id="qafoo_labs_noframework.turbolinks_listener" class="QafooLabs\Bundle\NoFrameworkBundle\EventListener\TurbolinksListener">
-            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
+        <service id="QafooLabs\Bundle\NoFrameworkBundle\SymfonyTokenContext">
+            <argument type="service" id="security.token_storage"/>
+            <argument type="service" id="security.authorization_checker" />
         </service>
+
+        <!-- Aliases -->
+        <service id="QafooLabs\MVC\FormRequest" alias="QafooLabs\Bundle\NoFrameworkBundle\Request\SymfonyFormRequest"/>
+
+        <service id="QafooLabs\MVC\TokenContext" alias="QafooLabs\Bundle\NoFrameworkBundle\SymfonyTokenContext" />
     </services>
 </container>

src/QafooLabs/Bundle/NoFrameworkBundle/Tests/DependencyInjection/ContainerTest.php

@@ -3,39 +3,44 @@
 namespace QafooLabs\Bundle\NoFrameworkBundle\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
+use QafooLabs\Bundle\NoFrameworkBundle\Controller\ControllerUtils;
 use QafooLabs\Bundle\NoFrameworkBundle\DependencyInjection\QafooLabsNoFrameworkExtension;
+use QafooLabs\Bundle\NoFrameworkBundle\EventListener\ViewListener;
+use QafooLabs\Bundle\NoFrameworkBundle\Request\SymfonyFormRequest;
+use QafooLabs\Bundle\NoFrameworkBundle\Request\SymfonyFormRequestFactory;
+use QafooLabs\Bundle\NoFrameworkBundle\SymfonyTokenContext;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpFoundation\Request;
+use Twig\Environment;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Form\FormFactory;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
+use QafooLabs\Bundle\NoFrameworkBundle\EventListener\ConvertExceptionListener;
 
 class ContainerTest extends TestCase
 {
     /**
      * @test
+     * @dataProvider provideRegisteredServices
      */
-    public function it_compiles_with_container()
+    public function it_compiles_with_container(string $serviceId, string $expectedClass = null): void
     {
-        $container = $this->createContainer(array());
+        $expectedClass = $expectedClass ?? $serviceId;
+        $container = $this->createContainer([]);
 
-        $this->assertInstanceOf(
-            'QafooLabs\Bundle\NoFrameworkBundle\Controller\ControllerUtils',
-            $container->get('qafoo_labs_noframework.controller_utils')
-        );
-
-        $this->assertInstanceOf(
-            'QafooLabs\Bundle\NoFrameworkBundle\EventListener\ViewListener',
-            $container->get('qafoo_labs_noframework.view_listener')
-        );
-
-        $this->assertInstanceOf(
-            'QafooLabs\Bundle\NoFrameworkBundle\EventListener\ParamConverterListener',
-            $container->get('qafoo_labs_noframework.param_converter_listener')
-        );
+        self::assertInstanceOf($expectedClass,$container->get($serviceId));
     }
 
     /**
      * @test
      */
-    public function it_allows_configuring_convert_exceptions()
+    public function it_allows_configuring_convert_exceptions(): void
     {
         $container = $this->createContainer(array(
             'convert_exceptions' => array(
@@ -46,12 +51,21 @@ public function it_allows_configuring_convert_exceptions()
         $this->assertEquals(array('foo' => 'bar'), $container->getParameter('qafoo_labs_noframework.convert_exceptions_map'));
 
         $this->assertInstanceOf(
-            'QafooLabs\Bundle\NoFrameworkBundle\EventListener\ConvertExceptionListener',
+            ConvertExceptionListener::class,
             $container->get('qafoo_labs_noframework.convert_exception_listener')
         );
     }
 
-    public function createContainer(array $config)
+    public function provideRegisteredServices():iterable
+    {
+        yield ['qafoo_labs_noframework.controller_utils', ControllerUtils::class];
+        yield ['qafoo_labs_noframework.view_listener', ViewListener::class];
+        yield [SymfonyFormRequestFactory::class];
+        yield [SymfonyFormRequest::class];
+        yield [SymfonyTokenContext::class];
+    }
+
+    private function createContainer(array $config): ContainerBuilder
     {
         $container = new ContainerBuilder(new ParameterBag(array(
             'kernel.debug'       => false,
@@ -61,12 +75,19 @@ public function createContainer(array $config)
             'kernel.root_dir'    => __DIR__.'/../../../../' // src dir
         )));
 
+        $requestStack = \Phake::mock(RequestStack::class);
+        \Phake::when($requestStack)->getCurrentRequest()->thenReturn(new Request());
+
         $loader = new QafooLabsNoFrameworkExtension();
-        $container->set('twig', \Phake::mock('Twig\Environment'));
-        $container->set('kernel', \Phake::mock('Symfony\Component\HttpKernel\KernelInterface'));
-        $container->set('controller_name_converter', \Phake::mock('Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser'));
-        $container->set('logger', \Phake::mock('Psr\Log\LoggerInterface'));
-        $container->set('router', \Phake::mock('Symfony\Component\Routing\Generator\UrlGeneratorInterface'));
+        $container->set('twig', \Phake::mock(Environment::class));
+        $container->set('kernel', \Phake::mock(KernelInterface::class));
+        $container->set('controller_name_converter', \Phake::mock(ControllerNameParser::class));
+        $container->set('logger', \Phake::mock(LoggerInterface::class));
+        $container->set('router', \Phake::mock(UrlGeneratorInterface::class));
+        $container->set('request_stack', $requestStack);
+        $container->set('form.factory', \Phake::mock(FormFactory::class));
+        $container->set('security.token_storage', \Phake::mock(TokenStorage::class));
+        $container->set('security.authorization_checker', \Phake::mock(AuthorizationChecker::class));
         $container->registerExtension($loader);
         $loader->load(array($config), $container);