Update repository base code to be cleaner and make use of PHP 7 features

app/Repositories/Eloquent/PackRepository.php

@@ -1,27 +1,20 @@
 <?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\Repositories\Eloquent;
 
 use Pterodactyl\Models\Pack;
-use Webmozart\Assert\Assert;
 use Pterodactyl\Repositories\Concerns\Searchable;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
-use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 
 class PackRepository extends EloquentRepository implements PackRepositoryInterface
 {
     use Searchable;
 
     /**
-     * {@inheritdoc}
+     * Return the model backing this repository.
+     *
+     * @return string
      */
     public function model()
     {
@@ -29,58 +22,32 @@ class PackRepository extends EloquentRepository implements PackRepositoryInterfa
     }
 
     /**
-     * {@inheritdoc}
+     * Return a pack with the associated server models attached to it.
+     *
+     * @param \Pterodactyl\Models\Pack $pack
+     * @param bool                     $refresh
+     * @return \Pterodactyl\Models\Pack
      */
-    public function getFileArchives($id, $collection = false)
+    public function loadServerData(Pack $pack, bool $refresh = false): Pack
     {
-        Assert::numeric($id, 'First argument passed to getFileArchives must be numeric, received %s.');
-        Assert::boolean($collection, 'Second argument passed to getFileArchives must be boolean, received %s.');
-
-        $pack = $this->getBuilder()->find($id, ['id', 'uuid']);
-        if (! $pack) {
-            throw new ModelNotFoundException;
+        if ($refresh) {
+            $pack->load(['servers.node', 'servers.user']);
         }
 
-        $storage = $this->app->make(FilesystemFactory::class);
-        $files = collect($storage->disk('default')->files('packs/' . $pack->uuid));
+        $pack->loadMissing(['servers.node', 'servers.user']);
 
-        $files = $files->map(function ($file) {
-            $path = storage_path('app/' . $file);
-
-            return (object) [
-                'name' => basename($file),
-                'hash' => sha1_file($path),
-                'size' => human_readable($path),
-            ];
-        });
-
-        return ($collection) ? $files : (object) $files->all();
+        return $pack;
     }
 
     /**
-     * {@inheritdoc}
+     * Return a paginated listing of packs with their associated egg and server count.
+     *
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
-    public function getWithServers($id)
+    public function paginateWithEggAndServerCount(): LengthAwarePaginator
     {
-        Assert::numeric($id, 'First argument passed to getWithServers must be numeric, received %s.');
-
-        $instance = $this->getBuilder()->with('servers.node', 'servers.user')->find($id, $this->getColumns());
-        if (! $instance) {
-            throw new ModelNotFoundException;
-        }
-
-        return $instance;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function paginateWithEggAndServerCount($paginate = 50)
-    {
-        Assert::integer($paginate, 'First argument passed to paginateWithOptionAndServerCount must be integer, received %s.');
-
         return $this->getBuilder()->with('egg')->withCount('servers')
-            ->search($this->searchTerm)
-            ->paginate($paginate, $this->getColumns());
+            ->setSearchTerm($this->getSearchTerm())
+            ->paginate(50, $this->getColumns());
     }
 }