Merge branch 'develop' into fix/2071

Author: matthewpi

.editorconfig

@@ -8,5 +8,8 @@ indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
 
+[.*yml]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false

.env.travis .env.ci.env.travis renamed to .env.ci

@@ -2,13 +2,13 @@ APP_ENV=testing
 APP_DEBUG=true
 APP_KEY=SomeRandomString3232RandomString
 APP_THEME=pterodactyl
-APP_TIMEZONE=UTC
+APP_TIMEZONE=America/Los_Angeles
 APP_URL=http://localhost/
 
 TESTING_DB_HOST=127.0.0.1
-TESTING_DB_DATABASE=travis
+TESTING_DB_DATABASE=panel_test
 TESTING_DB_USERNAME=root
-TESTING_DB_PASSWORD=""
+TESTING_DB_PASSWORD=
 
 CACHE_DRIVER=array
 SESSION_DRIVER=array

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+#github: [DaneEveritt]
+custom: ["https://paypal.me/PterodactylSoftware"]

.github/workflows/tests.yml

@@ -0,0 +1,64 @@
+name: tests
+on:
+  push:
+  pull_request:
+jobs:
+  integration_tests:
+    if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: panel_test
+        ports:
+          - 3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.3, 7.4]
+    name: PHP ${{ matrix.php }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cache-${{ matrix.php }}-
+      - name: setup
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: cli, openssl, gd, mysql, pdo, mbstring, tokenizer, bcmath, xml, curl, zip
+          tools: composer:v1
+          coverage: none
+      - name: configure
+        run: cp .env.ci .env
+      - name: install dependencies
+        run: composer install --prefer-dist --no-interaction --no-progress
+      - name: run cs-fixer
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff
+        continue-on-error: true
+      - name: execute unit tests
+        run: vendor/bin/phpunit --bootstrap bootstrap/app.php tests/Unit
+        if: ${{ always() }}
+        env:
+          DB_CONNECTION: testing
+          TESTING_DB_HOST: UNIT_NO_DB
+      - name: execute integration tests
+        run: vendor/bin/phpunit tests/Integration
+        if: ${{ always() }}
+        env:
+          TESTING_DB_PORT: ${{ job.services.mysql.ports[3306] }}
+          TESTING_DB_USERNAME: root

.gitignore

@@ -32,3 +32,4 @@ coverage.xml
 resources/lang/locales.js
 resources/assets/pterodactyl/scripts/helpers/ziggy.js
 resources/assets/scripts/helpers/ziggy.js
+.phpunit.result.cache

app/Console/Commands/Migration/CleanOrphanedApiKeysCommand.php

@@ -38,7 +38,7 @@ public function __construct(ApiKeyRepositoryInterface $repository)
     /**
      * Delete all orphaned API keys from the database when upgrading from 0.6 to 0.7.
      *
-     * @return null|void
+     * @return void|null
      */
     public function handle()
     {

app/Contracts/Repository/SessionRepositoryInterface.php

@@ -19,7 +19,7 @@ public function getUserSessions(int $user): Collection;
      *
      * @param int $user
      * @param string $session
-     * @return null|int
+     * @return int|null
      */
     public function deleteUserSession(int $user, string $session);
 }

app/Contracts/Repository/TaskRepositoryInterface.php

@@ -21,7 +21,7 @@ public function getTaskForJobProcess(int $id): Task;
      *
      * @param int $schedule
      * @param int $index
-     * @return null|\Pterodactyl\Models\Task
+     * @return \Pterodactyl\Models\Task|null
      */
     public function getNextTask(int $schedule, int $index);
 }

app/Exceptions/Handler.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Exceptions;
 
 use Exception;
+use Throwable;
 use PDOException;
 use Psr\Log\LoggerInterface;
 use Swift_TransportException;
@@ -72,12 +73,12 @@ class Handler extends ExceptionHandler
      * services such as AWS Cloudwatch or other monitoring you can replace the
      * contents of this function with a call to the parent reporter.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @return mixed
      *
-     * @throws \Exception
+     * @throws \Throwable
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         if (! config('app.exceptions.report_all', false) && $this->shouldntReport($exception)) {
             return null;
@@ -103,7 +104,7 @@ public function report(Exception $exception)
         return $logger->error($exception);
     }
 
-    private function generateCleanedExceptionStack(Exception $exception)
+    private function generateCleanedExceptionStack(Throwable $exception)
     {
         $cleanedStack = '';
         foreach ($exception->getTrace() as $index => $item) {
@@ -133,12 +134,12 @@ class_basename($exception),
      * Render an exception into an HTTP response.
      *
      * @param \Illuminate\Http\Request $request
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @return \Symfony\Component\HttpFoundation\Response
      *
-     * @throws \Exception
+     * @throws \Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         $connections = Container::getInstance()->make(Connection::class);
 
@@ -200,11 +201,11 @@ public function invalidJson($request, ValidationException $exception)
     /**
      * Return the exception as a JSONAPI representation for use on API requests.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @param array $override
      * @return array
      */
-    public static function convertToArray(Exception $exception, array $override = []): array
+    public static function convertToArray(Throwable $exception, array $override = []): array
     {
         $error = [
             'code' => class_basename($exception),
@@ -259,10 +260,10 @@ protected function unauthenticated($request, AuthenticationException $exception)
      * Converts an exception into an array to render in the response. Overrides
      * Laravel's built-in converter to output as a JSONAPI spec compliant object.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @return array
      */
-    protected function convertExceptionToArray(Exception $exception)
+    protected function convertExceptionToArray(Throwable $exception)
     {
         return self::convertToArray($exception);
     }

app/Exceptions/Service/ServiceLimitExceededException.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service;
+
+use Throwable;
+use Pterodactyl\Exceptions\DisplayException;
+
+class ServiceLimitExceededException extends DisplayException
+{
+    /**
+     * Exception thrown when something goes over a defined limit, such as allocated
+     * ports, tasks, databases, etc.
+     *
+     * @param string $message
+     * @param \Throwable|null $previous
+     */
+    public function __construct(string $message, Throwable $previous = null)
+    {
+        parent::__construct($message, $previous, self::LEVEL_WARNING);
+    }
+}