From 23736fcfdac8ac5194babeb09d79f96ee6bf893d Mon Sep 17 00:00:00 2001
From: luceos <daniel+github@klabbers.email>
Date: Tue, 24 Mar 2020 10:02:08 +0000
Subject: [PATCH] Apply fixes from StyleCI

[ci skip] [skip ci]
---
 src/Extend/NotificationChannel.php                  |  7 +++++++
 src/Extend/UserPreferences.php                      |  7 +++++++
 .../DeprecatedUserNotificationPreferences.php       |  1 -
 src/User/Concerns/UserPreferences.php               |  9 ++++++++-
 src/User/User.php                                   |  1 -
 .../extenders/NotificationChannelTest.php           | 13 ++++++++-----
 tests/integration/extenders/UserPreferencesTest.php | 10 ++++++++--
 7 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/Extend/NotificationChannel.php b/src/Extend/NotificationChannel.php
index 332d6ab19..39aca61e0 100644
--- a/src/Extend/NotificationChannel.php
+++ b/src/Extend/NotificationChannel.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Extend;
 
 use Flarum\Extension\Extension;
diff --git a/src/Extend/UserPreferences.php b/src/Extend/UserPreferences.php
index ec0673b0d..c2efda952 100644
--- a/src/Extend/UserPreferences.php
+++ b/src/Extend/UserPreferences.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Extend;
 
 use Flarum\Extension\Extension;
diff --git a/src/User/Concerns/DeprecatedUserNotificationPreferences.php b/src/User/Concerns/DeprecatedUserNotificationPreferences.php
index cdc1af0cb..e9ac0ab56 100644
--- a/src/User/Concerns/DeprecatedUserNotificationPreferences.php
+++ b/src/User/Concerns/DeprecatedUserNotificationPreferences.php
@@ -11,7 +11,6 @@ namespace Flarum\User\Concerns;
 
 trait DeprecatedUserNotificationPreferences
 {
-
     /**
      * Encode an array of preferences for storage in the database.
      *
diff --git a/src/User/Concerns/UserPreferences.php b/src/User/Concerns/UserPreferences.php
index bf968c5a2..0da61d985 100644
--- a/src/User/Concerns/UserPreferences.php
+++ b/src/User/Concerns/UserPreferences.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\User\Concerns;
 
 use Illuminate\Support\Arr;
@@ -16,6 +23,7 @@ trait UserPreferences
      * @var array
      */
     protected static $preferences = [];
+
     /**
      * Get the values of all registered preferences for this user, by
      * transforming their stored preferences and merging them with the defaults.
@@ -76,5 +84,4 @@ trait UserPreferences
     {
         static::$preferences[$key] = compact('transformer', 'default');
     }
-
 }
diff --git a/src/User/User.php b/src/User/User.php
index ed8e97778..3b699056e 100644
--- a/src/User/User.php
+++ b/src/User/User.php
@@ -35,7 +35,6 @@ use Flarum\User\Event\Registered;
 use Flarum\User\Event\Renamed;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Contracts\Session\Session;
-use Illuminate\Support\Arr;
 
 /**
  * @property int $id
diff --git a/tests/integration/extenders/NotificationChannelTest.php b/tests/integration/extenders/NotificationChannelTest.php
index 291212d76..9a4581bdc 100644
--- a/tests/integration/extenders/NotificationChannelTest.php
+++ b/tests/integration/extenders/NotificationChannelTest.php
@@ -1,26 +1,30 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Tests\integration\extenders;
 
 use Flarum\Extend\NotificationChannel;
-use Flarum\Extend\UserPreferences;
 use Flarum\Tests\integration\RetrievesAuthorizedUsers;
 use Flarum\Tests\integration\TestCase;
 use Flarum\User\User;
-use Illuminate\Support\Arr;
 
 class NotificationChannelTest extends TestCase
 {
     use RetrievesAuthorizedUsers;
 
-
     public function setUp()
     {
         parent::setUp();
 
         $this->prepareDatabase([
             'users' => [
-               $this->normalUser()
+                $this->normalUser()
             ]
         ]);
     }
@@ -39,6 +43,5 @@ class NotificationChannelTest extends TestCase
 
         /** @var User $user */
         $user = User::find(2);
-
     }
 }
diff --git a/tests/integration/extenders/UserPreferencesTest.php b/tests/integration/extenders/UserPreferencesTest.php
index 3c84dc329..da181ff23 100644
--- a/tests/integration/extenders/UserPreferencesTest.php
+++ b/tests/integration/extenders/UserPreferencesTest.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Tests\integration\extenders;
 
 use Flarum\Extend\UserPreferences;
@@ -12,14 +19,13 @@ class UserPreferencesTest extends TestCase
 {
     use RetrievesAuthorizedUsers;
 
-
     public function setUp()
     {
         parent::setUp();
 
         $this->prepareDatabase([
             'users'            => [
-               $this->normalUser()
+                $this->normalUser()
             ]
         ]);
     }