Merge branch 'develop' into feature/upgrade-laravel-to-5.6

Author: DaneEveritt

CHANGELOG.md

@@ -58,7 +58,7 @@ class AppSettingsCommand extends Command
      * @var string
      */
     protected $signature = 'p:environment:setup
-                            {--new-salt : Wether or not to generate a new salt for Hashids.}
+                            {--new-salt : Whether or not to generate a new salt for Hashids.}
                             {--author= : The email that services created on this instance should be linked to.}
                             {--url= : The URL that this Panel is running on.}
                             {--timezone= : The timezone to use for Panel times.}

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -59,6 +59,7 @@ public function __construct(ConfigRepository $config)
 
     /**
      * Handle command execution.
+     * @throws \Pterodactyl\Exceptions\PterodactylException
      */
     public function handle()
     {

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -84,7 +84,7 @@ public function handle()
             ['Host', $this->config->get("database.connections.{$driver}.host")],
             ['Port', $this->config->get("database.connections.{$driver}.port")],
             ['Database', $this->config->get("database.connections.{$driver}.database")],
-            ['Usernamne', $this->config->get("database.connections.{$driver}.username")],
+            ['Username', $this->config->get("database.connections.{$driver}.username")],
         ], 'compact');
 
         $this->output->title('Email Configuration');

app/Console/Commands/InfoCommand.php

@@ -31,8 +31,8 @@ class BulkPowerActionCommand extends Command
      */
     protected $signature = 'p:server:bulk-power
                             {action : The action to perform (start, stop, restart, kill)}
-                            {--servers= : A comma seperated list of servers.}
-                            {--nodes= : A comma seperated list of nodes.}';
+                            {--servers= : A comma separated list of servers.}
+                            {--nodes= : A comma separated list of nodes.}';
 
     /**
      * @var string

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -59,7 +59,7 @@ public function getUnassignedAllocationIds(int $node): array;
     public function getAssignedAllocationIds(int $server): array;
 
     /**
-     * Return a concated result set of node ips that already have at least one
+     * Return a concatenated result set of node ips that already have at least one
      * server assigned to that IP. This allows for filtering out sets for
      * dedicated allocation IPs.
      *

app/Contracts/Repository/AllocationRepositoryInterface.php

@@ -62,7 +62,7 @@ public function unsuspend(): ResponseInterface;
     public function delete(): ResponseInterface;
 
     /**
-     * Return detials on a specific server.
+     * Return details on a specific server.
      *
      * @return \Psr\Http\Message\ResponseInterface
      */

app/Contracts/Repository/Daemon/ServerRepositoryInterface.php

@@ -19,7 +19,7 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
     public function setConnection(string $connection);
 
     /**
-     * Return the connection to execute statements aganist.
+     * Return the connection to execute statements against.
      *
      * @return string
      */

app/Contracts/Repository/DatabaseRepositoryInterface.php

@@ -57,5 +57,5 @@ public function getWithExportAttributes(int $id): Egg;
      * @param int $service
      * @return bool
      */
-    public function isCopiableScript(int $copyFromId, int $service): bool;
+    public function isCopyableScript(int $copyFromId, int $service): bool;
 }

app/Contracts/Repository/EggRepositoryInterface.php

@@ -29,7 +29,7 @@ public function getModel();
     public function getBuilder();
 
     /**
-     * Returns the colummns to be selected or returned by the query.
+     * Returns the columns to be selected or returned by the query.
      *
      * @return mixed
      */
@@ -59,7 +59,7 @@ public function withoutFreshModel();
     public function withFreshModel();
 
     /**
-     * Set wether or not the repository should return a fresh model
+     * Set whether or not the repository should return a fresh model
      * when changes are committed.
      *
      * @param bool $fresh