bug #6793 Simplex\Framework - add argumentResolver property (alchimik)

wouterj · wouterj · commit b92f3056454d · 2016-08-04T17:55:57.000+02:00
This PR was merged into the 3.1 branch. Discussion ---------- Simplex\Framework - add argumentResolver property Commits ------- 2611798 Simplex\Framework - add argumentResolver property
diff --git a/create_framework/unit_testing.rst b/create_framework/unit_testing.rst
@@ -52,16 +52,19 @@ resolver. Modify the framework to make use of them::
 
     use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
     use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+    use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 
     class Framework
     {
         protected $matcher;
         protected $resolver;
+        protected $argumentResolver;
 
-        public function __construct(UrlMatcherInterface $matcher, ControllerResolverInterface $resolver)
+        public function __construct(UrlMatcherInterface $matcher, ControllerResolverInterface $resolver, ArgumentResolverInterface $argumentResolver)
         {
             $this->matcher = $matcher;
             $this->resolver = $resolver;
+            $this->argumentResolver = $argumentResolver;
         }
 
         // ...
@@ -100,9 +103,10 @@ We are now ready to write our first test::
                 ->method('getContext')
                 ->will($this->returnValue($this->getMock('Symfony\Component\Routing\RequestContext')))
             ;
-            $resolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface');
+            $controllerResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface');
+            $argumentResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface');
 
-            return new Framework($matcher, $resolver);
+            return new Framework($matcher, $controllerResolver, $argumentResolver);
         }
     }
 
@@ -141,6 +145,7 @@ Response::
 
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+    use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
     public function testControllerResponse()
     {
@@ -161,9 +166,10 @@ Response::
             ->method('getContext')
             ->will($this->returnValue($this->getMock('Symfony\Component\Routing\RequestContext')))
         ;
-        $resolver = new ControllerResolver();
+        $controllerResolver = new ControllerResolver();
+        $argumentResolver = new ArgumentResolver();
 
-        $framework = new Framework($matcher, $resolver);
+        $framework = new Framework($matcher, $controllerResolver, $argumentResolver);
 
         $response = $framework->handle(new Request());
 

Original file line number	Diff line number	Diff line change
`@@ -52,16 +52,19 @@ resolver. Modify the framework to make use of them::`
`52`	`52`
`53`	`53`	`use Symfony\Component\Routing\Matcher\UrlMatcherInterface;`
`54`	`54`	`use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;`
	`55`	`+ use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;`
`55`	`56`
`56`	`57`	`class Framework`
`57`	`58`	`{`
`58`	`59`	`protected $matcher;`
`59`	`60`	`protected $resolver;`
	`61`	`+ protected $argumentResolver;`
`60`	`62`
`61`		`- public function __construct(UrlMatcherInterface $matcher, ControllerResolverInterface $resolver)`
	`63`	`+ public function __construct(UrlMatcherInterface $matcher, ControllerResolverInterface $resolver, ArgumentResolverInterface $argumentResolver)`
`62`	`64`	`{`
`63`	`65`	`$this->matcher = $matcher;`
`64`	`66`	`$this->resolver = $resolver;`
	`67`	`+ $this->argumentResolver = $argumentResolver;`
`65`	`68`	`}`
`66`	`69`
`67`	`70`	`// ...`
`@@ -100,9 +103,10 @@ We are now ready to write our first test::`
`100`	`103`	`->method('getContext')`
`101`	`104`	`->will($this->returnValue($this->getMock('Symfony\Component\Routing\RequestContext')))`
`102`	`105`	`;`
`103`		`- $resolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface');`
	`106`	`+ $controllerResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface');`
	`107`	`+ $argumentResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface');`
`104`	`108`
`105`		`- return new Framework($matcher, $resolver);`
	`109`	`+ return new Framework($matcher, $controllerResolver, $argumentResolver);`
`106`	`110`	`}`
`107`	`111`	`}`
`108`	`112`
`@@ -141,6 +145,7 @@ Response::`
`141`	`145`
`142`	`146`	`use Symfony\Component\HttpFoundation\Response;`
`143`	`147`	`use Symfony\Component\HttpKernel\Controller\ControllerResolver;`
	`148`	`+ use Symfony\Component\HttpKernel\Controller\ArgumentResolver;`
`144`	`149`
`145`	`150`	`public function testControllerResponse()`
`146`	`151`	`{`
`@@ -161,9 +166,10 @@ Response::`
`161`	`166`	`->method('getContext')`
`162`	`167`	`->will($this->returnValue($this->getMock('Symfony\Component\Routing\RequestContext')))`
`163`	`168`	`;`
`164`		`- $resolver = new ControllerResolver();`
	`169`	`+ $controllerResolver = new ControllerResolver();`
	`170`	`+ $argumentResolver = new ArgumentResolver();`
`165`	`171`
`166`		`- $framework = new Framework($matcher, $resolver);`
	`172`	`+ $framework = new Framework($matcher, $controllerResolver, $argumentResolver);`
`167`	`173`
`168`	`174`	`$response = $framework->handle(new Request());`
`169`	`175`