Merge pull request laravel#3964 from GrahamCampbell/4.1-docblocks

taylorotwell · taylorotwell · commit fdd7a1edb574 · 2014-03-22T22:29:15.000-05:00
Fixed Docblocks
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -614,6 +614,7 @@ protected function resolveClass(ReflectionParameter $parameter)
 	 * @param  array  $dependencies
 	 * @param  array  $parameters
 	 * @param  array
+	 * @return array
 	 */
 	protected function keyParametersByArgument(array $dependencies, array $parameters)
 	{
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -2307,6 +2307,8 @@ protected function getAttributeFromArray($key)
 	 * @param  string  $key
 	 * @param  string  $camelKey
 	 * @return mixed
+	 *
+	 * @throws \LogicException
 	 */
 	protected function getRelationshipFromMethod($key, $camelKey)
 	{
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -514,6 +514,8 @@ public static function createFromBase(SymfonyRequest $request)
 	 * Get the session associated with the request.
 	 *
 	 * @return \Illuminate\Session\Store
+	 *
+	 * @throws \RuntimeException
 	 */
 	public function session()
 	{
diff --git a/src/Illuminate/Remote/Connection.php b/src/Illuminate/Remote/Connection.php
@@ -232,6 +232,8 @@ public function status()
 	 * Get the gateway implementation.
 	 *
 	 * @return \Illuminate\Remote\GatewayInterface
+	 *
+	 * @throws \RuntimeException
 	 */
 	public function getGateway()
 	{
diff --git a/src/Illuminate/Routing/Controller.php b/src/Illuminate/Routing/Controller.php
@@ -260,6 +260,8 @@ public function missingMethod($parameters = array())
 	 * @param  string  $method
 	 * @param  array   $parameters
 	 * @return mixed
+	 *
+	 * @throws \BadMethodCallException
 	 */
 	public function __call($method, $parameters)
 	{
diff --git a/src/Illuminate/Support/helpers.php b/src/Illuminate/Support/helpers.php
@@ -557,6 +557,8 @@ function csrf_token()
 	 * @param  string  $key
 	 * @param  mixed   $default
 	 * @return mixed
+	 *
+	 * @throws \InvalidArgumentException
 	 */
 	function data_get($target, $key, $default = null)
 	{

Original file line number	Diff line number	Diff line change
`@@ -614,6 +614,7 @@ protected function resolveClass(ReflectionParameter $parameter)`
`614`	`614`	`* @param array $dependencies`
`615`	`615`	`* @param array $parameters`
`616`	`616`	`* @param array`
	`617`	`+ * @return array`
`617`	`618`	`*/`
`618`	`619`	`protected function keyParametersByArgument(array $dependencies, array $parameters)`
`619`	`620`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2307,6 +2307,8 @@ protected function getAttributeFromArray($key)`
`2307`	`2307`	`* @param string $key`
`2308`	`2308`	`* @param string $camelKey`
`2309`	`2309`	`* @return mixed`
	`2310`	`+ *`
	`2311`	`+ * @throws \LogicException`
`2310`	`2312`	`*/`
`2311`	`2313`	`protected function getRelationshipFromMethod($key, $camelKey)`
`2312`	`2314`	`{`
Original file line number	Diff line number	Diff line change
`@@ -514,6 +514,8 @@ public static function createFromBase(SymfonyRequest $request)`
`514`	`514`	`* Get the session associated with the request.`
`515`	`515`	`*`
`516`	`516`	`* @return \Illuminate\Session\Store`
	`517`	`+ *`
	`518`	`+ * @throws \RuntimeException`
`517`	`519`	`*/`
`518`	`520`	`public function session()`
`519`	`521`	`{`
Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,8 @@ public function status()`
`232`	`232`	`* Get the gateway implementation.`
`233`	`233`	`*`
`234`	`234`	`* @return \Illuminate\Remote\GatewayInterface`
	`235`	`+ *`
	`236`	`+ * @throws \RuntimeException`
`235`	`237`	`*/`
`236`	`238`	`public function getGateway()`
`237`	`239`	`{`
Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,8 @@ public function missingMethod($parameters = array())`
`260`	`260`	`* @param string $method`
`261`	`261`	`* @param array $parameters`
`262`	`262`	`* @return mixed`
	`263`	`+ *`
	`264`	`+ * @throws \BadMethodCallException`
`263`	`265`	`*/`
`264`	`266`	`public function __call($method, $parameters)`
`265`	`267`	`{`
Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,8 @@ function csrf_token()`
`557`	`557`	`* @param string $key`
`558`	`558`	`* @param mixed $default`
`559`	`559`	`* @return mixed`
	`560`	`+ *`
	`561`	`+ * @throws \InvalidArgumentException`
`560`	`562`	`*/`
`561`	`563`	`function data_get($target, $key, $default = null)`
`562`	`564`	`{`