bump version for release

.editorconfig

@@ -1,17 +1,15 @@
 root = true
 
 [*]
+end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 4
-tab_width = 4
-end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
+
+[.*yml]
+indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
-
-[*.{md,nix,yml,yaml}]
-indent_size = 2
-tab_width = 2

.env.ci

@@ -0,0 +1,19 @@
+APP_ENV=testing
+APP_DEBUG=true
+APP_KEY=SomeRandomString3232RandomString
+APP_THEME=pterodactyl
+APP_TIMEZONE=America/Los_Angeles
+APP_URL=http://localhost/
+
+DB_HOST=127.0.0.1
+DB_DATABASE=panel_test
+DB_USERNAME=root
+DB_PASSWORD=
+
+CACHE_DRIVER=array
+SESSION_DRIVER=array
+MAIL_DRIVER=array
+QUEUE_DRIVER=sync
+
+HASHIDS_SALT=test123
+APP_ENVIRONMENT_ONLY=true

.env.example

@@ -1,43 +1,41 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_KEY=
-APP_TIMEZONE=UTC
+APP_THEME=pterodactyl
-APP_URL=http://panel.example.com
+APP_TIMEZONE=America/New_York
-APP_LOCALE=en
+APP_CLEAR_TASKLOG=720
+APP_DELETE_MINUTES=10
 APP_ENVIRONMENT_ONLY=true
-
 LOG_CHANNEL=daily
-LOG_DEPRECATIONS_CHANNEL=null
+APP_LOCALE=en
-LOG_LEVEL=debug
+APP_URL=http://panel.example.com
 
-DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=panel
 DB_USERNAME=pterodactyl
 DB_PASSWORD=
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-CACHE_DRIVER=file
-QUEUE_CONNECTION=redis
 SESSION_DRIVER=file
+CACHE_DRIVER=file
 
 HASHIDS_SALT=
 HASHIDS_LENGTH=8
 
-MAIL_MAILER=smtp
+MAIL_DRIVER=smtp
 MAIL_HOST=smtp.example.com
 MAIL_PORT=25
 MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=tls
-MAIL_FROM_ADDRESS=no-reply@example.com
+MAIL_FROM=no-reply@example.com
-MAIL_FROM_NAME="Pterodactyl Panel"
+MAILGUN_ENDPOINT=api.mailgun.net
 # You should set this to your domain to prevent it defaulting to 'localhost', causing
 # mail servers such as Gmail to reject your mail.
 #
 # @see: https://github.com/pterodactyl/panel/pull/3110
-# MAIL_EHLO_DOMAIN=panel.example.com
+# SERVER_NAME=panel.example.com
+
+QUEUE_HIGH=high
+QUEUE_STANDARD=standard
+QUEUE_LOW=low

.eslintignore

@@ -1,6 +1,4 @@
 public
 node_modules
 resources/views
-babel.config.js
-tailwind.config.js
 webpack.config.js

.eslintrc.js

@@ -1,3 +1,9 @@
+const prettier = {
+    singleQuote: true,
+    jsxSingleQuote: true,
+    printWidth: 120,
+};
+
 /** @type {import('eslint').Linter.Config} */
 module.exports = {
     parser: '@typescript-eslint/parser',
@@ -23,21 +29,25 @@ module.exports = {
         browser: true,
         es6: true,
     },
-    plugins: ['react', 'react-hooks', 'prettier', '@typescript-eslint'],
+    plugins: [
+        'react',
+        'react-hooks',
+        'prettier',
+        '@typescript-eslint',
+    ],
     extends: [
         // 'standard',
         'eslint:recommended',
         'plugin:react/recommended',
-        'plugin:react/jsx-runtime',
         'plugin:@typescript-eslint/recommended',
+        'plugin:jest-dom/recommended',
     ],
     rules: {
         eqeqeq: 'error',
-        'prettier/prettier': ['error', {}, { usePrettierrc: true }],
+        'prettier/prettier': ['error', prettier],
         // TypeScript can infer this significantly better than eslint ever can.
         'react/prop-types': 0,
         'react/display-name': 0,
-        'react/no-unknown-property': ['error', {ignore: ['css']}],
         '@typescript-eslint/no-explicit-any': 0,
         '@typescript-eslint/no-non-null-assertion': 0,
         // This setup is required to avoid a spam of errors when running eslint about React being
@@ -48,5 +58,5 @@ module.exports = {
         '@typescript-eslint/no-use-before-define': 'warn',
         '@typescript-eslint/no-unused-vars': ['warn', {argsIgnorePattern: '^_', varsIgnorePattern: '^_'}],
         '@typescript-eslint/ban-ts-comment': ['error', {'ts-expect-error': 'allow-with-description'}],
-    },
+    }
 };

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -68,8 +68,8 @@ body:
       Run the following command to collect logs on your system.
       
       Wings: `sudo wings diagnostics`
-      Panel: `tail -n 150 /var/www/pterodactyl/storage/logs/laravel-$(date +%F).log | nc pteropaste.com 99`
+      Panel: `tail -n 100 /var/www/pterodactyl/storage/logs/laravel-$(date +%F).log | nc bin.ptdl.co 99`
-    placeholder: "https://pteropaste.com/a1h6z"
+    placeholder: "https://bin.ptdl.co/a1h6z"
     render: bash
   validations:
     required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Installation Help
     url: https://discord.gg/pterodactyl

.github/docker/Caddyfile

@@ -1,21 +0,0 @@
-:8080 {
-	root * /var/www/pterodactyl/public/
-	file_server
-
-	header {
-		-Server
-		-X-Powered-By
-		Referrer-Policy "same-origin"
-		X-Frame-Options "deny"
-		X-XSS-Protection "1; mode=block"
-		X-Content-Type-Options "nosniff"
-	}
-
-	encode gzip zstd
-
-	php_fastcgi 127.0.0.1:9000 {
-		trusted_proxies 172.20.0.0/16
-	}
-
-	try_files {path} {path}/ /index.php?{query}
-}

.github/docker/README.md

@@ -0,0 +1,76 @@
+# Pterodactyl Panel - Docker Image
+This is a ready to use docker image for the panel.
+
+## Requirements
+This docker image requires some additional software to function. The software can either be provided in other containers (see the [docker-compose.yml](https://github.com/pterodactyl/panel/blob/develop/docker-compose.example.yml) as an example) or as existing instances.
+
+A mysql database is required. We recommend the stock [MariaDB Image](https://hub.docker.com/_/mariadb/) image if you prefer to run it in a docker container. As a non-containerized option we recommend mariadb.
+
+A caching software is required as well. We recommend the stock [Redis Image](https://hub.docker.com/_/redis/) image. You can choose any of the [supported options](#cache-drivers).
+
+You can provide additional settings using a custom `.env` file or by setting the appropriate environment variables in the docker-compose file.
+
+## Setup
+
+Start the docker container and the required dependencies (either provide existing ones or start containers as well, see the [docker-compose.yml](https://github.com/pterodactyl/panel/blob/develop/docker-compose.example.yml) file as an example.
+
+After the startup is complete you'll need to create a user.
+If you are running the docker container without docker-compose, use:
+```
+docker exec -it <container id> php artisan p:user:make
+```
+If you are using docker compose use
+```
+docker-compose exec panel php artisan p:user:make
+```
+
+## Environment Variables
+There are multiple environment variables to configure the panel when not providing your own `.env` file, see the following table for details on each available option.
+
+Note: If your `APP_URL` starts with `https://` you need to provide an `LE_EMAIL` as well so Certificates can be generated.
+
+| Variable            | Description                                                                    | Required |
+| ------------------- | ------------------------------------------------------------------------------ | -------- |
+| `APP_URL`           | The URL the panel will be reachable with (including protocol)                  | yes      |
+| `APP_TIMEZONE`      | The timezone to use for the panel                                              | yes      |
+| `LE_EMAIL`          | The email used for letsencrypt certificate generation                          | yes      |
+| `DB_HOST`           | The host of the mysql instance                                                 | yes      |
+| `DB_PORT`           | The port of the mysql instance                                                 | yes      |
+| `DB_DATABASE`       | The name of the mysql database                                                 | yes      |
+| `DB_USERNAME`       | The mysql user                                                                 | yes      |
+| `DB_PASSWORD`       | The mysql password for the specified user                                      | yes      |
+| `CACHE_DRIVER`      | The cache driver        (see [Cache drivers](#cache-drivers) for detais)       | yes      |
+| `SESSION_DRIVER`    |                                                                                | yes      |
+| `QUEUE_DRIVER`      |                                                                                | yes      |
+| `REDIS_HOST`        | The hostname or IP address of the redis database                               | yes      |
+| `REDIS_PASSWORD`    | The password used to secure the redis database                                 | maybe    |
+| `REDIS_PORT`        | The port the redis database is using on the host                               | maybe    |
+| `MAIL_DRIVER`       | The email driver (see [Mail drivers](#mail-drivers) for details)               | yes      |
+| `MAIL_FROM`         | The email that should be used as the sender email                              | yes      |
+| `MAIL_HOST`         | The host of your mail driver instance                                          | maybe    |
+| `MAIL_PORT`         | The port of your mail driver instance                                          | maybe    |
+| `MAIL_USERNAME`     | The username for your mail driver                                              | maybe    |
+| `MAIL_PASSWORD`     | The password for your mail driver                                              | maybe    |
+
+
+### Cache drivers
+You can choose between different cache drivers depending on what you prefer.
+We recommend redis when using docker as it can be started in a container easily.
+
+| Driver   | Description                          | Required variables                                     |
+| -------- | ------------------------------------ | ------------------------------------------------------ |
+| redis    | host where redis is running          | `REDIS_HOST`                                           |
+| redis    | port redis is running on             | `REDIS_PORT`                                           |
+| redis    | redis database password              | `REDIS_PASSWORD`                                       |
+
+### Mail drivers
+You can choose between different mail drivers according to your needs.
+Every driver requires `MAIL_FROM` to be set.
+
+| Driver   | Description                          | Required variables                                            |
+| -------- | ------------------------------------ | ------------------------------------------------------------- |
+| mail     | uses the installed php mail          |                                                               |
+| mandrill | [Mandrill](http://www.mandrill.com/) | `MAIL_USERNAME`                                               |
+| postmark | [Postmark](https://postmarkapp.com/) | `MAIL_USERNAME`                                               |
+| mailgun  | [Mailgun](https://www.mailgun.com/)  | `MAIL_USERNAME`, `MAIL_HOST`                                  |
+| smtp     | Any SMTP server can be configured    | `MAIL_USERNAME`, `MAIL_HOST`, `MAIL_PASSWORD`, `MAIL_PORT`    |

.github/docker/default.conf

@@ -0,0 +1,51 @@
+# If using Ubuntu this file should be placed in:
+# 			/etc/nginx/sites-available/
+#
+# If using CentOS this file should be placed in:
+#				 /etc/nginx/conf.d/
+#
+server {
+    listen 80;
+    server_name _;
+    
+    root /app/public;
+    index index.html index.htm index.php;
+    charset utf-8;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location = /favicon.ico { access_log off; log_not_found off; }
+    location = /robots.txt  { access_log off; log_not_found off; }
+
+    access_log off;
+    error_log  /var/log/nginx/pterodactyl.app-error.log error;
+
+    # allow larger file uploads and longer script runtimes
+    client_max_body_size 100m;
+    client_body_timeout 120s;
+  
+    sendfile off;
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        # the fastcgi_pass path needs to be changed accordingly when using CentOS
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param HTTP_PROXY "";
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+        fastcgi_connect_timeout 300;
+        fastcgi_send_timeout 300;
+        fastcgi_read_timeout 300;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}

.github/docker/default_ssl.conf

@@ -0,0 +1,70 @@
+# If using Ubuntu this file should be placed in: 
+# 			/etc/nginx/sites-available/
+#
+server {
+    listen 80;
+    server_name <domain>;
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name <domain>;
+
+    root /app/public;
+    index index.php;
+
+    access_log /var/log/nginx/pterodactyl.app-access.log;
+    error_log  /var/log/nginx/pterodactyl.app-error.log error;
+
+    # allow larger file uploads and longer script runtimes
+    client_max_body_size 100m;
+    client_body_timeout 120s;
+    
+    sendfile off;
+
+    # strengthen ssl security
+    ssl_certificate /etc/letsencrypt/live/<domain>/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/<domain>/privkey.pem;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers on;
+    ssl_session_cache shared:SSL:10m;
+    ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:ECDHE-RSA-AES128-GCM-SHA256:AES256+EECDH:DHE-RSA-AES128-GCM-SHA256:AES256+EDH:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
+    
+    # See the link below for more SSL information:
+    #     https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
+    #
+    # ssl_dhparam /etc/ssl/certs/dhparam.pem;
+
+    # Add headers to serve security related headers
+    add_header Strict-Transport-Security "max-age=15768000; preload;";
+    add_header X-Content-Type-Options nosniff;
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Robots-Tag none;
+    add_header Content-Security-Policy "frame-ancestors 'self'";
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param HTTP_PROXY "";
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+        fastcgi_connect_timeout 300;
+        fastcgi_send_timeout 300;
+        fastcgi_read_timeout 300;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}

.github/docker/entrypoint.sh

@@ -0,0 +1,81 @@
+#!/bin/ash -e
+cd /app
+
+mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php7/ \
+  && chmod 777 /var/log/panel/logs/ \
+  && ln -s /var/log/panel/logs/ /app/storage/logs/
+
+## check for .env file and generate app keys if missing
+if [ -f /app/var/.env ]; then
+  echo "external vars exist."
+  rm -rf /app/.env
+  ln -s /app/var/.env /app/
+else
+  echo "external vars don't exist."
+  rm -rf /app/.env
+  touch /app/var/.env
+
+  ## manually generate a key because key generate --force fails
+  if [ -z $APP_KEY ]; then
+     echo -e "Generating key."
+     APP_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
+     echo -e "Generated app key: $APP_KEY"
+     echo -e "APP_KEY=$APP_KEY" > /app/var/.env
+  else
+    echo -e "APP_KEY exists in environment, using that."
+    echo -e "APP_KEY=$APP_KEY" > /app/var/.env
+  fi
+
+  ln -s /app/var/.env /app/
+fi
+
+echo "Checking if https is required."
+if [ -f /etc/nginx/http.d/panel.conf ]; then
+  echo "Using nginx config already in place."
+  if [ $LE_EMAIL ]; then
+    echo "Checking for cert update"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  else
+    echo "No letsencrypt email is set"
+  fi
+else
+  echo "Checking if letsencrypt email is set."
+  if [ -z $LE_EMAIL ]; then
+    echo "No letsencrypt email is set using http config."
+    cp .github/docker/default.conf /etc/nginx/http.d/panel.conf
+  else
+    echo "writing ssl config"
+    cp .github/docker/default_ssl.conf /etc/nginx/http.d/panel.conf
+    echo "updating ssl config for domain"
+    sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/http.d/panel.conf
+    echo "generating certs"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  fi
+  echo "Removing the default nginx config"
+  rm -rf /etc/nginx/http.d/default.conf
+fi
+
+if [[ -z $DB_PORT ]]; then
+  echo -e "DB_PORT not specified, defaulting to 3306"
+  DB_PORT=3306
+fi
+
+## check for DB up before starting the panel
+echo "Checking database status."
+until nc -z -v -w30 $DB_HOST $DB_PORT
+do
+  echo "Waiting for database connection..."
+  # wait for 1 seconds before check again
+  sleep 1
+done
+
+## make sure the db is set up
+echo -e "Migrating and Seeding D.B"
+php artisan migrate --seed --force
+
+## start cronjobs for the queue
+echo -e "Starting cron jobs."
+crond -L /var/log/crond -l 5
+
+echo -e "Starting supervisord."
+exec "$@"

.github/docker/php-fpm.conf

@@ -1,21 +0,0 @@
-[global]
-error_log = /dev/stderr
-daemonize = no
-
-[www]
-user  = nobody
-group = nobody
-
-listen = 127.0.0.1:9000
-
-pm                      = dynamic
-pm.start_servers        = 4
-pm.min_spare_servers    = 4
-pm.max_spare_servers    = 16
-pm.max_children         = 64
-pm.max_requests         = 256
-
-clear_env = no
-catch_workers_output = yes
-
-decorate_workers_output = no

.github/docker/supervisord.conf

@@ -1,57 +1,39 @@
-[supervisord]
-logfile=/dev/stdout
-logfile_maxbytes=0
-loglevel=info
-minfds=1024
-minprocs=200
-nodaemon=true
-pidfile=/dev/null
-
 [unix_http_server]
-file=/tmp/supervisor.sock
+file=/tmp/supervisor.sock                       ; path to your socket file
 
-[supervisorctl]
+[supervisord]
-serverurl=unix:///tmp/supervisor.sock
+logfile=/var/log/supervisord/supervisord.log    ; supervisord log file
+logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
+logfile_backups=2                               ; number of backed up logfiles
+loglevel=error                                  ; info, debug, warn, trace
+pidfile=/var/run/supervisord.pid                ; pidfile location
+nodaemon=false                                  ; run supervisord as a daemon
+minfds=1024                                     ; number of startup file descriptors
+minprocs=200                                    ; number of process descriptors
+user=root                                       ; default user
+childlogdir=/var/log/supervisord/               ; where child log files will live
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
-[program:caddy]
+[supervisorctl]
-command=/usr/local/bin/caddy run --config /etc/caddy/Caddyfile
+serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
+
+[program:php-fpm]
+command=/usr/local/sbin/php-fpm -F
+autostart=true
+autorestart=true
+
+[program:queue-worker]
+command=/usr/local/bin/php /app/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
+user=nginx
+autostart=true
+autorestart=true
+
+[program:nginx]
+command=/usr/sbin/nginx -g 'daemon off;'
 autostart=true
 autorestart=true
 priority=10
-stdout_logfile=/dev/stdout
+stdout_events_enabled=true
-stdout_logfile_maxbytes=0
+stderr_events_enabled=true
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:php-fpm]
-command=/usr/sbin/php-fpm --nodaemonize
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-environment=LOG_CHANNEL="stderr"
-
-[program:queue-worker]
-command=/usr/bin/php /var/www/pterodactyl/artisan queue:work --queue=standard --sleep=3 --tries=3
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-environment=LOG_CHANNEL="stderr"
-
-[program:yacron]
-command=/usr/local/bin/yacron -c /etc/yacron.yaml
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-environment=LOG_CHANNEL="stderr"

.github/docker/www.conf

@@ -0,0 +1,16 @@
+[www]
+
+user = nginx
+group = nginx
+
+listen = 127.0.0.1:9000
+listen.owner = nginx
+listen.group = nginx
+listen.mode = 0750
+
+pm = ondemand
+pm.max_children = 9
+pm.process_idle_timeout = 10s
+pm.max_requests = 200
+
+clear_env = no

.github/docker/yacron.yaml

@@ -1,8 +0,0 @@
-jobs:
-  - name: scheduler
-    command:
-      - /usr/bin/php
-      - /var/www/pterodactyl/artisan
-      - schedule:run
-    schedule: "* * * * *"
-    utc: true

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Build Panel
+on:
+  push:
+    branches:
+      - 'develop'
+      - 'v2'
+  pull_request:
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      matrix:
+        node-version: [16.x]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm install -g yarn
+    - run: yarn install
+    - run: yarn build:production

.github/workflows/docker.yaml

@@ -1,67 +0,0 @@
-name: Docker
-
-on:
-  push:
-    branches:
-      - develop
-      - 1.0-develop
-  pull_request:
-    branches:
-      - develop
-      - 1.0-develop
-  release:
-    types:
-      - published
-
-jobs:
-  push:
-    name: Push
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v3
-
-      - name: Fetch metadata
-        id: metadata
-        uses: docker/metadata-action@v4
-        with:
-          images: ghcr.io/pterodactyl/panel
-          flavor: |
-            latest=false
-          tags: |
-            type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.action == 'published' && github.event.release.prerelease == false }}
-            type=ref,event=tag
-            type=ref,event=branch
-
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        if: "github.event_name != 'pull_request'"
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
-      - name: Update version
-        if: "github.event_name == 'release' && github.event.action == 'published'"
-        env:
-          REF: ${{ github.event.release.tag_name }}
-        run: |
-          sed -i "s/    'version' => 'canary',/    'version' => '${REF:1}',/" config/app.php
-
-      - name: Build and Push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./Containerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: linux/amd64,linux/arm64
-          labels: ${{ steps.metadata.outputs.labels }}
-          tags: ${{ steps.metadata.outputs.tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/docker.yml

@@ -0,0 +1,49 @@
+name: Publish Docker Image
+on:
+  push:
+    branches:
+      - 'develop'
+    tags:
+      - 'v*'
+jobs:
+  push_to_registry:
+    name: Push Image to GitHub Packages
+    runs-on: ubuntu-latest
+    # Always run against a tag, even if the commit into the tag has [docker skip]
+    # within the commit message.
+    if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: crazy-max/ghaction-docker-meta@v1
+        id: docker_meta
+        with:
+          images: ghcr.io/pterodactyl/panel
+      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - name: Bump Version
+        if: "!contains(github.ref, 'develop')"
+        env:
+          REF: ${{ github.ref }}
+        run: |
+          sed -i "s/    'version' => 'canary',/    'version' => '${REF:11}',/" config/app.php
+      - name: Release Production Build
+        uses: docker/build-push-action@v2
+        if: "!contains(github.ref, 'develop')"
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+      - name: Release Development Build
+        uses: docker/build-push-action@v2
+        if: "contains(github.ref, 'develop')"
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/laravel.yaml

@@ -1,210 +0,0 @@
-name: Laravel
-
-on:
-  push:
-    branches:
-      - "develop"
-      - "1.0-develop"
-  pull_request:
-    branches:
-      - "develop"
-      - "1.0-develop"
-
-jobs:
-  analysis:
-    name: Static Analysis
-    runs-on: ubuntu-22.04
-    env:
-      APP_ENV: testing
-      APP_DEBUG: "true"
-      APP_KEY: SomeRandomString3232RandomString
-      CACHE_DRIVER: array
-      MAIL_MAILER: array
-      SESSION_DRIVER: array
-      QUEUE_CONNECTION: sync
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.1
-          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
-
-      - name: Analyze
-        run: vendor/bin/phpstan analyse
-
-  lint:
-    name: Lint
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          # TODO: Update to 8.2 once php-cs-fixer supports it
-          php-version: 8.1
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
-
-      - name: PHP CS Fixer
-        run: vendor/bin/php-cs-fixer fix --dry-run --diff
-
-  mysql:
-    name: Tests
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [8.1, 8.2]
-        database: ["mariadb:10.2", "mariadb:10.9", "mysql:8"]
-    services:
-      database:
-        image: docker.io/library/${{ matrix.database }}
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: testing
-        ports:
-          - 3306/tcp
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    env:
-      APP_ENV: testing
-      APP_DEBUG: "true"
-      APP_KEY: SomeRandomString3232RandomString
-      APP_THEME: pterodactyl
-      APP_TIMEZONE: UTC
-      APP_URL: http://localhost/
-      APP_ENVIRONMENT_ONLY: "true"
-      CACHE_DRIVER: array
-      MAIL_MAILER: array
-      SESSION_DRIVER: array
-      QUEUE_CONNECTION: sync
-      HASHIDS_SALT: test123
-      DB_CONNECTION: mysql
-      DB_HOST: 127.0.0.1
-      DB_DATABASE: testing
-      DB_USERNAME: root
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v3
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
-
-      - name: Unit tests
-        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
-        env:
-          DB_HOST: UNIT_NO_DB
-
-      - name: Integration tests
-        run: vendor/bin/phpunit tests/Integration
-        env:
-          DB_PORT: ${{ job.services.database.ports[3306] }}
-
-  postgres:
-    name: Tests
-    runs-on: ubuntu-22.04
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [8.1, 8.2]
-        database: ["postgres:13", "postgres:14", "postgres:15"]
-    services:
-      database:
-        image: docker.io/library/${{ matrix.database }}
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: testing
-        ports:
-          - 5432/tcp
-        options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
-    env:
-      APP_ENV: testing
-      APP_DEBUG: "true"
-      APP_KEY: SomeRandomString3232RandomString
-      APP_THEME: pterodactyl
-      APP_TIMEZONE: UTC
-      APP_URL: http://localhost/
-      APP_ENVIRONMENT_ONLY: "true"
-      CACHE_DRIVER: array
-      MAIL_MAILER: array
-      SESSION_DRIVER: array
-      QUEUE_CONNECTION: sync
-      HASHIDS_SALT: test123
-      DB_CONNECTION: pgsql
-      DB_HOST: 127.0.0.1
-      DB_DATABASE: testing
-      DB_USERNAME: postgres
-      DB_PASSWORD: postgres
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v3
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
-
-      - name: Unit tests
-        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
-        env:
-          DB_HOST: UNIT_NO_DB
-
-      - name: Integration tests
-        run: vendor/bin/phpunit tests/Integration
-        env:
-          DB_PORT: ${{ job.services.database.ports[5432] }}

.github/workflows/release.yml

@@ -1,32 +1,16 @@
-name: Release
+name: Create Release
-
 on:
   push:
     tags:
-      - "v*"
+      - 'v*'
-
 jobs:
   release:
-    name: Release
+    runs-on: ubuntu-20.04
-    runs-on: ubuntu-22.04
     steps:
-      - name: Code checkout
+      - uses: actions/checkout@v2
-        uses: actions/checkout@v3
+      - uses: actions/setup-node@v1
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: '16.x'
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Build
-        run: pnpm run build
 
       - name: Create release branch and bump version
         env:
@@ -39,19 +23,26 @@ jobs:
           git push -u origin $BRANCH
           sed -i "s/    'version' => 'canary',/    'version' => '${REF:11}',/" config/app.php
           git add config/app.php
-          git commit -m "ci(release): bump version"
+          git commit -m "bump version for release"
           git push
 
+      - name: Build assets
+        run: |
+          yarn install
+          yarn run build:production
+
       - name: Create release archive
         run: |
-          rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpstan.neon phpunit.xml shell.nix
+          rm -rf node_modules/ test/ codecov.yml CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.xml Vagrantfile
-          tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
+          tar -czf panel.tar.gz * .env.example .eslintignore .eslintrc.js
 
       - name: Extract changelog
+        id: extract_changelog
         env:
           REF: ${{ github.ref }}
         run: |
           sed -n "/^## ${REF:10}/,/^## /{/^## /b;p}" CHANGELOG.md > ./RELEASE_CHANGELOG
+          echo ::set-output name=version_name::`sed -nr "s/^## (${REF:10} .*)$/\1/p" CHANGELOG.md`
 
       - name: Create checksum and add to changelog
         run: |
@@ -59,17 +50,19 @@ jobs:
           echo -e "\n#### SHA256 Checksum\n\n\`\`\`\n$SUM\n\`\`\`\n" >> ./RELEASE_CHANGELOG
           echo $SUM > checksum.txt
 
-      - name: Create release
+      - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          draft: true
+          tag_name: ${{ github.ref }}
-          prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
+          release_name: ${{ steps.extract_changelog.outputs.version_name }}
           body_path: ./RELEASE_CHANGELOG
+          draft: true
+          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
 
-      - name: Upload release archive
+      - name: Upload binary
         id: upload-release-archive
         uses: actions/upload-release-asset@v1
         env:
@@ -80,7 +73,7 @@ jobs:
           asset_name: panel.tar.gz
           asset_content_type: application/gzip
 
-      - name: Upload release checksum
+      - name: Upload checksum
         id: upload-release-checksum
         uses: actions/upload-release-asset@v1
         env:

.github/workflows/tests.yml

@@ -0,0 +1,58 @@
+name: Run Tests
+on:
+  push:
+    branches:
+      - 'develop'
+      - 'v2'
+  pull_request:
+jobs:
+  tests:
+    runs-on: ubuntu-20.04
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ 7.4, 8.0, 8.1 ]
+        database: [ 'mariadb:10.2', 'mysql:8' ]
+    services:
+      database:
+        image: ${{ matrix.database }}
+        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
+    name: "php-${{ matrix.php }} (${{ matrix.database }})"
+    steps:
+      - uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('**.composer.lock') }}
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+      - run: cp .env.ci .env
+      - run: composer install --prefer-dist --no-interaction --no-progress
+      - run: vendor/bin/php-cs-fixer fix --dry-run --diff
+        continue-on-error: true
+      - name: execute unit tests
+        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
+        if: ${{ always() }}
+        env:
+          DB_HOST: UNIT_NO_DB
+      - name: execute integration tests
+        run: vendor/bin/phpunit tests/Integration
+        env:
+          DB_PORT: ${{ job.services.database.ports[3306] }}
+          DB_USERNAME: root

.github/workflows/ui.yaml

@@ -1,63 +0,0 @@
-name: UI
-
-on:
-  push:
-    branches:
-      - "develop"
-      - "1.0-develop"
-  pull_request:
-    branches:
-      - "develop"
-      - "1.0-develop"
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v3
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Lint
-        run: pnpm run lint
-
-  tests:
-    name: Tests
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [16, 18]
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v3
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Build
-        run: pnpm run build
-
-      - name: Tests
-        run: pnpm run test

.gitignore

@@ -8,7 +8,6 @@
 storage/framework/*
 /.idea
 /nbproject
-/.direnv
 
 node_modules
 *.log
@@ -29,8 +28,3 @@ misc
 coverage.xml
 resources/lang/locales.js
 .phpunit.result.cache
-
-/public/build
-/public/hot
-result
-docker-compose.yaml

.npmrc

@@ -1 +0,0 @@
-shamefully-hoist=true

.prettierignore

@@ -1,4 +0,0 @@
-.github
-public
-node_modules
-resources/views

.prettierrc.json

@@ -1,22 +0,0 @@
-{
-	"printWidth": 120,
-	"tabWidth": 4,
-	"useTabs": false,
-	"semi": true,
-	"singleQuote": true,
-	"jsxSingleQuote": false,
-	"trailingComma": "all",
-	"bracketSpacing": true,
-	"arrowParens": "avoid",
-	"endOfLine": "lf",
-	"overrides": [
-		{
-			"files": ["**/*.md"],
-			"options": {
-				"tabWidth": 2,
-				"useTabs": false,
-				"singleQuote": false
-			}
-		}
-	]
-}

.yarnclean

@@ -0,0 +1 @@
+@types/react-native

BUILDING.md

@@ -0,0 +1,63 @@
+# Local Development
+Pterodactyl is now powered by React, Typescript, and Tailwindcss using webpack at its core to generate compiled assets.
+Release versions of Pterodactyl will include pre-compiled, minified, and hashed assets ready-to-go.
+
+However, if you are interested in running custom themes or making modifications to the React files you'll need a build
+system in place to generate these compiled assets. To get your environment setup you'll need at minimum:
+
+* [Node.js](https://nodejs.org/en/) v14.x.x
+* [Yarn](https://classic.yarnpkg.com/lang/en/) v1.x.x
+* [Go](https://golang.org/) 1.17.x
+
+### Install Dependencies
+```bash
+yarn install
+```
+
+The command above will download all of the dependencies necessary to get Pterodactyl assets building. After that, its as
+simple as running the command below to generate assets while you're developing. Until you've run this command at least
+once you'll likely see a 500 error on your Panel about a missing `manifest.json` file. This is generated by the commands
+below.
+
+```bash
+# Build the compiled set of assets for development.
+yarn run build
+
+# Build the assets automatically as they are changed. This allows you to refresh
+# the page and see the changes immediately.
+yarn run watch
+```
+
+### Hot Module Reloading
+For more advanced users, we also support 'Hot Module Reloading', allowing you to quickly see changes you're making
+to the Vue template files without having to reload the page you're on. To Get started with this, you just need
+to run the command below.
+
+```bash
+PUBLIC_PATH=http://192.168.1.1:8080 yarn run serve --host 192.168.1.1
+```
+
+There are two _very important_ parts of this command to take note of and change for your specific environment. The first
+is the `--host` flag, which is required and should point to the machine where the `webpack-serve` server will be running.
+The second is the `PUBLIC_PATH` environment variable which is the URL pointing to the HMR server and is appended to all of
+the asset URLs used in Pterodactyl.
+
+#### Development Environment
+If you're using the [`pterodactyl/development`](https://github.com/pterodactyl/development) environments, which are
+highly recommended, you can just run `yarn run serve` to run the HMR server, no additional configuration is necessary.
+
+### Building for Production
+Once you have your files squared away and ready for the live server, you'll be needing to generate compiled, minified,
+and hashed assets to push live. To do so, run the command below:
+
+```bash
+yarn run build:production
+```
+
+This will generate a production JS bundle and associated assets, all located in `public/assets/` which will need to
+be uploaded to your server or CDN for clients to use.
+
+### Running Wings
+To run `wings` in development all you need to do is set up the configuration file as normal when adding a new node, and
+then you can build and run a local version of Wings by executing `make debug` in the Wings code directory. This must
+be run on a Linux VM of some sort, you cannot run this locally on macOS or Windows.

CHANGELOG.md

@@ -3,103 +3,6 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
-## v1.11.3
-### Changed
-* When updating a server's description through the client API, if no value is specified, the description will now remain unchanged.
-* When installing the Panel for the first time, the queue driver will now all default to `redis` instead of `sync`.
-
-### Fixed
-* `php artisan p:environment:mail` not correctly setting the right variable for `MAIL_FROM_ADDRESS`.
-* Fixed the conflict state rendering on the UI for a server showing `reinstall_failed` as `restoring_backup`.
-* Fixed the unknown column `uuid` error when jobs fail, causing them not to get stored correctly.
-* Fixed the server task endpoints in the client API not allowing `sequence_id` and `continue_on_failure` to be set.
-
-## v1.11.2
-### Changed
-* Telemetry no longer sends a map of Egg and Nest UUIDs to the number of servers using them.
-* Increased the timeout for the decompress files endpoint in the client API from 15 seconds to 15 minutes.
-
-### Fixed
-* Fixed Panel Docker image having a `v` prefix in the version displayed in the admin area.
-* Fixed emails using the wrong queue name, causing them to not be sent.
-* Fixed the settings keys used for configuring SMTP settings, causing settings to not save properly.
-* Fixed the `MAIL_EHLO_DOMAIN` environment variable not being properly backwards compatible with the old `SERVER_NAME` variable.
-
-## v1.11.1
-### Fixed
-* Fixed Panel Docker image showing `canary` as it's version.
-
-## v1.11.0
-### Changed (since 1.10.4)
-* Changed minimum PHP version requirement from `7.4` to `8.0`.
-* Upgraded from Laravel 8 to Laravel 9.
-* This release requires Wings v1.11.x in order for Server Transfers to work.
-* `MB` byte suffixes are now displayed as `MiB` to more accurately reflect the actual value.
-* Server re-installation failures are tracked independently of the initial installation process.
-
-### Fixed (since 1.10.4)
-* Node maintenance mode now properly blocks access to servers.
-* Fixed the length validation on the Minecraft Forge egg.
-* Fixed the password in the JDBC string not being properly URL encoded.
-* Fixed an issue where Wings would throw a validation error while attempting to upload activity logs.
-* Properly handle a missing `Content-Length` header in the response from the daemon.
-* Ensure activity log properties are always returned as an object instead of an empty array.
-
-### Added (since 1.10.4)
-* Added the `server:settings.description` activity log event for when a server description is changed.
-* Added the ability to cancel file uploads in the file manager for a server.
-* Added a telemetry service to collect anonymous metrics from the panel, this feature is *enabled* by default and can be toggled using the `PTERODACTYL_TELEMETRY_ENABLED` environment variable.
-
-## v1.11.0-rc.2
-### Changed
-* `MB` byte suffixes are now displayed as `MiB` to more accurately reflect the actual value.
-* Server re-installation failures are tracked independently of the initial installation process.
-
-### Fixed
-* Properly handle a missing `Content-Length` header in the response from the daemon.
-* Ensure activity log properties are always returned as an object instead of an empty array.
-
-### Added
-* Added the `server:settings.description` activity log event for when a server description is changed.
-* Added the ability to cancel file uploads in the file manager for a server.
-* Added a telemetry service to collect anonymous metrics from the panel, this feature is disabled by default and can be toggled using the `PTERODACTYL_TELEMETRY_ENABLED` environment variable.
-
-## v1.11.0-rc.1
-### Changed
-* Changed minimum PHP version requirement from `7.4` to `8.0`.
-* Upgraded from Laravel 8 to Laravel 9.
-* This release requires Wings v1.11.x in order for Server Transfers to work.
-
-### Fixed
-* Node maintenance mode now properly blocks access to servers.
-* Fixed the length validation on the Minecraft Forge egg.
-* Fixed the password in the JDBC string not being properly URL encoded.
-* Fixed an issue where Wings would throw a validation error while attempting to upload activity logs.
-
-## v1.10.4
-### Fixed
-* Fixed an issue where subusers could be given permissions that are not actually registered or used.
-* Fixed an issue where node FQDNs could not just be IP addresses.
-
-### Changed
-* Change maximum number of API keys per user from `10` to `25`.
-* Change byte unit prefix from `B` to `iB` to better reflect our usage of base 2 (multiples of 1024).
-
-## v1.10.3
-### Fixed
-* S3 Backup driver now supports Cloudflare R2.
-* Node FQDNs can now be used with AAAA records with no A records present.
-* Server transfers can no longer be initiated if the server is being installed, transferred, or restoring a backup.
-* Fixed an issue relating to the use of arrays in the `config_files` field with eggs.
-* Fixed `oom_disabled` not being mapped in the Application API when creating a new server.
-
-### Added
-* File manager now supports selecting multiple files for upload (when using the upload button).
-* Added a configuration option for specifying the S3 storage class for backups.
-
-### Changed
-* Servers will now show the current uptime when the server is starting rather than only showing when the server is marked as online.
-
 ## v1.10.2
 ### Fixed
 * Fixes a rendering issue with egg descriptions in the admin area

CONTRIBUTING.md

@@ -1,31 +1,28 @@
 # Contributing
-
 Pterodactyl does not accept Pull Requests (PRs) _for new functionality_ from users that are not currently part of the
 core project team. It has become overwhelming to try and give the proper time and attention that such complicated PRs
 tend to require — and deserve. As a result, it is in the project's best interest to limit the scope of work on
 new functionality to work done within the core project team.
 
 PRs that address existing _bugs_ with a corresponding issue opened in our issue tracker will continue to be accepted
-and reviewed. Their scope is often significantly more targeted, and simply improving upon existing and well defined
+and reviewed. Their scope is often signficantly more targeted, and simply improving upon existing and well defined
 logic.
 
 ### Responsible Disclosure
-
 This is a fairly in-depth project and makes use of a lot of parts. We strive to keep everything as secure as possible
 and welcome you to take a look at the code provided in this project yourself. We do ask that you be considerate of
 others who are using the software and not publicly disclose security issues without contacting us first by email.
 
-We'll make a deal with you: if you contact us by email, and we fail to respond to you within a week you are welcome to
+We'll make a deal with you: if you contact us by email and we fail to respond to you within a week you are welcome to
 publicly disclose whatever issue you have found. We understand how frustrating it is when you find something big and
 no one will respond to you. This holds us to a standard of providing prompt attention to any issues that arise and
 keeping this community safe.
 
-If you've found what you believe is a security issue please email `matthew@pterodactyl.io`. Please check
+If you've found what you believe is a security issue please email `dane@pterodactyl.io`. Please check
 [SECURITY.md](/SECURITY.md) for additional details.
 
 ### Contact Us
-
+You can find us in a couple places online. First and foremost, we're active right here on Github. If you encounter a
-You can find us in a couple places online. First and foremost, we're active right here on GitHub. If you encounter a
 bug or other problems, open an issue on here for us to take a look at it. We also accept feature requests here as well.
 
 You can also find us on [Discord](https://discord.gg/pterodactyl).

Containerfile

@@ -1,77 +0,0 @@
-# Stage 1 - Builder
-FROM        --platform=$TARGETOS/$TARGETARCH registry.access.redhat.com/ubi9/nodejs-18-minimal AS builder
-
-USER        0
-RUN         npm install -g pnpm
-
-WORKDIR     /var/www/pterodactyl
-
-COPY        --chown=1001:0 public ./public
-COPY        --chown=1001:0 resources/scripts ./resources/scripts
-COPY        --chown=1001:0 .eslintignore .eslintrc.js .npmrc .prettierrc.json package.json pnpm-lock.yaml tailwind.config.js tsconfig.json vite.config.ts .
-
-RUN         /opt/app-root/src/.npm-global/bin/pnpm install \
-                && /opt/app-root/src/.npm-global/bin/pnpm build \
-                && rm -rf resources/scripts .eslintignore .eslintrc.yml .npmrc package.json pnpm-lock.yaml tailwind.config.js tsconfig.json vite.config.ts node_modules
-
-USER        1001
-
-COPY        --chown=1001:0 app ./app
-COPY        --chown=1001:0 bootstrap ./bootstrap
-COPY        --chown=1001:0 config ./config
-COPY        --chown=1001:0 database ./database
-COPY        --chown=1001:0 resources/lang ./resources/lang
-COPY        --chown=1001:0 resources/views ./resources/views
-COPY        --chown=1001:0 routes ./routes
-COPY        --chown=1001:0 .env.example ./.env
-COPY        --chown=1001:0 artisan CHANGELOG.md composer.json composer.lock LICENSE.md README.md SECURITY.md .
-
-# Stage 2 - Final
-FROM        --platform=$TARGETOS/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal
-
-RUN         microdnf update -y \
-                && rpm --install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
-                && rpm --install https://rpms.remirepo.net/enterprise/remi-release-9.rpm \
-                && microdnf update -y \
-                && microdnf install -y ca-certificates shadow-utils tar tzdata unzip wget \
-# ref; https://bugzilla.redhat.com/show_bug.cgi?id=1870814
-                && microdnf reinstall -y tzdata \
-                && microdnf module -y reset php \
-                && microdnf module -y enable php:remi-8.2 \
-                && microdnf install -y composer cronie php-{bcmath,cli,common,fpm,gd,gmp,intl,json,mbstring,mysqlnd,opcache,pdo,pecl-redis5,pecl-zip,phpiredis,pgsql,process,sodium,xml,zstd} supervisor \
-                && rm /etc/php-fpm.d/www.conf \
-                && useradd --home-dir /var/lib/caddy --create-home caddy \
-                && mkdir /etc/caddy \
-                && wget -O /usr/local/bin/yacron https://github.com/gjcarneiro/yacron/releases/download/0.17.0/yacron-0.17.0-x86_64-unknown-linux-gnu \
-                && chmod 755 /usr/local/bin/yacron \
-                && microdnf remove -y tar wget \
-                && microdnf clean all
-
-COPY        --chown=caddy:caddy --from=builder /var/www/pterodactyl /var/www/pterodactyl
-
-WORKDIR     /var/www/pterodactyl
-
-RUN         mkdir -p /tmp/pterodactyl/cache /tmp/pterodactyl/framework/{cache,sessions,views} storage/framework \
-                && rm -rf bootstrap/cache storage/framework/sessions storage/framework/views storage/framework/cache \
-                && ln -s /tmp/pterodactyl/cache /var/www/pterodactyl/bootstrap/cache \
-                && ln -s /tmp/pterodactyl/framework/cache /var/www/pterodactyl/storage/framework/cache \
-                && ln -s /tmp/pterodactyl/framework/sessions /var/www/pterodactyl/storage/framework/sessions \
-                && ln -s /tmp/pterodactyl/framework/views /var/www/pterodactyl/storage/framework/views \
-                && chmod -R 755 /var/www/pterodactyl/storage/* /tmp/pterodactyl/cache \
-                && chown -R caddy:caddy /var/www/pterodactyl /tmp/pterodactyl/{cache,framework}
-
-USER        caddy
-ENV         USER=caddy
-
-RUN         composer install --no-dev --optimize-autoloader \
-                && rm -rf bootstrap/cache/*.php \
-                && rm -rf .env storage/logs/*.log
-
-COPY        --from=docker.io/library/caddy:latest /usr/bin/caddy /usr/local/bin/caddy
-COPY        .github/docker/Caddyfile /etc/caddy/Caddyfile
-COPY        .github/docker/php-fpm.conf /etc/php-fpm.conf
-COPY        .github/docker/supervisord.conf /etc/supervisord.conf
-COPY        .github/docker/yacron.yaml /etc/yacron.yaml
-
-EXPOSE      8080
-CMD         ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]

Dockerfile

@@ -0,0 +1,40 @@
+# Stage 0:
+# Build the assets that are needed for the frontend. This build stage is then discarded
+# since we won't need NodeJS anymore in the future. This Docker image ships a final production
+# level distribution of Pterodactyl.
+FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:14
+WORKDIR /app
+COPY . ./
+RUN yarn install --frozen-lockfile \
+    && yarn run build:production
+
+# Stage 1:
+# Build the actual container with all of the needed PHP dependencies that will run the application.
+FROM --platform=$TARGETOS/$TARGETARCH php:8.1-fpm-alpine
+WORKDIR /app
+COPY . ./
+COPY --from=0 /app/public/assets ./public/assets
+RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot certbot-nginx \
+    && docker-php-ext-configure zip \
+    && docker-php-ext-install bcmath gd pdo_mysql zip \
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && cp .env.example .env \
+    && mkdir -p bootstrap/cache/ storage/logs storage/framework/sessions storage/framework/views storage/framework/cache \
+    && chmod 777 -R bootstrap storage \
+    && composer install --no-dev --optimize-autoloader \
+    && rm -rf .env bootstrap/cache/*.php \
+    && chown -R nginx:nginx .
+
+RUN rm /usr/local/etc/php-fpm.conf \
+    && echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
+    && echo "0 23 * * * certbot renew --nginx --quiet" >> /var/spool/cron/crontabs/root \
+    && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
+    && mkdir -p /var/run/php /var/run/nginx
+
+COPY .github/docker/default.conf /etc/nginx/http.d/default.conf
+COPY .github/docker/www.conf /usr/local/etc/php-fpm.conf
+COPY .github/docker/supervisord.conf /etc/supervisord.conf
+
+EXPOSE 80 443
+ENTRYPOINT [ "/bin/ash", ".github/docker/entrypoint.sh" ]
+CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

LICENSE

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Skynet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,12 +1,11 @@
 [![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io)
 
-![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pterodactyl/panel/laravel.yaml?label=Tests&style=for-the-badge&branch=develop)
+![GitHub Workflow Status](https://img.shields.io/github/workflow/status/pterodactyl/panel/tests?label=Tests&style=for-the-badge)
 ![Discord](https://img.shields.io/discord/122900397965705216?label=Discord&logo=Discord&logoColor=white&style=for-the-badge)
 ![GitHub Releases](https://img.shields.io/github/downloads/pterodactyl/panel/latest/total?style=for-the-badge)
 ![GitHub contributors](https://img.shields.io/github/contributors/pterodactyl/panel?style=for-the-badge)
 
 # Pterodactyl Panel
-
 Pterodactyl® is a free, open-source game server management panel built with PHP, React, and Go. Designed with security 
 in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive
 UI to end users.
@@ -16,31 +15,30 @@ Stop settling for less. Make game servers a first class citizen on your platform
 ![Image](https://cdn.pterodactyl.io/site-assets/pterodactyl_v1_demo.gif)
 
 ## Documentation
-
 * [Panel Documentation](https://pterodactyl.io/panel/1.0/getting_started.html)
 * [Wings Documentation](https://pterodactyl.io/wings/1.0/installing.html)
 * [Community Guides](https://pterodactyl.io/community/about.html)
 * Or, get additional help [via Discord](https://discord.gg/pterodactyl)
 
 ## Sponsors
-
+I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's developement.
-I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's development.
+[Interested in becoming a sponsor?](https://github.com/sponsors/DaneEveritt)
-[Interested in becoming a sponsor?](https://github.com/sponsors/matthewpi)
 
 | Company | About |
-|-----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ------- | ----- |
 | [**WISP**](https://wisp.gg) | Extra features. |
-| [**Aussie Server Hosts**](https://aussieserverhosts.com/)             | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand.                                                       |
-| [**WemX**](https://wemx.net/)                                         | WemX helps automate your hosting company or SaaS business by automating billing, user management, authentication, and much more.                                                                      |
 | [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. |
+| [**Fragnet**](https://fragnet.net) | Providing low latency, high-end game hosting solutions to gamers, game studios and eSports platforms. |
+| [**Tempest**](https://tempest.net/) | Tempest Hosting is a subsidiary of Path Network, Inc. offering unmetered DDoS protected 10Gbps dedicated servers, starting at just $80/month. Full anycast, tons of filters. |
+| [**Bloom.host**](https://bloom.host) | Bloom.host offers dedicated core VPS and Minecraft hosting with Ryzen 9 processors. With owned-hardware, we offer truly unbeatable prices on high-performance hosting. |
 | [**MineStrator**](https://minestrator.com/) | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try! |
+| [**Skynode**](https://www.skynode.pro/) | Skynode provides blazing fast game servers along with a top-notch user experience. Whatever our clients are looking for, we're able to provide it! |
+| [**DeinServerHost**](https://deinserverhost.de/) | DeinServerHost offers Dedicated, vps and Gameservers for many popular Games like Minecraft and Rust in Germany since 2013. |
+| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. |
 | [**VibeGAMES**](https://vibegames.net/) | VibeGAMES is a game server provider that specializes in DDOS protection for the games we offer. We have multiple locations in the US, Brazil, France, Germany, Singapore, Australia and South Africa.|
-| [**DutchIS**](https://dutchis.net?ref=pterodactyl)                    | DutchIS provides instant infrastructure such as pay per use VPS hosting. Start your game hosting journey on DutchIS.                                                                                  |
+| [**Gamenodes**](https://gamenodes.nl) | Gamenodes love quality. For Minecraft, Discord Bots and other services, among others. With our own programmers, we provide just that little bit of extra service! |
-| [**Skoali**](https://skoali.com/)                                     | Skoali is a French company that hosts game servers and other types of services (VPS, WEB, Dedicated servers, ...). We also have a free plan for Minecraft and Garry's Mod.                            |
-| [**Rabbit Computing**](https://www.rabbitcomputing.com/link.php?id=5) | Rabbit Computing offers powerful VPS servers, highly available game hosting, and fully unlimited web hosting. Use code README for 20% off your first three months!                                    |
 
 ### Supported Games
-
 Pterodactyl supports a wide variety of games by utilizing Docker containers to isolate each instance. This gives
 you the power to run game servers without bloating machines with a host of additional dependencies.
 
@@ -69,7 +67,6 @@ and there are plenty more games available provided by the community. Some of the
 * [and many more...](https://github.com/parkervcp/eggs)
 
 ## License
-
 Pterodactyl® Copyright © 2015 - 2022 Dane Everitt and contributors.
 
 Code released under the [MIT License](./LICENSE.md).

SECURITY.md

@@ -1,19 +1,17 @@
 # Security Policy
 
 ## Supported Versions
-
 The following versions of Pterodactyl are receiving active support and maintenance. Any security vulnerabilities discovered must be reproducible in supported versions.
 
 | Panel  | Daemon       | Supported          |
-|--------|--------------|--------------------|
+|--------|--------------| ------------------ |
 | 1.10.x | wings@1.7.x  | :white_check_mark: |
-| 1.11.x | wings@1.11.x | :white_check_mark: |
 | 0.7.x  | daemon@0.6.x | :x: |
 
 
 ## Reporting a Vulnerability
 
-Please reach out directly to any project team member on Discord when reporting a security vulnerability, or you can email `matthew@pterodactyl.io`.
+Please reach out directly to any project team member on Discord when reporting a security vulnerability, or you can send an email to `dane@pterodactyl.io`.
 
 We make every effort to respond as soon as possible, although it may take a day or two for us to sync internally and determine the severity of the report and its impact. Please, _do not_ use a public facing channel or GitHub issues to report sensitive security issues.
 

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Console\Commands\Environment;
 
+use DateTimeZone;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
@@ -30,8 +31,19 @@ class AppSettingsCommand extends Command
         'sync' => 'Sync',
     ];
 
+    /**
+     * @var \Illuminate\Contracts\Console\Kernel
+     */
+    protected $command;
+
+    /**
+     * @var string
+     */
     protected $description = 'Configure basic environment settings for the Panel.';
 
+    /**
+     * @var string
+     */
     protected $signature = 'p:environment:setup
                             {--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.}
@@ -43,17 +55,21 @@ class AppSettingsCommand extends Command
                             {--redis-host= : Redis host to use for connections.}
                             {--redis-pass= : Password used to connect to redis.}
                             {--redis-port= : Port to connect to redis over.}
-                            {--settings-ui= : Enable or disable the settings UI.}
+                            {--settings-ui= : Enable or disable the settings UI.}';
-                            {--telemetry= : Enable or disable anonymous telemetry.}';
 
-    protected array $variables = [];
+    /**
+     * @var array
+     */
+    protected $variables = [];
 
     /**
      * AppSettingsCommand constructor.
      */
-    public function __construct(private Kernel $console)
+    public function __construct(Kernel $command)
     {
         parent::__construct();
+
+        $this->command = $command;
     }
 
     /**
@@ -61,7 +77,7 @@ class AppSettingsCommand extends Command
      *
      * @throws \Pterodactyl\Exceptions\PterodactylException
      */
-    public function handle(): int
+    public function handle()
     {
         if (empty(config('hashids.salt')) || $this->option('new-salt')) {
             $this->variables['HASHIDS_SALT'] = str_random(20);
@@ -82,13 +98,13 @@ class AppSettingsCommand extends Command
         $this->output->comment('The application URL MUST begin with https:// or http:// depending on if you are using SSL or not. If you do not include the scheme your emails and other content will link to the wrong location.');
         $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
             'Application URL',
-            config('app.url', 'https://example.com')
+            config('app.url', 'http://example.org')
         );
 
-        $this->output->comment('The timezone should match one of PHP\'s supported timezones. If you are unsure, please reference https://php.net/manual/en/timezones.php.');
+        $this->output->comment('The timezone should match one of PHP\'s supported timezones. If you are unsure, please reference http://php.net/manual/en/timezones.php.');
         $this->variables['APP_TIMEZONE'] = $this->option('timezone') ?? $this->anticipate(
             'Application Timezone',
-            \DateTimeZone::listIdentifiers(),
+            DateTimeZone::listIdentifiers(DateTimeZone::ALL),
             config('app.timezone')
         );
 
@@ -119,23 +135,15 @@ class AppSettingsCommand extends Command
             $this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm('Enable UI based settings editor?', true) ? 'false' : 'true';
         }
 
-        $this->output->comment('Please reference https://pterodactyl.io/panel/1.0/additional_configuration.html#telemetry for more detailed information regarding telemetry data and collection.');
-        $this->variables['PTERODACTYL_TELEMETRY_ENABLED'] = $this->option('telemetry') ?? $this->confirm(
-            'Enable sending anonymous telemetry data?',
-            config('pterodactyl.telemetry.enabled', true)
-        ) ? 'true' : 'false';
-
         // Make sure session cookies are set as "secure" when using HTTPS
-        if (str_starts_with($this->variables['APP_URL'], 'https://')) {
+        if (strpos($this->variables['APP_URL'], 'https://') === 0) {
             $this->variables['SESSION_SECURE_COOKIE'] = 'true';
         }
 
         $this->checkForRedis();
         $this->writeToEnvironment($this->variables);
 
-        $this->info($this->console->output());
+        $this->info($this->command->output());
-
-        return 0;
     }
 
     /**

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Console\Commands\Environment;
 
+use PDOException;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Database\DatabaseManager;
@@ -11,8 +12,24 @@ class DatabaseSettingsCommand extends Command
 {
     use EnvironmentWriterTrait;
 
+    /**
+     * @var \Illuminate\Contracts\Console\Kernel
+     */
+    protected $console;
+
+    /**
+     * @var \Illuminate\Database\DatabaseManager
+     */
+    protected $database;
+
+    /**
+     * @var string
+     */
     protected $description = 'Configure database settings for the Panel.';
 
+    /**
+     * @var string
+     */
     protected $signature = 'p:environment:database
                             {--host= : The connection address for the MySQL server.}
                             {--port= : The connection port for the MySQL server.}
@@ -20,22 +37,30 @@ class DatabaseSettingsCommand extends Command
                             {--username= : Username to use when connecting.}
                             {--password= : Password to use for this database.}';
 
-    protected array $variables = [];
+    /**
+     * @var array
+     */
+    protected $variables = [];
 
     /**
      * DatabaseSettingsCommand constructor.
      */
-    public function __construct(private DatabaseManager $database, private Kernel $console)
+    public function __construct(DatabaseManager $database, Kernel $console)
     {
         parent::__construct();
+
+        $this->console = $console;
+        $this->database = $database;
     }
 
     /**
      * Handle command execution.
      *
+     * @return int
+     *
      * @throws \Pterodactyl\Exceptions\PterodactylException
      */
-    public function handle(): int
+    public function handle()
     {
         $this->output->note('It is highly recommended to not use "localhost" as your database host as we have seen frequent socket connection issues. If you want to use a local connection you should be using "127.0.0.1".');
         $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
@@ -71,7 +96,7 @@ class DatabaseSettingsCommand extends Command
 
         try {
             $this->testMySQLConnection();
-        } catch (\PDOException $exception) {
+        } catch (PDOException $exception) {
             $this->output->error(sprintf('Unable to connect to the MySQL server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
             $this->output->error('Your connection credentials have NOT been saved. You will need to provide valid connection information before proceeding.');
 

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -1,4 +1,11 @@
 <?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\Console\Commands\Environment;
 
@@ -10,8 +17,19 @@ class EmailSettingsCommand extends Command
 {
     use EnvironmentWriterTrait;
 
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
+    /**
+     * @var string
+     */
     protected $description = 'Set or update the email sending configuration for the Panel.';
 
+    /**
+     * @var string
+     */
     protected $signature = 'p:environment:mail
                             {--driver= : The mail driver to use.}
                             {--email= : Email address that messages from the Panel will originate from.}
@@ -23,14 +41,19 @@ class EmailSettingsCommand extends Command
                             {--username=}
                             {--password=}';
 
-    protected array $variables = [];
+    /**
+     * @var array
+     */
+    protected $variables = [];
 
     /**
      * EmailSettingsCommand constructor.
      */
-    public function __construct(private ConfigRepository $config)
+    public function __construct(ConfigRepository $config)
     {
         parent::__construct();
+
+        $this->config = $config;
     }
 
     /**
@@ -44,12 +67,12 @@ class EmailSettingsCommand extends Command
             trans('command/messages.environment.mail.ask_driver'),
             [
                 'smtp' => 'SMTP Server',
-                'sendmail' => 'sendmail Binary',
+                'mail' => 'PHP\'s Internal Mail Function',
                 'mailgun' => 'Mailgun Transactional Email',
                 'mandrill' => 'Mandrill Transactional Email',
-                'postmark' => 'Postmark Transactional Email',
+                'postmark' => 'Postmarkapp Transactional Email',
             ],
-            $this->config->get('mail.default', 'smtp')
+            $this->config->get('mail.driver', 'smtp')
         );
 
         $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
@@ -57,7 +80,7 @@ class EmailSettingsCommand extends Command
             $this->{$method}();
         }
 
-        $this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask(
+        $this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask(
             trans('command/messages.environment.mail.ask_mail_from'),
             $this->config->get('mail.from.address')
         );
@@ -67,6 +90,12 @@ class EmailSettingsCommand extends Command
             $this->config->get('mail.from.name')
         );
 
+        $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
+            trans('command/messages.environment.mail.ask_encryption'),
+            ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
+            $this->config->get('mail.encryption', 'tls')
+        );
+
         $this->writeToEnvironment($this->variables);
 
         $this->line('Updating stored environment configuration file.');
@@ -80,28 +109,22 @@ class EmailSettingsCommand extends Command
     {
         $this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask(
             trans('command/messages.environment.mail.ask_smtp_host'),
-            $this->config->get('mail.mailers.smtp.host')
+            $this->config->get('mail.host')
         );
 
         $this->variables['MAIL_PORT'] = $this->option('port') ?? $this->ask(
             trans('command/messages.environment.mail.ask_smtp_port'),
-            $this->config->get('mail.mailers.smtp.port')
+            $this->config->get('mail.port')
         );
 
         $this->variables['MAIL_USERNAME'] = $this->option('username') ?? $this->ask(
             trans('command/messages.environment.mail.ask_smtp_username'),
-            $this->config->get('mail.mailers.smtp.username')
+            $this->config->get('mail.username')
         );
 
         $this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret(
             trans('command/messages.environment.mail.ask_smtp_password')
         );
-
-        $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
-            trans('command/messages.environment.mail.ask_encryption'),
-            ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
-            $this->config->get('mail.mailers.smtp.encryption', 'tls')
-        );
     }
 
     /**

app/Console/Commands/InfoCommand.php

@@ -1,4 +1,11 @@
 <?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\Console\Commands;
 
@@ -8,16 +15,35 @@ use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
 class InfoCommand extends Command
 {
+    /**
+     * @var string
+     */
     protected $description = 'Displays the application, database, and email configurations along with the panel version.';
 
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
+    /**
+     * @var string
+     */
     protected $signature = 'p:info';
 
+    /**
+     * @var \Pterodactyl\Services\Helpers\SoftwareVersionService
+     */
+    protected $versionService;
+
     /**
      * VersionCommand constructor.
      */
-    public function __construct(private ConfigRepository $config, private SoftwareVersionService $softwareVersionService)
+    public function __construct(ConfigRepository $config, SoftwareVersionService $versionService)
     {
         parent::__construct();
+
+        $this->config = $config;
+        $this->versionService = $versionService;
     }
 
     /**
@@ -27,9 +53,9 @@ class InfoCommand extends Command
     {
         $this->output->title('Version Information');
         $this->table([], [
-            ['Panel Version', $this->softwareVersionService->getCurrentVersion()],
+            ['Panel Version', $this->config->get('app.version')],
-            ['Latest Version', $this->softwareVersionService->getLatestPanel()],
+            ['Latest Version', $this->versionService->getPanel()],
-            ['Up-to-Date', $this->softwareVersionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
+            ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
             ['Unique Identifier', $this->config->get('pterodactyl.service.author')],
         ], 'compact');
 
@@ -52,29 +78,33 @@ class InfoCommand extends Command
         $driver = $this->config->get('database.default');
         $this->table([], [
             ['Driver', $driver],
-            ['Host', $this->config->get("database.connections.$driver.host")],
+            ['Host', $this->config->get("database.connections.{$driver}.host")],
-            ['Port', $this->config->get("database.connections.$driver.port")],
+            ['Port', $this->config->get("database.connections.{$driver}.port")],
-            ['Database', $this->config->get("database.connections.$driver.database")],
+            ['Database', $this->config->get("database.connections.{$driver}.database")],
-            ['Username', $this->config->get("database.connections.$driver.username")],
+            ['Username', $this->config->get("database.connections.{$driver}.username")],
         ], 'compact');
 
-        // TODO: Update this to handle other mail drivers
         $this->output->title('Email Configuration');
         $this->table([], [
-            ['Driver', $this->config->get('mail.default')],
+            ['Driver', $this->config->get('mail.driver')],
-            ['Host', $this->config->get('mail.mailers.smtp.host')],
+            ['Host', $this->config->get('mail.host')],
-            ['Port', $this->config->get('mail.mailers.smtp.port')],
+            ['Port', $this->config->get('mail.port')],
-            ['Username', $this->config->get('mail.mailers.smtp.username')],
+            ['Username', $this->config->get('mail.username')],
             ['From Address', $this->config->get('mail.from.address')],
             ['From Name', $this->config->get('mail.from.name')],
-            ['Encryption', $this->config->get('mail.mailers.smtp.encryption')],
+            ['Encryption', $this->config->get('mail.encryption')],
         ], 'compact');
     }
 
     /**
      * Format output in a Name: Value manner.
+     *
+     * @param string $value
+     * @param string $opts
+     *
+     * @return string
      */
-    private function formatText(string $value, string $opts = ''): string
+    private function formatText($value, $opts = '')
     {
         return sprintf('<%s>%s</>', $opts, $value);
     }

app/Console/Commands/Location/DeleteLocationCommand.php

@@ -1,28 +1,56 @@
 <?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\Console\Commands\Location;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Collection;
 use Pterodactyl\Services\Locations\LocationDeletionService;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 
 class DeleteLocationCommand extends Command
 {
+    /**
+     * @var \Pterodactyl\Services\Locations\LocationDeletionService
+     */
+    protected $deletionService;
+
+    /**
+     * @var string
+     */
     protected $description = 'Deletes a location from the Panel.';
 
-    protected $signature = 'p:location:delete {--short= : The short code of the location to delete.}';
+    /**
+     * @var \Illuminate\Support\Collection
+     */
+    protected $locations;
 
-    protected Collection $locations;
+    /**
+     * @var \Pterodactyl\Contracts\Repository\LocationRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var string
+     */
+    protected $signature = 'p:location:delete {--short= : The short code of the location to delete.}';
 
     /**
      * DeleteLocationCommand constructor.
      */
     public function __construct(
-        private LocationDeletionService $deletionService,
+        LocationDeletionService $deletionService,
-        private LocationRepositoryInterface $repository
+        LocationRepositoryInterface $repository
     ) {
         parent::__construct();
+
+        $this->deletionService = $deletionService;
+        $this->repository = $repository;
     }
 
     /**

app/Console/Commands/Location/MakeLocationCommand.php

@@ -1,4 +1,11 @@
 <?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\Console\Commands\Location;
 
@@ -7,18 +14,31 @@ use Pterodactyl\Services\Locations\LocationCreationService;
 
 class MakeLocationCommand extends Command
 {
+    /**
+     * @var \Pterodactyl\Services\Locations\LocationCreationService
+     */
+    protected $creationService;
+
+    /**
+     * @var string
+     */
     protected $signature = 'p:location:make
                             {--short= : The shortcode name of this location (ex. us1).}
                             {--long= : A longer description of this location.}';
 
+    /**
+     * @var string
+     */
     protected $description = 'Creates a new location on the system via the CLI.';
 
     /**
      * Create a new command instance.
      */
-    public function __construct(private LocationCreationService $creationService)
+    public function __construct(LocationCreationService $creationService)
     {
         parent::__construct();
+
+        $this->creationService = $creationService;
     }
 
     /**

app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php

@@ -2,20 +2,29 @@
 
 namespace Pterodactyl\Console\Commands\Maintenance;
 
+use SplFileInfo;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 
 class CleanServiceBackupFilesCommand extends Command
 {
     public const BACKUP_THRESHOLD_MINUTES = 5;
 
+    /**
+     * @var string
+     */
     protected $description = 'Clean orphaned .bak files created when modifying services.';
 
-    protected $signature = 'p:maintenance:clean-service-backups';
+    /**
+     * @var \Illuminate\Contracts\Filesystem\Filesystem
+     */
+    protected $disk;
 
-    protected Filesystem $disk;
+    /**
+     * @var string
+     */
+    protected $signature = 'p:maintenance:clean-service-backups';
 
     /**
      * CleanServiceBackupFilesCommand constructor.
@@ -34,7 +43,7 @@ class CleanServiceBackupFilesCommand extends Command
     {
         $files = $this->disk->files('services/.bak');
 
-        collect($files)->each(function (\SplFileInfo $file) {
+        collect($files)->each(function (SplFileInfo $file) {
             $lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
             if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
                 $this->disk->delete($file->getPath());

app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php

@@ -3,31 +3,30 @@
 namespace Pterodactyl\Console\Commands\Maintenance;
 
 use Carbon\CarbonImmutable;
+use InvalidArgumentException;
 use Illuminate\Console\Command;
 use Pterodactyl\Repositories\Eloquent\BackupRepository;
 
 class PruneOrphanedBackupsCommand extends Command
 {
+    /**
+     * @var string
+     */
     protected $signature = 'p:maintenance:prune-backups {--prune-age=}';
 
-    protected $description = 'Marks all backups older than "n" minutes that have not yet completed as being failed.';
-
     /**
-     * PruneOrphanedBackupsCommand constructor.
+     * @var string
      */
-    public function __construct(private BackupRepository $backupRepository)
+    protected $description = 'Marks all backups that have not completed in the last "n" minutes as being failed.';
-    {
-        parent::__construct();
-    }
 
-    public function handle()
+    public function handle(BackupRepository $repository)
     {
         $since = $this->option('prune-age') ?? config('backups.prune_age', 360);
         if (!$since || !is_digit($since)) {
-            throw new \InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
+            throw new InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
         }
 
-        $query = $this->backupRepository->getBuilder()
+        $query = $repository->getBuilder()
             ->whereNull('completed_at')
             ->where('created_at', '<=', CarbonImmutable::now()->subMinutes($since)->toDateTimeString());
 
@@ -38,7 +37,7 @@ class PruneOrphanedBackupsCommand extends Command
             return;
         }
 
-        $this->warn("Marking $count uncompleted backups that are older than $since minutes as failed.");
+        $this->warn("Marking {$count} backups that have not been marked as completed in the last {$since} minutes as failed.");
 
         $query->update([
             'is_successful' => false,

app/Console/Commands/Node/MakeNodeCommand.php

@@ -1,5 +1,13 @@
 <?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\Console\Commands\Node;
 
 use Illuminate\Console\Command;
@@ -7,6 +15,14 @@ use Pterodactyl\Services\Nodes\NodeCreationService;
 
 class MakeNodeCommand extends Command
 {
+    /**
+     * @var \Pterodactyl\Services\Nodes\NodeCreationService
+     */
+    protected $creationService;
+
+    /**
+     * @var string
+     */
     protected $signature = 'p:node:make
                             {--name= : A name to identify the node.}
                             {--description= : A description to identify the node.}
@@ -25,33 +41,40 @@ class MakeNodeCommand extends Command
                             {--daemonSFTPPort= : Enter the wings SFTP listening port.}
                             {--daemonBase= : Enter the base folder.}';
 
-    protected $description = 'Creates a new node on the system via the CLI.';
-
     /**
-     * MakeNodeCommand constructor.
+     * @var string
      */
-    public function __construct(private NodeCreationService $creationService)
+    protected $description = 'Creates a new node on the system via the CLI.';
-    {
-        parent::__construct();
-    }
 
     /**
      * Handle the command execution process.
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function handle()
+    public function handle(NodeCreationService $creationService)
     {
+        $this->creationService = $creationService;
+
         $data['name'] = $this->option('name') ?? $this->ask('Enter a short identifier used to distinguish this node from others');
         $data['description'] = $this->option('description') ?? $this->ask('Enter a description to identify the node');
         $data['location_id'] = $this->option('locationId') ?? $this->ask('Enter a valid location id');
+        $data['fqdn'] = $this->option('fqdn') ?? $this->ask('Enter a domain name (e.g node.example.com) to be used for connecting to the daemon. An IP address may only be used if you are not using SSL for this node');
+        if (!filter_var(gethostbyname($data['fqdn']), FILTER_VALIDATE_IP)) {
+            $this->error('The FQDN or IP address provided does not resolve to a valid IP address.');
+
+            return;
+        }
+        $data['public'] = $this->option('public') ?? $this->confirm('Should this node be public? As a note, setting a node to private you will be denying the ability to auto-deploy to this node.', true);
         $data['scheme'] = $this->option('scheme') ?? $this->anticipate(
             'Please either enter https for SSL or http for a non-ssl connection',
             ['https', 'http'],
             'https'
         );
-        $data['fqdn'] = $this->option('fqdn') ?? $this->ask('Enter a domain name (e.g node.example.com) to be used for connecting to the daemon. An IP address may only be used if you are not using SSL for this node');
+        if (filter_var($data['fqdn'], FILTER_VALIDATE_IP) && $data['scheme'] === 'https') {
-        $data['public'] = $this->option('public') ?? $this->confirm('Should this node be public? As a note, setting a node to private you will be denying the ability to auto-deploy to this node.', true);
+            $this->error('A fully qualified domain name that resolves to a public IP address is required in order to use SSL for this node.');
+
+            return;
+        }
         $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm('Is your FQDN behind a proxy?');
         $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm('Should maintenance mode be enabled?');
         $data['memory'] = $this->option('maxMemory') ?? $this->ask('Enter the maximum amount of memory');

app/Console/Commands/Node/NodeConfigurationCommand.php

@@ -13,7 +13,7 @@ class NodeConfigurationCommand extends Command
 
     protected $description = 'Displays the configuration for the specified node.';
 
-    public function handle(): int
+    public function handle()
     {
         $column = ctype_digit((string) $this->argument('node')) ? 'id' : 'uuid';
 
@@ -28,7 +28,7 @@ class NodeConfigurationCommand extends Command
         if (!in_array($format, ['yaml', 'yml', 'json'])) {
             $this->error('Invalid format specified. Valid options are "yaml" and "json".');
 
-            return 1;
+            exit(1);
         }
 
         if ($format === 'json') {

app/Console/Commands/Node/NodeListCommand.php

@@ -9,7 +9,7 @@ class NodeListCommand extends Command
 {
     protected $signature = 'p:node:list {--format=text : The output format: "text" or "json". }';
 
-    public function handle(): int
+    public function handle()
     {
         $nodes = Node::query()->with('location')->get()->map(function (Node $node) {
             return [

app/Console/Commands/Overrides/SeedCommand.php

@@ -13,14 +13,14 @@ class SeedCommand extends BaseSeedCommand
      * Block someone from running this seed command if they have not completed
      * the migration process.
      */
-    public function handle(): int
+    public function handle()
     {
         if (!$this->hasCompletedMigrations()) {
             $this->showMigrationWarning();
 
-            return 1;
+            return;
         }
 
-        return parent::handle();
+        parent::handle();
     }
 }

app/Console/Commands/Overrides/UpCommand.php

@@ -13,14 +13,14 @@ class UpCommand extends BaseUpCommand
      * Block someone from running this up command if they have not completed
      * the migration process.
      */
-    public function handle(): int
+    public function handle()
     {
         if (!$this->hasCompletedMigrations()) {
             $this->showMigrationWarning();
 
-            return 1;
+            return;
         }
 
-        return parent::handle();
+        parent::handle();
     }
 }

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Console\Commands\Schedule;
 
 use Exception;
+use Throwable;
 use Illuminate\Console\Command;
 use Pterodactyl\Models\Schedule;
 use Illuminate\Support\Facades\Log;
@@ -11,14 +12,20 @@ use Pterodactyl\Services\Schedules\ProcessScheduleService;
 
 class ProcessRunnableCommand extends Command
 {
+    /**
+     * @var string
+     */
     protected $signature = 'p:schedule:process';
 
+    /**
+     * @var string
+     */
     protected $description = 'Process schedules in the database and determine which are ready to run.';
 
     /**
      * Handle command execution.
      */
-    public function handle(): int
+    public function handle()
     {
         $schedules = Schedule::query()
             ->with('tasks')
@@ -31,7 +38,7 @@ class ProcessRunnableCommand extends Command
         if ($schedules->count() < 1) {
             $this->line('There are no scheduled tasks for servers that need to be run.');
 
-            return 0;
+            return;
         }
 
         $bar = $this->output->createProgressBar(count($schedules));
@@ -43,8 +50,6 @@ class ProcessRunnableCommand extends Command
         }
 
         $this->line('');
-
-        return 0;
     }
 
     /**
@@ -67,10 +72,10 @@ class ProcessRunnableCommand extends Command
                 'schedule' => $schedule->name,
                 'hash' => $schedule->hashid,
             ]));
-        } catch (\Throwable|\Exception $exception) {
+        } catch (Throwable|Exception $exception) {
             Log::error($exception, ['schedule_id' => $schedule->id]);
 
-            $this->error("An error was encountered while processing Schedule #$schedule->id: " . $exception->getMessage());
+            $this->error("An error was encountered while processing Schedule #{$schedule->id}: " . $exception->getMessage());
         }
     }
 }

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -4,7 +4,6 @@ namespace Pterodactyl\Console\Commands\Server;
 
 use Pterodactyl\Models\Server;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\Factory as ValidatorFactory;
 use Pterodactyl\Repositories\Wings\DaemonPowerRepository;
@@ -12,33 +11,31 @@ use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class BulkPowerActionCommand extends Command
 {
+    /**
+     * @var string
+     */
     protected $signature = 'p:server:bulk-power
                             {action : The action to perform (start, stop, restart, kill)}
                             {--servers= : A comma separated list of servers.}
                             {--nodes= : A comma separated list of nodes.}';
 
-    protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
-
     /**
-     * BulkPowerActionCommand constructor.
+     * @var string
      */
-    public function __construct(private DaemonPowerRepository $powerRepository, private ValidatorFactory $validator)
+    protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
-    {
-        parent::__construct();
-    }
 
     /**
      * Handle the bulk power request.
      *
      * @throws \Illuminate\Validation\ValidationException
      */
-    public function handle()
+    public function handle(DaemonPowerRepository $powerRepository, ValidatorFactory $validator)
     {
         $action = $this->argument('action');
         $nodes = empty($this->option('nodes')) ? [] : explode(',', $this->option('nodes'));
         $servers = empty($this->option('servers')) ? [] : explode(',', $this->option('servers'));
 
-        $validator = $this->validator->make([
+        $validator = $validator->make([
             'action' => $action,
             'nodes' => $nodes,
             'servers' => $servers,
@@ -64,7 +61,6 @@ class BulkPowerActionCommand extends Command
         }
 
         $bar = $this->output->createProgressBar($count);
-        $powerRepository = $this->powerRepository;
         $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
             $bar->clear();
 
@@ -88,8 +84,10 @@ class BulkPowerActionCommand extends Command
 
     /**
      * Returns the query builder instance that will return the servers that should be affected.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
      */
-    protected function getQueryBuilder(array $servers, array $nodes): Builder
+    protected function getQueryBuilder(array $servers, array $nodes)
     {
         $instance = Server::query()->whereNull('status');
 

app/Console/Commands/TelemetryCommand.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Pterodactyl\Console\Commands;
-
-use Illuminate\Console\Command;
-use Symfony\Component\VarDumper\VarDumper;
-use Pterodactyl\Services\Telemetry\TelemetryCollectionService;
-
-class TelemetryCommand extends Command
-{
-    protected $description = 'Displays all the data that would be sent to the Pterodactyl Telemetry Service if telemetry collection is enabled.';
-
-    protected $signature = 'p:telemetry';
-
-    /**
-     * TelemetryCommand constructor.
-     */
-    public function __construct(private TelemetryCollectionService $telemetryCollectionService)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle execution of command.
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     */
-    public function handle()
-    {
-        $this->output->info('Collecting telemetry data, this may take a while...');
-
-        VarDumper::dump($this->telemetryCollectionService->collect());
-    }
-}

app/Console/Commands/UpgradeCommand.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Console\Commands;
 
+use Closure;
 use Illuminate\Console\Command;
 use Pterodactyl\Console\Kernel;
 use Symfony\Component\Process\Process;
@@ -11,6 +12,7 @@ class UpgradeCommand extends Command
 {
     protected const DEFAULT_URL = 'https://github.com/pterodactyl/panel/releases/%s/panel.tar.gz';
 
+    /** @var string */
     protected $signature = 'p:upgrade
         {--user= : The user that PHP runs under. All files will be owned by this user.}
         {--group= : The group that PHP runs under. All files will be owned by this group.}
@@ -18,6 +20,7 @@ class UpgradeCommand extends Command
         {--release= : A specific Pterodactyl version to download from GitHub. Leave blank to use latest.}
         {--skip-download : If set no archive will be downloaded.}';
 
+    /** @var string */
     protected $description = 'Downloads a new archive for Pterodactyl from GitHub and then executes the normal upgrade commands.';
 
     /**
@@ -89,7 +92,7 @@ class UpgradeCommand extends Command
             }
         }
 
-        ini_set('output_buffering', '0');
+        ini_set('output_buffering', 0);
         $bar = $this->output->createProgressBar($skipDownload ? 9 : 10);
         $bar->start();
 
@@ -176,7 +179,7 @@ class UpgradeCommand extends Command
         $this->info('Panel has been successfully upgraded. Please ensure you also update any Wings instances: https://pterodactyl.io/wings/1.0/upgrading.html');
     }
 
-    protected function withProgress(ProgressBar $bar, \Closure $callback)
+    protected function withProgress(ProgressBar $bar, Closure $callback)
     {
         $bar->clear();
         $callback();

app/Console/Commands/User/DeleteUserCommand.php

@@ -1,4 +1,11 @@
 <?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\Console\Commands\User;
 
@@ -9,19 +16,42 @@ use Pterodactyl\Services\Users\UserDeletionService;
 
 class DeleteUserCommand extends Command
 {
+    /**
+     * @var \Pterodactyl\Services\Users\UserDeletionService
+     */
+    protected $deletionService;
+
+    /**
+     * @var string
+     */
     protected $description = 'Deletes a user from the Panel if no servers are attached to their account.';
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var string
+     */
     protected $signature = 'p:user:delete {--user=}';
 
     /**
      * DeleteUserCommand constructor.
      */
-    public function __construct(private UserDeletionService $deletionService)
+    public function __construct(UserDeletionService $deletionService)
     {
         parent::__construct();
+
+        $this->deletionService = $deletionService;
     }
 
-    public function handle(): int
+    /**
+     * @return bool
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
+     */
+    public function handle()
     {
         $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
         Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
@@ -38,16 +68,16 @@ class DeleteUserCommand extends Command
                 return $this->handle();
             }
 
-            return 1;
+            return false;
         }
 
         if ($this->input->isInteractive()) {
             $tableValues = [];
             foreach ($results as $user) {
-                $tableValues[] = [$user->id, $user->email, $user->username];
+                $tableValues[] = [$user->id, $user->email, $user->name];
             }
 
-            $this->table(['User ID', 'Email', 'Username'], $tableValues);
+            $this->table(['User ID', 'Email', 'Name'], $tableValues);
             if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
                 return $this->handle();
             }
@@ -55,7 +85,7 @@ class DeleteUserCommand extends Command
             if (count($results) > 1) {
                 $this->error(trans('command/messages.user.multiple_found'));
 
-                return 1;
+                return false;
             }
 
             $deleteUser = $results->first();
@@ -65,7 +95,5 @@ class DeleteUserCommand extends Command
             $this->deletionService->handle($deleteUser);
             $this->info(trans('command/messages.user.deleted'));
         }
-
-        return 0;
     }
 }

app/Console/Commands/User/DisableTwoFactorCommand.php

@@ -1,4 +1,11 @@
 <?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\Console\Commands\User;
 
@@ -7,16 +14,29 @@ use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
 class DisableTwoFactorCommand extends Command
 {
+    /**
+     * @var string
+     */
     protected $description = 'Disable two-factor authentication for a specific user in the Panel.';
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var string
+     */
     protected $signature = 'p:user:disable2fa {--email= : The email of the user to disable 2-Factor for.}';
 
     /**
      * DisableTwoFactorCommand constructor.
      */
-    public function __construct(private UserRepositoryInterface $repository)
+    public function __construct(UserRepositoryInterface $repository)
     {
         parent::__construct();
+
+        $this->repository = $repository;
     }
 
     /**

app/Console/Commands/User/MakeUserCommand.php

@@ -1,4 +1,11 @@
 <?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\Console\Commands\User;
 
@@ -7,16 +14,29 @@ use Pterodactyl\Services\Users\UserCreationService;
 
 class MakeUserCommand extends Command
 {
+    /**
+     * @var \Pterodactyl\Services\Users\UserCreationService
+     */
+    protected $creationService;
+
+    /**
+     * @var string
+     */
     protected $description = 'Creates a user on the system via the CLI.';
 
+    /**
+     * @var string
+     */
     protected $signature = 'p:user:make {--email=} {--username=} {--name-first=} {--name-last=} {--password=} {--admin=} {--no-password}';
 
     /**
      * MakeUserCommand constructor.
      */
-    public function __construct(private UserCreationService $creationService)
+    public function __construct(UserCreationService $creationService)
     {
         parent::__construct();
+
+        $this->creationService = $creationService;
     }
 
     /**
@@ -30,6 +50,8 @@ class MakeUserCommand extends Command
         $root_admin = $this->option('admin') ?? $this->confirm(trans('command/messages.user.ask_admin'));
         $email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));
         $username = $this->option('username') ?? $this->ask(trans('command/messages.user.ask_username'));
+        $name_first = $this->option('name-first') ?? $this->ask(trans('command/messages.user.ask_name_first'));
+        $name_last = $this->option('name-last') ?? $this->ask(trans('command/messages.user.ask_name_last'));
 
         if (is_null($password = $this->option('password')) && !$this->option('no-password')) {
             $this->warn(trans('command/messages.user.ask_password_help'));
@@ -37,11 +59,12 @@ class MakeUserCommand extends Command
             $password = $this->secret(trans('command/messages.user.ask_password'));
         }
 
-        $user = $this->creationService->handle(compact('email', 'username', 'password', 'root_admin'));
+        $user = $this->creationService->handle(compact('email', 'username', 'name_first', 'name_last', 'password', 'root_admin'));
         $this->table(['Field', 'Value'], [
             ['UUID', $user->uuid],
             ['Email', $user->email],
             ['Username', $user->username],
+            ['Name', $user->name],
             ['Admin', $user->root_admin ? 'Yes' : 'No'],
         ]);
     }

app/Console/Kernel.php

@@ -2,13 +2,10 @@
 
 namespace Pterodactyl\Console;
 
-use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\ActivityLog;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
-use Pterodactyl\Repositories\Eloquent\SettingsRepository;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Pterodactyl\Services\Telemetry\TelemetryCollectionService;
 use Pterodactyl\Console\Commands\Schedule\ProcessRunnableCommand;
 use Pterodactyl\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
 use Pterodactyl\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
@@ -18,7 +15,7 @@ class Kernel extends ConsoleKernel
     /**
      * Register the commands for the application.
      */
-    protected function commands(): void
+    protected function commands()
     {
         $this->load(__DIR__ . '/Commands');
     }
@@ -26,11 +23,8 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      */
-    protected function schedule(Schedule $schedule): void
+    protected function schedule(Schedule $schedule)
     {
-        // https://laravel.com/docs/10.x/upgrade#redis-cache-tags
-        $schedule->command('cache:prune-stale-tags')->hourly();
-
         // Execute scheduled commands for servers every minute, as if there was a normal cron running.
         $schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping();
         $schedule->command(CleanServiceBackupFilesCommand::class)->daily();
@@ -43,34 +37,5 @@ class Kernel extends ConsoleKernel
         if (config('activity.prune_days')) {
             $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
         }
-
-        if (config('pterodactyl.telemetry.enabled')) {
-            $this->registerTelemetry($schedule);
-        }
-    }
-
-    /**
-     * I wonder what this does.
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    private function registerTelemetry(Schedule $schedule): void
-    {
-        $settingsRepository = app()->make(SettingsRepository::class);
-
-        $uuid = $settingsRepository->get('app:telemetry:uuid');
-        if (is_null($uuid)) {
-            $uuid = Uuid::uuid4()->toString();
-            $settingsRepository->set('app:telemetry:uuid', $uuid);
-        }
-
-        // Calculate a fixed time to run the data push at, this will be the same time every day.
-        $time = hexdec(str_replace('-', '', substr($uuid, 27))) % 1440;
-        $hour = floor($time / 60);
-        $minute = $time % 60;
-
-        // Run the telemetry collector.
-        $schedule->call(app()->make(TelemetryCollectionService::class))->description('Collect Telemetry')->dailyAt("$hour:$minute");
     }
 }

app/Console/RequiresDatabaseMigrations.php

@@ -33,7 +33,7 @@ trait RequiresDatabaseMigrations
      * them to properly run the migrations rather than ignoring all of the other previous
      * errors...
      */
-    protected function showMigrationWarning(): void
+    protected function showMigrationWarning()
     {
         $this->getOutput()->writeln('<options=bold>
 | @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |

app/Contracts/Criteria/CriteriaInterface.php

@@ -1,14 +1,24 @@
 <?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\Criteria;
 
-use Illuminate\Database\Eloquent\Model;
 use Pterodactyl\Repositories\Repository;
 
 interface CriteriaInterface
 {
     /**
      * Apply selected criteria to a repository call.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $model
+     *
+     * @return mixed
      */
-    public function apply(Model $model, Repository $repository): mixed;
+    public function apply($model, Repository $repository);
 }

app/Contracts/Extensions/HashidsInterface.php

@@ -1,4 +1,11 @@
 <?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\Extensions;
 
@@ -9,7 +16,12 @@ interface HashidsInterface extends VendorHashidsInterface
     /**
      * Decode an encoded hashid and return the first result.
      *
+     * @param string $encoded
+     * @param null $default
+     *
+     * @return mixed
+     *
      * @throws \InvalidArgumentException
      */
-    public function decodeFirst(string $encoded, string $default = null): mixed;
+    public function decodeFirst($encoded, $default = null);
 }

app/Contracts/Http/ClientPermissionsRequest.php

@@ -6,7 +6,7 @@ interface ClientPermissionsRequest
 {
     /**
      * Returns the permissions string indicating which permission should be used to
-     * validate that the authenticated user has permission to perform this action against
+     * validate that the authenticated user has permission to perform this action aganist
      * the given resource (server).
      */
     public function permission(): string;

app/Contracts/Repository/AllocationRepositoryInterface.php

@@ -2,18 +2,18 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-use Pterodactyl\Models\Allocation;
-
 interface AllocationRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return all the allocations that exist for a node that are not currently
+     * Return all of the allocations that exist for a node that are not currently
      * allocated.
      */
     public function getUnassignedAllocationIds(int $node): array;
 
     /**
      * Return a single allocation from those meeting the requirements.
+     *
+     * @return \Pterodactyl\Models\Allocation|null
      */
-    public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false): ?Allocation;
+    public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false);
 }

app/Contracts/Repository/ApiKeyRepositoryInterface.php

@@ -8,12 +8,12 @@ use Illuminate\Support\Collection;
 interface ApiKeyRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Get all the account API keys that exist for a specific user.
+     * Get all of the account API keys that exist for a specific user.
      */
     public function getAccountKeys(User $user): Collection;
 
     /**
-     * Get all the application API keys that exist for a specific user.
+     * Get all of the application API keys that exist for a specific user.
      */
     public function getApplicationKeys(User $user): Collection;
 

app/Contracts/Repository/ApiPermissionRepositoryInterface.php

@@ -1,4 +1,11 @@
 <?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;
 

app/Contracts/Repository/DatabaseRepositoryInterface.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Pterodactyl\Models\Database;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
@@ -11,8 +12,10 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
 
     /**
      * Set the connection name to execute statements against.
+     *
+     * @return $this
      */
-    public function setConnection(string $connection): self;
+    public function setConnection(string $connection);
 
     /**
      * Return the connection to execute statements against.
@@ -20,12 +23,12 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
     public function getConnection(): string;
 
     /**
-     * Return all the databases belonging to a server.
+     * Return all of the databases belonging to a server.
      */
     public function getDatabasesForServer(int $server): Collection;
 
     /**
-     * Return all the databases for a given host with the server relationship loaded.
+     * Return all of the databases for a given host with the server relationship loaded.
      */
     public function getDatabasesForHost(int $host, int $count = 25): LengthAwarePaginator;
 
@@ -36,8 +39,10 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
 
     /**
      * Create a new database user on a given connection.
+     *
+     * @param $max_connections
      */
-    public function createUser(string $username, string $remote, string $password, ?int $max_connections): bool;
+    public function createUser(string $username, string $remote, string $password, string $max_connections): bool;
 
     /**
      * Give a specific user access to a given database.
@@ -56,6 +61,8 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
 
     /**
      * Drop a given user on a specific connection.
+     *
+     * @return mixed
      */
     public function dropUser(string $username, string $remote): bool;
 }

app/Contracts/Repository/EggRepositoryInterface.php

@@ -1,4 +1,11 @@
 <?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;
 
@@ -21,11 +28,13 @@ interface EggRepositoryInterface extends RepositoryInterface
 
     /**
      * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
+     *
+     * @param int|string $value
      */
-    public function getWithCopyAttributes(int|string $value, string $column = 'id'): Egg;
+    public function getWithCopyAttributes($value, string $column = 'id'): Egg;
 
     /**
-     * Return all the data needed to export a service.
+     * Return all of the data needed to export a service.
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */

app/Contracts/Repository/EggVariableRepositoryInterface.php

@@ -1,4 +1,11 @@
 <?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;
 

app/Contracts/Repository/LocationRepositoryInterface.php

@@ -13,12 +13,14 @@ interface LocationRepositoryInterface extends RepositoryInterface
     public function getAllWithDetails(): Collection;
 
     /**
-     * Return all the available locations with the nodes as a relationship.
+     * Return all of the available locations with the nodes as a relationship.
      */
     public function getAllWithNodes(): Collection;
 
     /**
-     * Return all the nodes and their respective count of servers for a location.
+     * Return all of the nodes and their respective count of servers for a location.
+     *
+     * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
@@ -27,6 +29,8 @@ interface LocationRepositoryInterface extends RepositoryInterface
     /**
      * Return a location and the count of nodes in that location.
      *
+     * @return mixed
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithNodeCount(int $id): Location;

app/Contracts/Repository/NestRepositoryInterface.php

@@ -1,25 +1,37 @@
 <?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 Pterodactyl\Models\Nest;
-use Illuminate\Database\Eloquent\Collection;
 
 interface NestRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return a nest or all nests with their associated eggs and variables.
      *
+     * @param int $id
+     *
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithEggs(int $id = null): Collection|Nest;
+    public function getWithEggs(int $id = null);
 
     /**
      * Return a nest or all nests and the count of eggs and servers for that nest.
      *
+     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCounts(int $id = null): Collection|Nest;
+    public function getWithCounts(int $id = null);
 
     /**
      * Return a nest along with its associated eggs and the servers relation on those eggs.

app/Contracts/Repository/PermissionRepositoryInterface.php

@@ -1,4 +1,11 @@
 <?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;
 

app/Contracts/Repository/RepositoryInterface.php

@@ -3,67 +3,87 @@
 namespace Pterodactyl\Contracts\Repository;
 
 use Illuminate\Support\Collection;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
 interface RepositoryInterface
 {
     /**
      * Return an identifier or Model object to be used by the repository.
+     *
+     * @return string|\Closure|object
      */
-    public function model(): string;
+    public function model();
 
     /**
      * Return the model being used for this repository instance.
+     *
+     * @return mixed
      */
-    public function getModel(): Model;
+    public function getModel();
 
     /**
      * Returns an instance of a query builder.
+     *
+     * @return mixed
      */
-    public function getBuilder(): Builder;
+    public function getBuilder();
 
     /**
      * Returns the columns to be selected or returned by the query.
+     *
+     * @return mixed
      */
-    public function getColumns(): array;
+    public function getColumns();
 
     /**
      * An array of columns to filter the response by.
+     *
+     * @param array|string $columns
+     *
+     * @return $this
      */
-    public function setColumns(array|string $columns = ['*']): self;
+    public function setColumns($columns = ['*']);
 
     /**
      * Stop repository update functions from returning a fresh
      * model when changes are committed.
+     *
+     * @return $this
      */
-    public function withoutFreshModel(): self;
+    public function withoutFreshModel();
 
     /**
      * Return a fresh model with a repository updates a model.
+     *
+     * @return $this
      */
-    public function withFreshModel(): self;
+    public function withFreshModel();
 
     /**
-     * Set whether the repository should return a fresh model
+     * Set whether or not the repository should return a fresh model
      * when changes are committed.
+     *
+     * @return $this
      */
-    public function setFreshModel(bool $fresh = true): self;
+    public function setFreshModel(bool $fresh = true);
 
     /**
      * Create a new model instance and persist it to the database.
      *
+     * @return mixed
+     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function create(array $fields, bool $validate = true, bool $force = false): mixed;
+    public function create(array $fields, bool $validate = true, bool $force = false);
 
     /**
      * Find a model that has the specific ID passed.
      *
+     * @return mixed
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function find(int $id): mixed;
+    public function find(int $id);
 
     /**
      * Find a model matching an array of where clauses.
@@ -73,9 +93,11 @@ interface RepositoryInterface
     /**
      * Find and return the first matching instance for the given fields.
      *
+     * @return mixed
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function findFirstWhere(array $fields): mixed;
+    public function findFirstWhere(array $fields);
 
     /**
      * Return a count of records matching the passed arguments.
@@ -95,10 +117,14 @@ interface RepositoryInterface
     /**
      * Update a given ID with the passed array of fields.
      *
+     * @param int $id
+     *
+     * @return mixed
+     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(int $id, array $fields, bool $validate = true, bool $force = false): mixed;
+    public function update($id, array $fields, bool $validate = true, bool $force = false);
 
     /**
      * Perform a mass update where matching records are updated using whereIn.
@@ -109,9 +135,11 @@ interface RepositoryInterface
     /**
      * Update a record if it exists in the database, otherwise create it.
      *
+     * @return mixed
+     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function updateOrCreate(array $where, array $fields, bool $validate = true, bool $force = false): mixed;
+    public function updateOrCreate(array $where, array $fields, bool $validate = true, bool $force = false);
 
     /**
      * Return all records associated with the given model.

app/Contracts/Repository/ScheduleRepositoryInterface.php

@@ -8,12 +8,12 @@ use Illuminate\Support\Collection;
 interface ScheduleRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return all the schedules for a given server.
+     * Return all of the schedules for a given server.
      */
     public function findServerSchedules(int $server): Collection;
 
     /**
-     * Return a schedule model with all the associated tasks as a relationship.
+     * Return a schedule model with all of the associated tasks as a relationship.
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -67,7 +67,7 @@ interface ServerRepositoryInterface extends RepositoryInterface
     public function isUniqueUuidCombo(string $uuid, string $short): bool;
 
     /**
-     * Returns all the servers that exist for a given node in a paginated response.
+     * Returns all of the servers that exist for a given node in a paginated response.
      */
     public function loadAllServersForNode(int $node, int $limit): LengthAwarePaginator;
 }

app/Contracts/Repository/SessionRepositoryInterface.php

@@ -7,12 +7,14 @@ use Illuminate\Support\Collection;
 interface SessionRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return all the active sessions for a user.
+     * Return all of the active sessions for a user.
      */
     public function getUserSessions(int $user): Collection;
 
     /**
      * Delete a session for a given user.
+     *
+     * @return int|null
      */
-    public function deleteUserSession(int $user, string $session): ?int;
+    public function deleteUserSession(int $user, string $session);
 }

app/Contracts/Repository/SettingsRepositoryInterface.php

@@ -14,8 +14,12 @@ interface SettingsRepositoryInterface extends RepositoryInterface
 
     /**
      * Retrieve a persistent setting from the database.
+     *
+     * @param mixed $default
+     *
+     * @return mixed
      */
-    public function get(string $key, mixed $default): mixed;
+    public function get(string $key, $default);
 
     /**
      * Remove a key from the database cache.

app/Contracts/Repository/TaskRepositoryInterface.php

@@ -15,6 +15,8 @@ interface TaskRepositoryInterface extends RepositoryInterface
 
     /**
      * Returns the next task in a schedule.
+     *
+     * @return \Pterodactyl\Models\Task|null
      */
-    public function getNextTask(int $schedule, int $index): ?Task;
+    public function getNextTask(int $schedule, int $index);
 }

app/Events/ActivityLogged.php

@@ -8,8 +8,11 @@ use Illuminate\Database\Eloquent\Model;
 
 class ActivityLogged extends Event
 {
-    public function __construct(public ActivityLog $model)
+    public ActivityLog $model;
+
+    public function __construct(ActivityLog $model)
     {
+        $this->model = $model;
     }
 
     public function is(string $event): bool
@@ -22,12 +25,12 @@ class ActivityLogged extends Event
         return $this->isSystem() ? null : $this->model->actor;
     }
 
-    public function isServerEvent(): bool
+    public function isServerEvent()
     {
         return Str::startsWith($this->model->event, 'server:');
     }
 
-    public function isSystem(): bool
+    public function isSystem()
     {
         return is_null($this->model->actor_id);
     }

app/Events/Auth/DirectLogin.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace Pterodactyl\Events\Auth;
-
-use Pterodactyl\Models\User;
-use Pterodactyl\Events\Event;
-
-class DirectLogin extends Event
-{
-    public function __construct(public User $user, public bool $remember)
-    {
-    }
-}

app/Events/Auth/FailedCaptcha.php

@@ -1,18 +1,43 @@
 <?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\Events\Auth;
 
-use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class FailedCaptcha extends Event
+class FailedCaptcha
 {
     use SerializesModels;
 
     /**
-     * Create a new event instance.
+     * The IP that the request originated from.
+     *
+     * @var string
      */
-    public function __construct(public string $ip, public string $domain)
+    public $ip;
+
+    /**
+     * The domain that was used to try to verify the request with recaptcha api.
+     *
+     * @var string
+     */
+    public $domain;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param string $ip
+     * @param string $domain
+     */
+    public function __construct($ip, $domain)
     {
+        $this->ip = $ip;
+        $this->domain = $domain;
     }
 }

app/Events/Auth/FailedPasswordReset.php

@@ -1,18 +1,43 @@
 <?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\Events\Auth;
 
-use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class FailedPasswordReset extends Event
+class FailedPasswordReset
 {
     use SerializesModels;
 
     /**
-     * Create a new event instance.
+     * The IP that the request originated from.
+     *
+     * @var string
      */
-    public function __construct(public string $ip, public string $email)
+    public $ip;
+
+    /**
+     * The email address that was used when the reset request failed.
+     *
+     * @var string
+     */
+    public $email;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param string $ip
+     * @param string $email
+     */
+    public function __construct($ip, $email)
     {
+        $this->ip = $ip;
+        $this->email = $email;
     }
 }

app/Events/Auth/ProvidedAuthenticationToken.php

@@ -3,11 +3,16 @@
 namespace Pterodactyl\Events\Auth;
 
 use Pterodactyl\Models\User;
-use Pterodactyl\Events\Event;
 
-class ProvidedAuthenticationToken extends Event
+class ProvidedAuthenticationToken
 {
-    public function __construct(public User $user, public bool $recovery = false)
+    public User $user;
+
+    public bool $recovery;
+
+    public function __construct(User $user, bool $recovery = false)
     {
+        $this->user = $user;
+        $this->recovery = $recovery;
     }
 }

app/Events/Server/Created.php

@@ -1,19 +1,33 @@
 <?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\Events\Server;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Created extends Event
+class Created
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public $server;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Server/Creating.php

@@ -1,19 +1,33 @@
 <?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\Events\Server;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Creating extends Event
+class Creating
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public $server;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Server/Deleted.php

@@ -1,19 +1,33 @@
 <?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\Events\Server;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Deleted extends Event
+class Deleted
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public $server;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Server/Deleting.php

@@ -1,19 +1,33 @@
 <?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\Events\Server;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Deleting extends Event
+class Deleting
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public $server;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Server/Installed.php

@@ -11,9 +11,17 @@ class Installed extends Event
     use SerializesModels;
 
     /**
-     * Create a new event instance.
+     * @var \Pterodactyl\Models\Server
      */
-    public function __construct(public Server $server)
+    public $server;
+
+    /**
+     * Create a new event instance.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Server/Saved.php

@@ -1,19 +1,33 @@
 <?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\Events\Server;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Saved extends Event
+class Saved
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public $server;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Server/Saving.php

@@ -1,19 +1,33 @@
 <?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\Events\Server;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Saving extends Event
+class Saving
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public $server;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Server/Updated.php

@@ -1,19 +1,33 @@
 <?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\Events\Server;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Updated extends Event
+class Updated
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public $server;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Server/Updating.php

@@ -1,19 +1,33 @@
 <?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\Events\Server;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Updating extends Event
+class Updating
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Server
+     */
+    public $server;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server)
+    public function __construct(Server $server)
     {
+        $this->server = $server;
     }
 }

app/Events/Subuser/Created.php

@@ -1,19 +1,33 @@
 <?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\Events\Subuser;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Queue\SerializesModels;
 
-class Created extends Event
+class Created
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Subuser
+     */
+    public $subuser;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Subuser $subuser)
+    public function __construct(Subuser $subuser)
     {
+        $this->subuser = $subuser;
     }
 }

app/Events/Subuser/Creating.php

@@ -1,19 +1,33 @@
 <?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\Events\Subuser;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Queue\SerializesModels;
 
-class Creating extends Event
+class Creating
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Subuser
+     */
+    public $subuser;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Subuser $subuser)
+    public function __construct(Subuser $subuser)
     {
+        $this->subuser = $subuser;
     }
 }

app/Events/Subuser/Deleted.php

@@ -1,19 +1,33 @@
 <?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\Events\Subuser;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Queue\SerializesModels;
 
-class Deleted extends Event
+class Deleted
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Subuser
+     */
+    public $subuser;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Subuser $subuser)
+    public function __construct(Subuser $subuser)
     {
+        $this->subuser = $subuser;
     }
 }

app/Events/Subuser/Deleting.php

@@ -1,19 +1,33 @@
 <?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\Events\Subuser;
 
-use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Queue\SerializesModels;
 
-class Deleting extends Event
+class Deleting
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\Subuser
+     */
+    public $subuser;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public Subuser $subuser)
+    public function __construct(Subuser $subuser)
     {
+        $this->subuser = $subuser;
     }
 }

app/Events/User/Created.php

@@ -1,19 +1,33 @@
 <?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\Events\User;
 
 use Pterodactyl\Models\User;
-use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class Created extends Event
+class Created
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\User
+     */
+    public $user;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public User $user)
+    public function __construct(User $user)
     {
+        $this->user = $user;
     }
 }

app/Events/User/Creating.php

@@ -1,19 +1,33 @@
 <?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\Events\User;
 
 use Pterodactyl\Models\User;
-use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class Creating extends Event
+class Creating
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\User
+     */
+    public $user;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public User $user)
+    public function __construct(User $user)
     {
+        $this->user = $user;
     }
 }

app/Events/User/Deleted.php

@@ -1,19 +1,33 @@
 <?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\Events\User;
 
 use Pterodactyl\Models\User;
-use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class Deleted extends Event
+class Deleted
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\User
+     */
+    public $user;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public User $user)
+    public function __construct(User $user)
     {
+        $this->user = $user;
     }
 }

app/Events/User/Deleting.php

@@ -1,19 +1,33 @@
 <?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\Events\User;
 
 use Pterodactyl\Models\User;
-use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class Deleting extends Event
+class Deleting
 {
     use SerializesModels;
 
+    /**
+     * The Eloquent model of the server.
+     *
+     * @var \Pterodactyl\Models\User
+     */
+    public $user;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(public User $user)
+    public function __construct(User $user)
     {
+        $this->user = $user;
     }
 }

app/Exceptions/AccountNotFoundException.php

@@ -1,7 +1,16 @@
 <?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\Exceptions;
 
-class AccountNotFoundException extends \Exception
+use Exception;
+
+class AccountNotFoundException extends Exception
 {
 }