merge

Author: KasperFranz

.dev/vagrant/motd.txt

@@ -13,5 +13,5 @@ Default panel users:
 
 MySQL is accessible using root/pterodactyl or pterodactyl/pterodactyl
 
-Services for pteroq and mailhog are running
+Service for pteroq and mailhog are running
 #####################################################

.env.example

@@ -16,6 +16,9 @@ DB_PASSWORD=secret
 CACHE_DRIVER=file
 SESSION_DRIVER=database
 
+HASHIDS_SALT=
+HASHIDS_LENGTH=8
+
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
@@ -24,10 +27,6 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM=you@example.com
 
-API_PREFIX=api
-API_VERSION=v1
-API_DEBUG=false
-
 QUEUE_DRIVER=database
 QUEUE_HIGH=high
 QUEUE_STANDARD=standard

.env.travis

@@ -0,0 +1,18 @@
+APP_ENV=testing
+APP_DEBUG=true
+APP_KEY=SomeRandomString3232RandomString
+APP_THEME=pterodactyl
+APP_TIMEZONE=UTC
+APP_URL=http://localhost/
+
+DB_HOST=127.0.0.1
+DB_DATABASE=travis
+DB_USERNAME=root
+DB_PASSWORD=""
+
+CACHE_DRIVER=array
+SESSION_DRIVER=array
+MAIL_DRIVER=array
+QUEUE_DRIVER=sync
+
+HASHIDS_SALT=test123

.gitignore

@@ -23,3 +23,4 @@ docker-compose.yml
 # for image related files
 misc
 .phpstorm.meta.php
+.php_cs.cache

.php_cs

@@ -1,7 +1,48 @@
 <?php
 
-require_once __DIR__ . '/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
+$finder = PhpCsFixer\Finder::create()
+    ->in([
+        'app',
+        'bootstrap',
+        'config',
+        'database',
+        'resources/lang',
+        'routes',
+        'tests',
+    ]);
 
-use SLLH\StyleCIBridge\ConfigBridge;
-
-return ConfigBridge::create();
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        '@PSR1' => true,
+        '@PSR2' => true,
+        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
+        'array_syntax' => ['syntax' => 'short'],
+        'blank_line_before_return' => true,
+        'blank_line_before_statement' => false,
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => ['space' => 'single'],
+        'heredoc_to_nowdoc' => true,
+        'linebreak_after_opening_tag' => true,
+        'method_argument_space' => [
+            'ensure_fully_multiline' => false,
+            'keep_multiple_spaces_after_comma' => false,
+        ],
+        'new_with_braces' => false,
+        'no_alias_functions' => true,
+        'no_multiline_whitespace_before_semicolons' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_return' => true,
+        'not_operator_with_successor_space' => true,
+        'ordered_imports' => [
+            'sortAlgorithm' => 'length',
+        ],
+        'phpdoc_align' => ['tags' => ['param']],
+        'phpdoc_separation' => false,
+        'protected_to_private' => false,
+        'psr0' => ['dir' => 'app'],
+        'psr4' => true,
+        'random_api_migration' => true,
+        'standardize_not_equals' => true,
+    ])->setRiskyAllowed(true)->setFinder($finder);

.styleci.yml

@@ -4,3 +4,4 @@ disabled:
   - concat_without_spaces
 enabled:
   - concat_with_spaces
+  - no_unused_imports

.travis.yml

@@ -0,0 +1,32 @@
+language: php
+dist: trusty
+php:
+  - '7.0'
+  - '7.1'
+#  - '7.2'
+sudo: false
+cache:
+  directories:
+    - $HOME/.composer/cache
+services:
+  - mysql
+before_install:
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+before_script:
+  - cp .env.travis .env
+  - composer install --no-interaction --prefer-dist --no-suggest --verbose
+  - php artisan migrate --seed -v
+script:
+  - vendor/bin/phpunit --coverage-clover coverage.xml
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://misc.schrej.net/travistodiscord/pterodev.php
+    on_success: change
+    on_failure: always
+    on_error: always
+    on_cancel: always
+    on_start: never
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -249,7 +249,7 @@ spatie/laravel-fractal (4.0.0 => 4.0.1)
 * New theme applied to Admin CP. Many graphical changes were made, some data was moved around and some display data changed. Too much was changed to feasibly log it all in here. Major breaking changes or notable new features will be logged.
 * New server creation page now makes significantly less AJAX calls and is much quicker to respond.
 * Server and Node view pages wee modified to split tabs into individual pages to make re-themeing and modifications significantly easier, and reduce MySQL query loads on page.
-* `[pre.4]` — Services and Pack magement overhauled to be faster, cleaner, and more extensible in the future.
+* `[pre.4]` — Service and Pack magement overhauled to be faster, cleaner, and more extensible in the future.
 * Most of the backend `UnhandledException` display errors now include a clearer error that directs admins to the program's logs.
 * Table seeders for services now can be run during upgrades and will attempt to locate and update, or create new if not found in the database.
 * Many structural changes to the database and `Pterodactyl\Models` classes that would flood this changelog if they were all included. All required migrations included to handle database changes.

README.md

@@ -1,5 +1,7 @@
 [![Logo Image](https://cdn.pterodactyl.io/logos/Banner%20Logo%20Black@2x.png)](https://pterodactyl.io)
 
+[![Build Status](https://travis-ci.org/Pterodactyl/Panel.svg?branch=develop)](https://travis-ci.org/Pterodactyl/Panel) [![StyleCI](https://styleci.io/repos/47508644/shield?branch=develop)](https://styleci.io/repos/47508644) [![codecov](https://codecov.io/gh/Pterodactyl/Panel/branch/develop/graph/badge.svg)](https://codecov.io/gh/Pterodactyl/Panel)
+
 ## Pterodactyl Panel
 Pterodactyl Panel is the free, open-source, game agnostic, self-hosted control panel for users, networks, and game service providers. Pterodactyl supports games and servers such as Minecraft (including Spigot, Bungeecord, and Sponge), ARK: Evolution Evolved, CS:GO, Team Fortress 2, Insurgency, Teamspeak 3, Mumble, and many more. Control all of your games from one unified interface.
 
@@ -33,42 +35,44 @@ SOFTWARE.
 ![](http://static.s3.pterodactyl.io/PhraseApp-parrot.png)
 A huge thanks to [PhraseApp](https://phraseapp.com) who provide us the software to help translate this project.
 
-Ace Editor - [license](https://github.com/ajaxorg/ace/blob/master/LICENSE) - [homepage](https://ace.c9.io)
+Ace Editor — [license](https://github.com/ajaxorg/ace/blob/master/LICENSE) — [homepage](https://ace.c9.io)
 
-AdminLTE - [license](https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE) - [homepage](https://almsaeedstudio.com)
+AdminLTE — [license](https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE) — [homepage](https://almsaeedstudio.com)
 
-Animate.css - [license](https://github.com/daneden/animate.css/blob/master/LICENSE) - [homepage](http://daneden.github.io/animate.css/)
+Animate.css — [license](https://github.com/daneden/animate.css/blob/master/LICENSE) — [homepage](http://daneden.github.io/animate.css/)
 
-AnsiUp - [license](https://github.com/drudru/ansi_up/blob/master/Readme.md#license) - [homepage](https://github.com/drudru/ansi_up)
+AnsiUp — [license](https://github.com/drudru/ansi_up/blob/master/Readme.md#license) — [homepage](https://github.com/drudru/ansi_up)
 
-Async.js - [license](https://github.com/caolan/async/blob/master/LICENSE) - [homepage](https://github.com/caolan/async/)
+Async.js — [license](https://github.com/caolan/async/blob/master/LICENSE) — [homepage](https://github.com/caolan/async/)
 
-Bootstrap - [license](https://github.com/twbs/bootstrap/blob/master/LICENSE) - [homepage](http://getbootstrap.com)
+Bootstrap — [license](https://github.com/twbs/bootstrap/blob/master/LICENSE) — [homepage](http://getbootstrap.com)
 
-BootStrap Notify - [license](https://github.com/mouse0270/bootstrap-notify/blob/master/LICENSE) - [homepage](http://bootstrap-notify.remabledesigns.com)
+BootStrap Notify — [license](https://github.com/mouse0270/bootstrap-notify/blob/master/LICENSE) — [homepage](http://bootstrap-notify.remabledesigns.com)
 
-Chart.js - [license](https://github.com/chartjs/Chart.js/blob/master/LICENSE.md) - [homepage](http://www.chartjs.org)
+Chart.js — [license](https://github.com/chartjs/Chart.js/blob/master/LICENSE.md) — [homepage](http://www.chartjs.org)
 
-FontAwesome - [license](http://fontawesome.io/license/) - [homepage](http://fontawesome.io)
+FontAwesome — [license](http://fontawesome.io/license/) — [homepage](http://fontawesome.io)
 
-FontAwesome Animations - [license](https://github.com/l-lin/font-awesome-animation#license) - [homepage](https://github.com/l-lin/font-awesome-animation)
+FontAwesome Animations — [license](https://github.com/l-lin/font-awesome-animation#license) — [homepage](https://github.com/l-lin/font-awesome-animation)
 
-jQuery - [license](https://github.com/jquery/jquery/blob/master/LICENSE.txt) - [homepage](http://jquery.com)
+jQuery — [license](https://github.com/jquery/jquery/blob/master/LICENSE.txt) — [homepage](http://jquery.com)
 
-Laravel Framework - [license](https://github.com/laravel/framework/blob/5.4/LICENSE.md) - [homepage](https://laravel.com)
+Laravel Framework — [license](https://github.com/laravel/framework/blob/5.4/LICENSE.md) — [homepage](https://laravel.com)
 
-Lodash - [license](https://github.com/lodash/lodash/blob/master/LICENSE) - [homepage](https://lodash.com/)
+Lodash — [license](https://github.com/lodash/lodash/blob/master/LICENSE) — [homepage](https://lodash.com/)
 
-Select2 - [license](https://github.com/select2/select2/blob/master/LICENSE.md) - [homepage](https://select2.github.io)
+Select2 — [license](https://github.com/select2/select2/blob/master/LICENSE.md) — [homepage](https://select2.github.io)
 
-Socket.io - [license](https://github.com/socketio/socket.io/blob/master/LICENSE) - [homepage](http://socket.io)
+Socket.io — [license](https://github.com/socketio/socket.io/blob/master/LICENSE) — [homepage](http://socket.io)
 
-Socket.io File Upload - [license](https://github.com/vote539/socketio-file-upload/blob/master/server.js#L1-L27) - [homepage](https://github.com/vote539/socketio-file-upload)
+Socket.io File Upload — [license](https://github.com/vote539/socketio-file-upload/blob/master/server.js#L1-L27) — [homepage](https://github.com/vote539/socketio-file-upload)
 
-SweetAlert - [license](https://github.com/t4t5/sweetalert/blob/master/LICENSE) - [homepage](http://t4t5.github.io/sweetalert/)
+SweetAlert — [license](https://github.com/t4t5/sweetalert/blob/master/LICENSE) — [homepage](http://t4t5.github.io/sweetalert/)
 
 Typeahead — [license](https://github.com/bassjobsen/Bootstrap-3-Typeahead/blob/master/bootstrap3-typeahead.js) — [homepage](https://github.com/bassjobsen/Bootstrap-3-Typeahead)
 
+particles.js — [license](https://github.com/VincentGarreau/particles.js/blob/master/LICENSE.md) — [homepage](http://vincentgarreau.com/particles.js/)
+
 ### Additional License Information
 Some Javascript and CSS used within the panel is licensed under a `MIT` or `Apache 2.0`. Please check their respective header files for more information.
 

app/Console/Commands/AddLocation.php

@@ -31,12 +31,12 @@ class AddLocation extends Command
 {
     protected $data = [];
 
-     /**
-      * The name and signature of the console command.
-      *
-      * @var string
-      */
-     protected $signature = 'pterodactyl:location
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'pterodactyl:location
                              {--short= : The shortcode name of this location (ex. us1).}
                              {--long= : A longer description of this location.}';
 
@@ -49,8 +49,6 @@ class AddLocation extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
     public function __construct()
     {