scheb · scheb · Aug 17, 2016 · Aug 17, 2016 · Aug 17, 2016 · Aug 17, 2016
diff --git a/Resources/config/security.xml b/Resources/config/security.xml
@@ -12,6 +12,7 @@
 		<parameter key="scheb_two_factor.security_voter.class">Scheb\TwoFactorBundle\Security\TwoFactor\Voter</parameter>
 		<parameter key="scheb_two_factor.authentication_context.class">Scheb\TwoFactorBundle\Security\TwoFactor\AuthenticationContext</parameter>
 		<parameter key="scheb_two_factor.authentication_context_factory.class">Scheb\TwoFactorBundle\Security\TwoFactor\AuthenticationContextFactory</parameter>
+		<parameter key="scheb_two_factor.security.renderer.class">Scheb\TwoFactorBundle\Security\TwoFactor\Renderer</parameter>
 	</parameters>
 	<services>
 		<service id="scheb_two_factor.session_flag_manager" class="%scheb_two_factor.session_flag_manager.class%">

diff --git a/Resources/config/security_email.xml b/Resources/config/security_email.xml
@@ -28,9 +28,12 @@
 			<tag name="scheb_two_factor.provider" alias="email" />
 			<argument type="service" id="scheb_two_factor.security.email.code_generator" />
 			<argument type="service" id="scheb_two_factor.security.email.code_validator" />
-			<argument type="service" id="templating" />
-			<argument>%scheb_two_factor.email.template%</argument>
+			<argument type="service" id="scheb_two_factor.security.email.renderer" />
 			<argument>%scheb_two_factor.parameter_names.auth_code%</argument>
 		</service>
+        <service id="scheb_two_factor.security.email.renderer" class="%scheb_two_factor.security.renderer.class%" lazy="true">
+            <argument type="service" id="templating" />
+            <argument>%scheb_two_factor.email.template%</argument>
+        </service>
 	</services>
 </container>
diff --git a/Resources/config/security_google.xml b/Resources/config/security_google.xml
@@ -25,9 +25,12 @@
 		<service id="scheb_two_factor.security.google.provider" class="%scheb_two_factor.security.google.provider.class%">
 			<tag name="scheb_two_factor.provider" alias="google" />
 			<argument type="service" id="scheb_two_factor.security.google.code_validator" />
-			<argument type="service" id="templating" />
-			<argument>%scheb_two_factor.google.template%</argument>
+			<argument type="service" id="scheb_two_factor.security.google.renderer" />
 			<argument>%scheb_two_factor.parameter_names.auth_code%</argument>
 		</service>
+        <service id="scheb_two_factor.security.google.renderer" class="%scheb_two_factor.security.renderer.class%" lazy="true">
+            <argument type="service" id="templating" />
+            <argument>%scheb_two_factor.google.template%</argument>
+        </service>
 	</services>
 </container>
diff --git a/Security/TwoFactor/Provider/Email/TwoFactorProvider.php b/Security/TwoFactor/Provider/Email/TwoFactorProvider.php
@@ -7,7 +7,7 @@
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Email\Generator\CodeGeneratorInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Email\Validation\CodeValidatorInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\TwoFactorProviderInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
+use Scheb\TwoFactorBundle\Security\TwoFactor\Renderer;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -24,35 +24,20 @@ class TwoFactorProvider implements TwoFactorProviderInterface
     private $authenticator;
 
     /**
-     * @var EngineInterface
+     * @var Renderer
      */
-    private $templating;
-
-    /**
-     * @var string
-     */
-    private $formTemplate;
+    private $renderer;
 
     /**
      * @var string
      */
     private $authCodeParameter;
 
-    /**
-     * Construct provider for email authentication.
-     *
-     * @param CodeGeneratorInterface $codeGenerator
-     * @param CodeValidatorInterface $authenticator
-     * @param EngineInterface        $templating
-     * @param string                 $formTemplate
-     * @param string                 $authCodeParameter
-     */
-    public function __construct(CodeGeneratorInterface $codeGenerator, CodeValidatorInterface $authenticator, EngineInterface $templating, $formTemplate, $authCodeParameter)
+    public function __construct(CodeGeneratorInterface $codeGenerator, CodeValidatorInterface $authenticator, Renderer $renderer, $authCodeParameter)
     {
         $this->codeGenerator = $codeGenerator;
         $this->authenticator = $authenticator;
-        $this->templating = $templating;
-        $this->formTemplate = $formTemplate;
+        $this->renderer = $renderer;
         $this->authCodeParameter = $authCodeParameter;
     }
 
@@ -103,8 +88,6 @@ public function requestAuthenticationCode(AuthenticationContextInterface $contex
         }
 
         // Force authentication code dialog
-        return $this->templating->renderResponse($this->formTemplate, array(
-            'useTrustedOption' => $context->useTrustedOption(),
-        ));
+        return $this->renderer->render($context);
     }
 }
diff --git a/Security/TwoFactor/Provider/Google/TwoFactorProvider.php b/Security/TwoFactor/Provider/Google/TwoFactorProvider.php
@@ -6,7 +6,7 @@
 use Scheb\TwoFactorBundle\Security\TwoFactor\AuthenticationContextInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\Validation\CodeValidatorInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\TwoFactorProviderInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
+use Scheb\TwoFactorBundle\Security\TwoFactor\Renderer;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -18,33 +18,19 @@ class TwoFactorProvider implements TwoFactorProviderInterface
     private $authenticator;
 
     /**
-     * @var EngineInterface
+     * @var Renderer
      */
-    private $templating;
-
-    /**
-     * @var string
-     */
-    private $formTemplate;
+    private $renderer;
 
     /**
      * @var string
      */
     private $authCodeParameter;
 
-    /**
-     * Construct provider for Google authentication.
-     *
-     * @param CodeValidatorInterface $authenticator
-     * @param EngineInterface        $templating
-     * @param string                 $formTemplate
-     * @param string                 $authCodeParameter
-     */
-    public function __construct(CodeValidatorInterface $authenticator, EngineInterface $templating, $formTemplate, $authCodeParameter)
+    public function __construct(CodeValidatorInterface $authenticator, Renderer $renderer, $authCodeParameter)
     {
         $this->authenticator = $authenticator;
-        $this->templating = $templating;
-        $this->formTemplate = $formTemplate;
+        $this->renderer = $renderer;
         $this->authCodeParameter = $authCodeParameter;
     }
 
@@ -89,8 +75,6 @@ public function requestAuthenticationCode(AuthenticationContextInterface $contex
         }
 
         // Force authentication code dialog
-        return $this->templating->renderResponse($this->formTemplate, array(
-            'useTrustedOption' => $context->useTrustedOption(),
-        ));
+        return $this->renderer->render($context);
     }
 }
diff --git a/Security/TwoFactor/Renderer.php b/Security/TwoFactor/Renderer.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Scheb\TwoFactorBundle\Security\TwoFactor;
+
+use Scheb\TwoFactorBundle\Security\TwoFactor\AuthenticationContextInterface;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
+
+class Renderer
+{
+    private $templating;
+    private $formTemplate;
+
+    public function __construct(EngineInterface $templating, $formTemplate)
+    {
+        $this->templating = $templating;
+        $this->formTemplate = $formTemplate;
+    }
+
+    public function render(AuthenticationContextInterface $context) {
+        return $this->templating->renderResponse($this->formTemplate, array(
+            'useTrustedOption' => $context->useTrustedOption(),
+        ));
+    }
+}
diff --git a/Tests/Security/TwoFactor/Provider/Email/TwoFactorProviderTest.php b/Tests/Security/TwoFactor/Provider/Email/TwoFactorProviderTest.php
@@ -21,12 +21,7 @@ class TwoFactorProviderTest extends TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $templating;
-
-    /**
-     * @var string
-     */
-    private $formTemplate = 'AcmeTestBundle:Test:auth.html.twig';
+    private $renderer;
 
     /**
      * @var TwoFactorProvider
@@ -39,9 +34,9 @@ public function setUp()
 
         $this->authenticator = $this->createMock('Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Email\Validation\CodeValidatorInterface');
 
-        $this->templating = $this->createMock('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface');
+        $this->renderer = $this->createMock('Scheb\TwoFactorBundle\Security\TwoFactor\Renderer');
 
-        $this->provider = new TwoFactorProvider($this->generator, $this->authenticator, $this->templating, $this->formTemplate, 'authCodeName');
+        $this->provider = new TwoFactorProvider($this->generator, $this->authenticator, $this->renderer, 'authCodeName');
     }
 
     /**
@@ -218,13 +213,14 @@ public function beginAuthentication_interfaceNotImplemented_returnFalse()
      */
     public function requestAuthenticationCode_trustedOption_assignToTemplate($trustedOption)
     {
+        $context = $this->getAuthenticationContext(null, null, null, $trustedOption);
+
         //Mock the template engine
-        $this->templating
+        $this->renderer
             ->expects($this->once())
-            ->method('renderResponse')
-            ->with($this->formTemplate, array('useTrustedOption' => $trustedOption));
+            ->method('render')
+            ->with($context);
 
-        $context = $this->getAuthenticationContext(null, null, null, $trustedOption);
         $this->provider->requestAuthenticationCode($context);
     }
 
@@ -255,9 +251,9 @@ public function requestAuthenticationCode_notPostRequest_displayForm()
             ->method('checkCode');
 
         //Mock the template engine
-        $this->templating
+        $this->renderer
             ->expects($this->once())
-            ->method('renderResponse')
+            ->method('render')
             ->will($this->returnValue(new Response('<form></form>')));
 
         $returnValue = $this->provider->requestAuthenticationCode($context);
@@ -301,10 +297,10 @@ public function requestAuthenticationCode_invalidCode_displayFlashMessage()
             ->with('two_factor', 'scheb_two_factor.code_invalid');
 
         //Mock the template engine
-        $this->templating
+        $this->renderer
             ->expects($this->once())
-            ->method('renderResponse')
-            ->with($this->formTemplate, $this->anything())
+            ->method('render')
+            ->with($context)
             ->will($this->returnValue(new Response('<form></form>')));
 
         $returnValue = $this->provider->requestAuthenticationCode($context);

diff --git a/Tests/Security/TwoFactor/Provider/Google/TwoFactorProviderTest.php b/Tests/Security/TwoFactor/Provider/Google/TwoFactorProviderTest.php
@@ -16,12 +16,7 @@ class TwoFactorProviderTest extends TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $templating;
-
-    /**
-     * @var string
-     */
-    private $formTemplate = 'AcmeTestBundle:Test:auth.html.twig';
+    private $renderer;
 
     /**
      * @var TwoFactorProvider
@@ -31,8 +26,8 @@ class TwoFactorProviderTest extends TestCase
     public function setUp()
     {
         $this->authenticator = $this->createMock('Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\Validation\CodeValidatorInterface');
-        $this->templating = $this->createMock('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface');
-        $this->provider = new TwoFactorProvider($this->authenticator, $this->templating, $this->formTemplate, 'authCodeName');
+        $this->renderer = $this->createMock('Scheb\TwoFactorBundle\Security\TwoFactor\Renderer');
+        $this->provider = new TwoFactorProvider($this->authenticator, $this->renderer, 'authCodeName');
     }
 
     /**
@@ -192,13 +187,14 @@ public function beginAuthentication_interfaceNotImplemented_returnFalse()
      */
     public function requestAuthenticationCode_trustedOption_assignToTemplate($trustedOption)
     {
+        $context = $this->getAuthenticationContext(null, null, null, $trustedOption);
+
         //Mock the template engine
-        $this->templating
+        $this->renderer
             ->expects($this->once())
-            ->method('renderResponse')
-            ->with($this->formTemplate, array('useTrustedOption' => $trustedOption));
+            ->method('render')
+            ->with($context);
 
-        $context = $this->getAuthenticationContext(null, null, null, $trustedOption);
         $this->provider->requestAuthenticationCode($context);
     }
 
@@ -229,9 +225,9 @@ public function requestAuthenticationCode_notPostRequest_displayForm()
             ->method('checkCode');
 
         //Mock the template engine
-        $this->templating
+        $this->renderer
             ->expects($this->once())
-            ->method('renderResponse')
+            ->method('render')
             ->will($this->returnValue(new Response('<form></form>')));
 
         $returnValue = $this->provider->requestAuthenticationCode($context);
@@ -275,10 +271,10 @@ public function requestAuthenticationCode_invalidCode_displayFlashMessage()
             ->with('two_factor', 'scheb_two_factor.code_invalid');
 
         //Mock the template engine
-        $this->templating
+        $this->renderer
             ->expects($this->once())
-            ->method('renderResponse')
-            ->with($this->formTemplate, $this->anything())
+            ->method('render')
+            ->with($context)
             ->will($this->returnValue(new Response('<form></form>')));
 
         $returnValue = $this->provider->requestAuthenticationCode($context);

diff --git a/Tests/Security/TwoFactor/RendererTest.php b/Tests/Security/TwoFactor/RendererTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Scheb\TwoFactorBundle\Tests\Security\TwoFactor;
+
+use Scheb\TwoFactorBundle\Security\TwoFactor\Renderer;
+use Scheb\TwoFactorBundle\Tests\TestCase;
+
+class RendererTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function render_returnResponse()
+    {
+        $response = $this->createMock('Symfony\Component\HttpFoundation\Response');
+        $templating = $this->createMock('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface');
+        $templating
+            ->expects($this->any())
+            ->method('renderResponse')
+            ->will($this->returnValue($response))
+        ;
+        $context = $this->createMock('Scheb\TwoFactorBundle\Security\TwoFactor\AuthenticationContextInterface');
+
+        $renderer = new Renderer($templating, 'AcmeTestBundle:Test:auth.html.twig');
+
+        $this->assertEquals($response, $renderer->render($context));
+    }
+}
diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
         "ocramius/proxy-manager": "~1.0|~2.0"
     },
     "require-dev": {
+        "doctrine/orm": "~2.4,>=2.4.5",
         "phpunit/phpunit": ">=4.8,<6.0",
         "symfony/phpunit-bridge": "~2.7|~3.0",
         "swiftmailer/swiftmailer": ">=4.3,<6.0",