merged branch fabpot/browserkit-client (PR #7835)

fabpot · fabpot · commit 0621e4f9bbbe · 2013-04-25T08:32:27.000+02:00
This PR was merged into the master branch. Discussion ---------- fixed Client implementation to return the right Response (closes #4475) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | #4475 | License | MIT | Doc PR | symfony/symfony-docs#2549 This PR addresses #4475 by trying to minimize the BC break impact. Commits ------- 31cefc6 made some small tweaks 84ca34b alternate fix where we had accessor for the BrowerKit request/response instances 1005fd1 fixed Client implementation to return the right Response (closes #4475)
diff --git a/Client.php b/Client.php
@@ -85,7 +85,7 @@ public function enableProfiler()
     }
 
     /**
-     * Makes a request.
+     * {@inheritdoc}
      *
      * @param Request $request A Request instance
      *
@@ -113,6 +113,10 @@ protected function doRequest($request)
 
     /**
      * {@inheritdoc}
+     *
+     * @param Request $request A Request instance
+     *
+     * @return Response A Response instance
      */
     protected function doRequestInProcess($request)
     {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function enableProfiler()`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * Makes a request.`
	`88`	`+ * {@inheritdoc}`
`89`	`89`	`*`
`90`	`90`	`* @param Request $request A Request instance`
`91`	`91`	`*`
`@@ -113,6 +113,10 @@ protected function doRequest($request)`
`113`	`113`
`114`	`114`	`/**`
`115`	`115`	`* {@inheritdoc}`
	`116`	`+ *`
	`117`	`+ * @param Request $request A Request instance`
	`118`	`+ *`
	`119`	`+ * @return Response A Response instance`
`116`	`120`	`*/`
`117`	`121`	`protected function doRequestInProcess($request)`
`118`	`122`	`{`