Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
UserAdminV2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
庄欣
UserAdminV2
Commits
790a5406
Commit
790a5406
authored
Oct 06, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1294 from danielboendergaard/phpdoc-fix
Fixed wrong return type in phpdoc
parents
7555fda5
54397e1b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
laravel/asset.php
+1
-1
laravel/database/eloquent/model.php
+1
-1
No files found.
laravel/asset.php
View file @
790a5406
...
@@ -107,7 +107,7 @@ class Asset_Container {
...
@@ -107,7 +107,7 @@ class Asset_Container {
* @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
())
{
{
...
...
laravel/database/eloquent/model.php
View file @
790a5406
...
@@ -333,7 +333,7 @@ abstract class Model {
...
@@ -333,7 +333,7 @@ abstract class Model {
* @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
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment