Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1294 from danielboendergaard/phpdoc-fix 

Fixed wrong return type in phpdoc
This commit is contained in:
Taylor Otwell 2012-10-06 12:39:23 -07:00
parent 7555fda589 54397e1bf2
commit 790a540620
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/asset.php
View File

@ -107,7 +107,7 @@ public function __construct($name)
* @param string $source * @param string $source
* @param array $dependencies * @param array $dependencies
* @param array $attributes * @param array $attributes
* @return void * @return Asset_Container
*/ */
public function add($name, $source, $dependencies = array(), $attributes = array()) public function add($name, $source, $dependencies = array(), $attributes = array())
{ {

2
laravel/database/eloquent/model.php
View File

@ -333,7 +333,7 @@ public function belongs_to($model, $foreign = null)
* @param string $table * @param string $table
* @param string $foreign * @param string $foreign
* @param string $other * @param string $other
* @return Relationship * @return Has_Many_And_Belongs_To
*/ */
public function has_many_and_belongs_to($model, $table = null, $foreign = null, $other = null) public function has_many_and_belongs_to($model, $table = null, $foreign = null, $other = null)
{ {