Skip to content

Commit

Permalink
Merge branch '5.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell committed Aug 5, 2016
2 parents 1148e76 + 4dc53d7 commit a0726ab
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
4 changes: 2 additions & 2 deletions src/Illuminate/Foundation/Console/stubs/notification.stub
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class DummyClass extends Notification
public function message()
{
$this->line('The introduction to the notification.')
->action('Notification Action', 'https://laravel.com')
->line('Thank you for using our application!');
->action('Notification Action', 'https://laravel.com')
->line('Thank you for using our application!');
}
}
11 changes: 0 additions & 11 deletions src/Illuminate/Foundation/Console/stubs/policy.stub
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,6 @@ class DummyClass
//
}

/**
* Determine whether the user can update dummyPluralModelName.
*
* @param DummyRootNamespaceUser $user
* @return mixed
*/
public function updateAny(User $user)
{
//
}

/**
* Determine whether the user can update the dummyModelName.
*
Expand Down
13 changes: 12 additions & 1 deletion src/Illuminate/Notifications/HasDatabaseNotifications.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@ trait HasDatabaseNotifications
*/
public function notifications()
{
return $this->morphMany(DatabaseNotification::class, 'notifiable');
return $this->morphMany(DatabaseNotification::class, 'notifiable')
->orderBy('created_at', 'desc');
}

/**
* Get the entity's unread notifications.
*/
public function unreadNotifications()
{
return $this->morphMany(DatabaseNotification::class, 'notifiable')
->where('read', false)
->orderBy('created_at', 'desc');
}
}
5 changes: 0 additions & 5 deletions src/Illuminate/Notifications/Notification.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ class Notification
*/
public $notifiables;

/**
* The channels that the notification should be sent through.
*/
public $via = [];

/**
* The name of the application sending the notification.
*
Expand Down

0 comments on commit a0726ab

Please sign in to comment.