Get rid of Repository interfaces

src/Core/Users/Commands/ConfirmEmailHandler.php

@@ -1,6 +1,6 @@
 <?php namespace Flarum\Core\Users\Commands;
 
-use Flarum\Core\Users\UserRepositoryInterface;
+use Flarum\Core\Users\UserRepository;
 use Flarum\Core\Users\Events\UserWillBeSaved;
 use Flarum\Core\Support\DispatchesEvents;
 use Flarum\Core\Exceptions\InvalidConfirmationTokenException;
@@ -11,14 +11,14 @@ class ConfirmEmailHandler
     use DispatchesEvents;
 
     /**
-     * @var UserRepositoryInterface
+     * @var UserRepository
      */
     protected $users;
 
     /**
-     * @param UserRepositoryInterface $users
+     * @param UserRepository $users
      */
-    public function __construct(UserRepositoryInterface $users)
+    public function __construct(UserRepository $users)
     {
         $this->users = $users;
     }

src/Core/Users/Commands/DeleteAvatarHandler.php

@@ -1,7 +1,7 @@
 <?php namespace Flarum\Core\Users\Commands;
 
 use Flarum\Core\Users\Events\AvatarWillBeDeleted;
-use Flarum\Core\Users\UserRepositoryInterface;
+use Flarum\Core\Users\UserRepository;
 use Flarum\Core\Support\DispatchesEvents;
 use League\Flysystem\FilesystemInterface;
 
@@ -10,7 +10,7 @@ class DeleteAvatarHandler
     use DispatchesEvents;
 
     /**
-     * @var UserRepositoryInterface
+     * @var UserRepository
      */
     protected $users;
 
@@ -20,10 +20,10 @@ class DeleteAvatarHandler
     protected $uploadDir;
 
     /**
-     * @param UserRepositoryInterface $users
+     * @param UserRepository $users
      * @param FilesystemInterface $uploadDir
      */
-    public function __construct(UserRepositoryInterface $users, FilesystemInterface $uploadDir)
+    public function __construct(UserRepository $users, FilesystemInterface $uploadDir)
     {
         $this->users = $users;
         $this->uploadDir = $uploadDir;

src/Core/Users/Commands/DeleteUserHandler.php

@@ -1,7 +1,7 @@
 <?php namespace Flarum\Core\Users\Commands;
 
 use Flarum\Core\Users\User;
-use Flarum\Core\Users\UserRepositoryInterface;
+use Flarum\Core\Users\UserRepository;
 use Flarum\Core\Users\Events\UserWillBeDeleted;
 use Flarum\Core\Support\DispatchesEvents;
 
@@ -10,14 +10,14 @@ class DeleteUserHandler
     use DispatchesEvents;
 
     /**
-     * @var UserRepositoryInterface
+     * @var UserRepository
      */
     protected $users;
 
     /**
-     * @param UserRepositoryInterface $users
+     * @param UserRepository $users
      */
-    public function __construct(UserRepositoryInterface $users)
+    public function __construct(UserRepository $users)
     {
         $this->users = $users;
     }

src/Core/Users/Commands/EditUserHandler.php

@@ -1,7 +1,7 @@
 <?php namespace Flarum\Core\Users\Commands;
 
 use Flarum\Core\Users\User;
-use Flarum\Core\Users\UserRepositoryInterface;
+use Flarum\Core\Users\UserRepository;
 use Flarum\Core\Users\Events\UserWillBeSaved;
 use Flarum\Core\Support\DispatchesEvents;
 
@@ -10,14 +10,14 @@ class EditUserHandler
     use DispatchesEvents;
 
     /**
-     * @var UserRepositoryInterface
+     * @var UserRepository
      */
     protected $users;
 
     /**
-     * @param UserRepositoryInterface $users
+     * @param UserRepository $users
      */
-    public function __construct(UserRepositoryInterface $users)
+    public function __construct(UserRepository $users)
     {
         $this->users = $users;
     }

src/Core/Users/Commands/RequestPasswordResetHandler.php

@@ -1,7 +1,7 @@
 <?php namespace Flarum\Core\Users\Commands;
 
 use Flarum\Core\Users\PasswordToken;
-use Flarum\Core\Users\UserRepositoryInterface;
+use Flarum\Core\Users\UserRepository;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Mail\Message;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -11,7 +11,7 @@ use Flarum\Http\UrlGeneratorInterface;
 class RequestPasswordResetHandler
 {
     /**
-     * @var UserRepositoryInterface
+     * @var UserRepository
      */
     protected $users;
 
@@ -21,11 +21,11 @@ class RequestPasswordResetHandler
     protected $mailer;
 
     /**
-     * @param UserRepositoryInterface $users
+     * @param UserRepository $users
      * @param Mailer $mailer
      * @param UrlGeneratorInterface $url
      */
-    public function __construct(UserRepositoryInterface $users, Mailer $mailer, UrlGeneratorInterface $url)
+    public function __construct(UserRepository $users, Mailer $mailer, UrlGeneratorInterface $url)
     {
         $this->users = $users;
         $this->mailer = $mailer;

src/Core/Users/Commands/UploadAvatarHandler.php

@@ -1,7 +1,7 @@
 <?php namespace Flarum\Core\Users\Commands;
 
 use Flarum\Core\Users\Events\AvatarWillBeSaved;
-use Flarum\Core\Users\UserRepositoryInterface;
+use Flarum\Core\Users\UserRepository;
 use Flarum\Core\Support\DispatchesEvents;
 use Illuminate\Support\Str;
 use League\Flysystem\Adapter\Local;
@@ -15,7 +15,7 @@ class UploadAvatarHandler
     use DispatchesEvents;
 
     /**
-     * @var UserRepositoryInterface
+     * @var UserRepository
      */
     protected $users;
 
@@ -25,10 +25,10 @@ class UploadAvatarHandler
     protected $uploadDir;
 
     /**
-     * @param UserRepositoryInterface $users
+     * @param UserRepository $users
      * @param FilesystemInterface $uploadDir
      */
-    public function __construct(UserRepositoryInterface $users, FilesystemInterface $uploadDir)
+    public function __construct(UserRepository $users, FilesystemInterface $uploadDir)
     {
         $this->users = $users;
         $this->uploadDir = $uploadDir;

src/Core/Users/Search/Gambits/FulltextGambit.php

@@ -1,20 +1,20 @@
 <?php namespace Flarum\Core\Users\Search\Gambits;
 
-use Flarum\Core\Users\UserRepositoryInterface;
+use Flarum\Core\Users\UserRepository;
 use Flarum\Core\Search\Search;
 use Flarum\Core\Search\GambitInterface;
 
 class FulltextGambit implements GambitInterface
 {
     /**
-     * @var UserRepositoryInterface
+     * @var UserRepository
      */
     protected $users;
 
     /**
-     * @param UserRepositoryInterface $users
+     * @param UserRepository $users
      */
-    public function __construct(UserRepositoryInterface $users)
+    public function __construct(UserRepository $users)
     {
         $this->users = $users;
     }

src/Core/Users/Search/UserSearcher.php

@@ -4,7 +4,7 @@ use Flarum\Core\Search\AppliesParametersToSearch;
 use Flarum\Core\Search\GambitManager;
 use Flarum\Core\Search\SearchCriteria;
 use Flarum\Core\Search\SearchResults;
-use Flarum\Core\Users\UserRepositoryInterface;
+use Flarum\Core\Users\UserRepository;
 use Flarum\Core\Users\Events\UserSearchWillBePerformed;
 
 /**
@@ -21,15 +21,15 @@ class UserSearcher
     protected $gambits;
 
     /**
-     * @var UserRepositoryInterface
+     * @var UserRepository
      */
     protected $users;
 
     /**
      * @param GambitManager $gambits
-     * @param UserRepositoryInterface $users
+     * @param UserRepository $users
      */
-    public function __construct(GambitManager $gambits, UserRepositoryInterface $users)
+    public function __construct(GambitManager $gambits, UserRepository $users)
     {
         $this->gambits = $gambits;
         $this->users = $users;

src/Core/Users/UserRepository.php

@@ -2,10 +2,12 @@
 
 use Illuminate\Database\Eloquent\Builder;
 
-class EloquentUserRepository implements UserRepositoryInterface
+class UserRepository
 {
     /**
-     * {@inheritdoc}
+     * Get a new query builder for the users table.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function query()
     {
@@ -13,7 +15,14 @@ class EloquentUserRepository implements UserRepositoryInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Find a user by ID, optionally making sure it is visible to a certain
+     * user, or throw an exception.
+     *
+     * @param int $id
+     * @param User $actor
+     * @return User
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
      */
     public function findOrFail($id, User $actor = null)
     {
@@ -23,7 +32,10 @@ class EloquentUserRepository implements UserRepositoryInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Find a user by an identification (username or email).
+     *
+     * @param string $identification
+     * @return User|null
      */
     public function findByIdentification($identification)
     {
@@ -33,7 +45,10 @@ class EloquentUserRepository implements UserRepositoryInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Find a user by email.
+     *
+     * @param string $email
+     * @return User|null
      */
     public function findByEmail($email)
     {
@@ -41,7 +56,11 @@ class EloquentUserRepository implements UserRepositoryInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Get the ID of a user with the given username.
+     *
+     * @param string $username
+     * @param User|null $actor
+     * @return integer|null
      */
     public function getIdForUsername($username, User $actor = null)
     {
@@ -51,7 +70,12 @@ class EloquentUserRepository implements UserRepositoryInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Find users by matching a string of words against their username,
+     * optionally making sure they are visible to a certain user.
+     *
+     * @param string $string
+     * @param User|null $actor
+     * @return array
      */
     public function getIdsForUsername($string, User $actor = null)
     {

src/Core/Users/UserRepositoryInterface.php

@@ -1,58 +0,0 @@
-<?php namespace Flarum\Core\Users;
-
-interface UserRepositoryInterface
-{
-    /**
-     * Get a new query builder for the users table.
-     *
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    public function query();
-
-    /**
-     * Find a user by ID, optionally making sure it is visible to a certain
-     * user, or throw an exception.
-     *
-     * @param int $id
-     * @param User $actor
-     * @return User
-     *
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public function findOrFail($id, User $actor = null);
-
-    /**
-     * Find a user by an identification (username or email).
-     *
-     * @param string $identification
-     * @return User|null
-     */
-    public function findByIdentification($identification);
-
-    /**
-     * Find a user by email.
-     *
-     * @param string $email
-     * @return User|null
-     */
-    public function findByEmail($email);
-
-    /**
-     * Get the ID of a user with the given username.
-     *
-     * @param string $username
-     * @param User|null $actor
-     * @return integer|null
-     */
-    public function getIdForUsername($username, User $actor = null);
-
-    /**
-     * Find users by matching a string of words against their username,
-     * optionally making sure they are visible to a certain user.
-     *
-     * @param string $string
-     * @param User|null $actor
-     * @return array
-     */
-    public function getIdsForUsername($string, User $actor = null);
-}

src/Core/Users/UsersServiceProvider.php

@@ -41,11 +41,6 @@ class UsersServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->bind(
-            'Flarum\Core\Users\UserRepositoryInterface',
-            'Flarum\Core\Users\EloquentUserRepository'
-        );
-
         $this->registerAvatarsFilesystem();
         $this->registerGambits();
     }