Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merged 2.0

  • Loading branch information...
commit ae4762d671166b5343d62050a2af02d07658a2b8 2 parents 659e800 + 9fd72b8
@fabpot fabpot authored
Showing with 15 additions and 12 deletions.
  1. +15 −12 Controller/Controller.php
View
27 Controller/Controller.php
@@ -48,9 +48,9 @@ public function generateUrl($route, $parameters = array(), $absolute = false)
/**
* Forwards the request to another controller.
*
- * @param string $controller The controller name (a string like BlogBundle:Post:index)
- * @param array $path An array of path parameters
- * @param array $query An array of query parameters
+ * @param string $controller The controller name (a string like BlogBundle:Post:index)
+ * @param array $path An array of path parameters
+ * @param array $query An array of query parameters
*
* @return Response A Response instance
*/
@@ -62,7 +62,7 @@ public function forward($controller, array $path = array(), array $query = array
/**
* Returns a RedirectResponse to the given URL.
*
- * @param string $url The URL to redirect to
+ * @param string $url The URL to redirect to
* @param integer $status The status code to use for the Response
*
* @return RedirectResponse
@@ -88,9 +88,9 @@ public function renderView($view, array $parameters = array())
/**
* Renders a view.
*
- * @param string $view The view name
+ * @param string $view The view name
* @param array $parameters An array of parameters to pass to the view
- * @param Response $response A response instance
+ * @param Response $response A response instance
*
* @return Response A Response instance
*/
@@ -132,6 +132,9 @@ public function stream($view, array $parameters = array(), StreamedResponse $res
*
* throw $this->createNotFoundException('Page not found!');
*
+ * @param string $message A message
+ * @param Exception $previous The previous exception
+ *
* @return NotFoundHttpException
*/
public function createNotFoundException($message = 'Not Found', \Exception $previous = null)
@@ -143,8 +146,8 @@ public function createNotFoundException($message = 'Not Found', \Exception $prev
* Creates and returns a Form instance from the type of the form.
*
* @param string|FormTypeInterface $type The built type of the form
- * @param mixed $data The initial data for the form
- * @param array $options Options for the form
+ * @param mixed $data The initial data for the form
+ * @param array $options Options for the form
*
* @return Form
*/
@@ -156,8 +159,8 @@ public function createForm($type, $data = null, array $options = array())
/**
* Creates and returns a form builder instance
*
- * @param mixed $data The initial data for the form
- * @param array $options Options for the form
+ * @param mixed $data The initial data for the form
+ * @param array $options Options for the form
*
* @return FormBuilder
*/
@@ -221,7 +224,7 @@ public function getUser()
/**
* Returns true if the service id is defined.
*
- * @param string $id The service id
+ * @param string $id The service id
*
* @return Boolean true if the service id is defined, false otherwise
*/
@@ -233,7 +236,7 @@ public function has($id)
/**
* Gets a service by id.
*
- * @param string $id The service id
+ * @param string $id The service id
*
* @return object The service
*/
Please sign in to comment.
Something went wrong with that request. Please try again.