moved the Context::fromRequest() code to the Framework class

fabpot · fabpot · commit 8399581800e9 · 2012-01-21T15:24:55.000+01:00
diff --git a/book/part07.rst b/book/part07.rst
@@ -42,6 +42,8 @@ Move the request handling logic into its own ``Simplex\\Framework`` class::
 
         public function handle(Request $request)
         {
+            $this->matcher->getContext()->fromRequest($request);
+
             try {
                 $request->attributes->add($this->matcher->match($request->getPathInfo()));
 
@@ -69,7 +71,6 @@ And update ``example.com/web/front.php`` accordingly::
     $routes = include __DIR__.'/../src/app.php';
 
     $context = new Routing\RequestContext();
-    $context->fromRequest($request);
     $matcher = new Routing\Matcher\UrlMatcher($routes, $context);
     $resolver = new HttpKernel\Controller\ControllerResolver();
 
diff --git a/book/part09.rst b/book/part09.rst
@@ -72,6 +72,8 @@ the Response instance::
 
         public function handle(Request $request)
         {
+            $this->matcher->getContext()->fromRequest($request);
+
             try {
                 $request->attributes->add($this->matcher->match($request->getPathInfo()));
 

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ the Response instance::`
`72`	`72`
`73`	`73`	`public function handle(Request $request)`
`74`	`74`	`{`
	`75`	`+ $this->matcher->getContext()->fromRequest($request);`
	`76`	`+`
`75`	`77`	`try {`
`76`	`78`	`$request->attributes->add($this->matcher->match($request->getPathInfo()));`
`77`	`79`