Merge branch 'feature/fix-repositories' into develop

Author: DaneEveritt

app/Console/Commands/Server/RebuildServerCommand.php

@@ -77,7 +77,7 @@ public function handle()
             $json = array_merge($this->configurationStructureService->handle($server), ['rebuild' => true]);
 
             try {
-                $this->daemonRepository->setNode($server->node_id)->setAccessServer($server->uuid)->update($json);
+                $this->daemonRepository->setServer($server)->update($json);
             } catch (RequestException $exception) {
                 $this->output->error(trans('command/messages.server.rebuild_failed', [
                     'name' => $server->name,

app/Console/Commands/User/DeleteUserCommand.php

@@ -61,7 +61,7 @@ public function handle()
         $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
         Assert::notEmpty($search, 'Search term must be a non-null value, received %s.');
 
-        $results = $this->repository->search($search)->all();
+        $results = $this->repository->setSearchTerm($search)->all();
         if (count($results) < 1) {
             $this->error(trans('command/messages.user.no_users_found'));
             if ($this->input->isInteractive()) {

app/Console/Commands/User/DisableTwoFactorCommand.php

@@ -54,9 +54,9 @@ public function handle()
         }
 
         $email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));
-        $user = $this->repository->withColumns(['id', 'email'])->findFirstWhere([['email', '=', $email]]);
+        $user = $this->repository->setColumns(['id', 'email'])->findFirstWhere([['email', '=', $email]]);
 
-        $this->repository->withoutFresh()->update($user->id, [
+        $this->repository->withoutFreshModel()->update($user->id, [
             'use_totp' => false,
             'totp_secret' => null,
         ]);

app/Contracts/Repository/AllocationRepositoryInterface.php

@@ -1,14 +1,9 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Illuminate\Support\Collection;
+
 interface AllocationRepositoryInterface extends RepositoryInterface
 {
     /**
@@ -18,13 +13,13 @@ interface AllocationRepositoryInterface extends RepositoryInterface
      * @param array    $ids
      * @return int
      */
-    public function assignAllocationsToServer($server, array $ids);
+    public function assignAllocationsToServer(int $server = null, array $ids): int;
 
     /**
      * Return all of the allocations for a specific node.
      *
      * @param int $node
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Support\Collection
      */
-    public function getAllocationsForNode($node);
+    public function getAllocationsForNode(int $node): Collection;
 }

app/Contracts/Repository/Attributes/SearchableInterface.php

@@ -1,21 +1,38 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository\Attributes;
 
 interface SearchableInterface
 {
     /**
-     * Filter results by search term.
+     * Set the search term.
      *
-     * @param string $term
+     * @param string|null $term
      * @return $this
+     * @deprecated
      */
     public function search($term);
+
+    /**
+     * Set the search term to use when requesting all records from
+     * the model.
+     *
+     * @param string|null $term
+     * @return $this
+     */
+    public function setSearchTerm(string $term = null);
+
+    /**
+     * Determine if a valid search term is set on this repository.
+     *
+     * @return bool
+     */
+    public function hasSearchTerm(): bool;
+
+    /**
+     * Return the search term.
+     *
+     * @return string|null
+     */
+    public function getSearchTerm();
 }

app/Contracts/Repository/Daemon/BaseRepositoryInterface.php

@@ -1,68 +1,65 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository\Daemon;
 
+use GuzzleHttp\Client;
+use Pterodactyl\Models\Node;
+use Pterodactyl\Models\Server;
+
 interface BaseRepositoryInterface
 {
     /**
      * Set the node model to be used for this daemon connection.
      *
-     * @param int $id
+     * @param \Pterodactyl\Models\Node $node
      * @return $this
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function setNode($id);
+    public function setNode(Node $node);
 
     /**
      * Return the node model being used.
      *
-     * @return \Pterodactyl\Models\Node
+     * @return \Pterodactyl\Models\Node|null
      */
     public function getNode();
 
     /**
-     * Set the UUID for the server to be used in the X-Access-Server header for daemon requests.
+     * Set the Server model to use when requesting information from the Daemon.
      *
-     * @param null|string $server
+     * @param \Pterodactyl\Models\Server $server
      * @return $this
      */
-    public function setAccessServer($server = null);
+    public function setServer(Server $server);
 
     /**
-     * Return the UUID of the server being used in requests.
+     * Return the Server model.
      *
-     * @return string
+     * @return \Pterodactyl\Models\Server|null
      */
-    public function getAccessServer();
+    public function getServer();
 
     /**
      * Set the token to be used in the X-Access-Token header for requests to the daemon.
      *
-     * @param null|string $token
+     * @param string $token
      * @return $this
      */
-    public function setAccessToken($token = null);
+    public function setToken(string $token);
 
     /**
      * Return the access token being used for requests.
      *
-     * @return string
+     * @return string|null
      */
-    public function getAccessToken();
+    public function getToken();
 
     /**
      * Return an instance of the Guzzle HTTP Client to be used for requests.
      *
      * @param array $headers
      * @return \GuzzleHttp\Client
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getHttpClient(array $headers = []);
+    public function getHttpClient(array $headers = []): Client;
 }

app/Contracts/Repository/Daemon/CommandRepositoryInterface.php

@@ -1,14 +1,9 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository\Daemon;
 
+use Psr\Http\Message\ResponseInterface;
+
 interface CommandRepositoryInterface extends BaseRepositoryInterface
 {
     /**
@@ -17,5 +12,5 @@ interface CommandRepositoryInterface extends BaseRepositoryInterface
      * @param string $command
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function send($command);
+    public function send(string $command): ResponseInterface;
 }

app/Contracts/Repository/Daemon/ConfigurationRepositoryInterface.php

@@ -1,14 +1,9 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository\Daemon;
 
+use Psr\Http\Message\ResponseInterface;
+
 interface ConfigurationRepositoryInterface extends BaseRepositoryInterface
 {
     /**
@@ -17,5 +12,5 @@ interface ConfigurationRepositoryInterface extends BaseRepositoryInterface
      * @param array $overrides
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function update(array $overrides = []);
+    public function update(array $overrides = []): ResponseInterface;
 }

app/Contracts/Repository/Daemon/FileRepositoryInterface.php

@@ -1,35 +1,31 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository\Daemon;
 
+use stdClass;
+use Psr\Http\Message\ResponseInterface;
+
 interface FileRepositoryInterface extends BaseRepositoryInterface
 {
     /**
      * Return stat information for a given file.
      *
      * @param string $path
-     * @return object
+     * @return \stdClass
      *
      * @throws \GuzzleHttp\Exception\RequestException
      */
-    public function getFileStat($path);
+    public function getFileStat(string $path): stdClass;
 
     /**
      * Return the contents of a given file if it can be edited in the Panel.
      *
      * @param string $path
-     * @return object
+     * @return \stdClass
      *
      * @throws \GuzzleHttp\Exception\RequestException
      */
-    public function getContent($path);
+    public function getContent(string $path): stdClass;
 
     /**
      * Save new contents to a given file.
@@ -40,7 +36,7 @@ public function getContent($path);
      *
      * @throws \GuzzleHttp\Exception\RequestException
      */
-    public function putContent($path, $content);
+    public function putContent(string $path, string $content): ResponseInterface;
 
     /**
      * Return a directory listing for a given path.
@@ -50,5 +46,5 @@ public function putContent($path, $content);
      *
      * @throws \GuzzleHttp\Exception\RequestException
      */
-    public function getDirectory($path);
+    public function getDirectory(string $path): array;
 }

app/Contracts/Repository/Daemon/PowerRepositoryInterface.php

@@ -1,14 +1,9 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository\Daemon;
 
+use Psr\Http\Message\ResponseInterface;
+
 interface PowerRepositoryInterface extends BaseRepositoryInterface
 {
     const SIGNAL_START = 'start';
@@ -24,5 +19,5 @@ interface PowerRepositoryInterface extends BaseRepositoryInterface
      *
      * @throws \Pterodactyl\Exceptions\Repository\Daemon\InvalidPowerSignalException
      */
-    public function sendSignal($signal);
+    public function sendSignal(string $signal): ResponseInterface;
 }