From ae409751c15bfdc73102ab2cb568ee4b39cef6f6 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 12 Jun 2019 23:50:21 +0200
Subject: [PATCH] Apply fixes from StyleCI (#1793)

[ci skip] [skip ci]
---
 framework/core/src/Database/AbstractModel.php | 4 ++--
 framework/core/src/Discussion/Discussion.php  | 6 +++---
 framework/core/src/Foundation/Application.php | 2 +-
 framework/core/src/Group/Group.php            | 2 +-
 framework/core/src/Post/Post.php              | 6 +++---
 framework/core/src/User/User.php              | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/framework/core/src/Database/AbstractModel.php b/framework/core/src/Database/AbstractModel.php
index 87dd072df..1b44eba9d 100644
--- a/framework/core/src/Database/AbstractModel.php
+++ b/framework/core/src/Database/AbstractModel.php
@@ -55,13 +55,13 @@ abstract class AbstractModel extends Eloquent
     {
         parent::boot();
 
-        static::saved(function (AbstractModel $model) {
+        static::saved(function (self $model) {
             foreach ($model->releaseAfterSaveCallbacks() as $callback) {
                 $callback($model);
             }
         });
 
-        static::deleted(function (AbstractModel $model) {
+        static::deleted(function (self $model) {
             foreach ($model->releaseAfterDeleteCallbacks() as $callback) {
                 $callback($model);
             }
diff --git a/framework/core/src/Discussion/Discussion.php b/framework/core/src/Discussion/Discussion.php
index e73533024..e0d3d102f 100644
--- a/framework/core/src/Discussion/Discussion.php
+++ b/framework/core/src/Discussion/Discussion.php
@@ -98,7 +98,7 @@ class Discussion extends AbstractModel
     {
         parent::boot();
 
-        static::deleting(function (Discussion $discussion) {
+        static::deleting(function (self $discussion) {
             Notification::whereSubjectModel(Post::class)
                 ->whereIn('subject_id', function ($query) use ($discussion) {
                     $query->select('id')->from('posts')->where('discussion_id', $discussion->id);
@@ -106,13 +106,13 @@ class Discussion extends AbstractModel
                 ->delete();
         });
 
-        static::deleted(function (Discussion $discussion) {
+        static::deleted(function (self $discussion) {
             $discussion->raise(new Deleted($discussion));
 
             Notification::whereSubject($discussion)->delete();
         });
 
-        static::saving(function (Discussion $discussion) {
+        static::saving(function (self $discussion) {
             $event = new GetModelIsPrivate($discussion);
 
             $discussion->is_private = static::$dispatcher->until($event) === true;
diff --git a/framework/core/src/Foundation/Application.php b/framework/core/src/Foundation/Application.php
index ae550e4c1..d1b1c8616 100644
--- a/framework/core/src/Foundation/Application.php
+++ b/framework/core/src/Foundation/Application.php
@@ -712,7 +712,7 @@ class Application extends Container implements ApplicationContract
     public function registerCoreContainerAliases()
     {
         $aliases = [
-            'app'                  => [\Flarum\Foundation\Application::class, \Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class,  \Psr\Container\ContainerInterface::class],
+            'app'                  => [self::class, \Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class,  \Psr\Container\ContainerInterface::class],
             'blade.compiler'       => [\Illuminate\View\Compilers\BladeCompiler::class],
             'cache'                => [\Illuminate\Cache\CacheManager::class, \Illuminate\Contracts\Cache\Factory::class],
             'cache.store'          => [\Illuminate\Cache\Repository::class, \Illuminate\Contracts\Cache\Repository::class],
diff --git a/framework/core/src/Group/Group.php b/framework/core/src/Group/Group.php
index bed5fd7dc..a75cec7a5 100644
--- a/framework/core/src/Group/Group.php
+++ b/framework/core/src/Group/Group.php
@@ -62,7 +62,7 @@ class Group extends AbstractModel
     {
         parent::boot();
 
-        static::deleted(function (Group $group) {
+        static::deleted(function (self $group) {
             $group->raise(new Deleted($group));
         });
     }
diff --git a/framework/core/src/Post/Post.php b/framework/core/src/Post/Post.php
index 1ffff2e36..77a274c8b 100644
--- a/framework/core/src/Post/Post.php
+++ b/framework/core/src/Post/Post.php
@@ -92,19 +92,19 @@ class Post extends AbstractModel
         // When a post is created, set its type according to the value of the
         // subclass. Also give it an auto-incrementing number within the
         // discussion.
-        static::creating(function (Post $post) {
+        static::creating(function (self $post) {
             $post->type = $post::$type;
             $post->number = ++$post->discussion->post_number_index;
             $post->discussion->save();
         });
 
-        static::saving(function (Post $post) {
+        static::saving(function (self $post) {
             $event = new GetModelIsPrivate($post);
 
             $post->is_private = static::$dispatcher->until($event) === true;
         });
 
-        static::deleted(function (Post $post) {
+        static::deleted(function (self $post) {
             $post->raise(new Deleted($post));
 
             Notification::whereSubject($post)->delete();
diff --git a/framework/core/src/User/User.php b/framework/core/src/User/User.php
index 45c248059..ce6b8de7d 100644
--- a/framework/core/src/User/User.php
+++ b/framework/core/src/User/User.php
@@ -115,13 +115,13 @@ class User extends AbstractModel
         parent::boot();
 
         // Don't allow the root admin to be deleted.
-        static::deleting(function (User $user) {
+        static::deleting(function (self $user) {
             if ($user->id == 1) {
                 throw new DomainException('Cannot delete the root admin');
             }
         });
 
-        static::deleted(function (User $user) {
+        static::deleted(function (self $user) {
             $user->raise(new Deleted($user));
 
             Notification::whereSubject($user)->delete();