Skip to content

Commit 4927af2

Browse files
DaneEverittDaneEveritt
authored
Merge pull request pterodactyl#949 from Pterodactyl/release/v0.7.0
Merge v0.7.0 into master
2 parents f8a5a08 + 8eed294 commit 4927af2

File tree

961 files changed

+51809
-21021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

961 files changed

+51809
-21021
lines changed

‎.dev/vagrant/motd.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ Default panel users:
1313

1414
MySQL is accessible using root/pterodactyl or pterodactyl/pterodactyl
1515

16-
Services for pteroq and mailhog are running
16+
Service for pteroq and mailhog are running
1717
#####################################################

‎.dev/vagrant/provision.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ composer install --no-progress
6565
php artisan key:generate --force
6666
php artisan migrate
6767
php artisan db:seed
68-
php artisan pterodactyl:user --firstname Test --lastname Admin --username admin --email testadmin@pterodactyl.io --password Ptero123 --admin 1
69-
php artisan pterodactyl:user --firstname Test --lastname User --username user --email testuser@pterodactyl.io --password Ptero123 --admin 0
68+
php artisan p:user:make --name-first Test --name-last Admin --username admin --email testadmin@pterodactyl.io --password Ptero123 --admin 1
69+
php artisan p:user:make --name-first Test --name-last User --username user --email testuser@pterodactyl.io --password Ptero123 --admin 0
7070

7171
echo "Add queue cronjob and start queue worker"
7272
(crontab -l 2>/dev/null; echo "* * * * * php /var/www/html/pterodactyl/artisan schedule:run >> /dev/null 2>&1") | crontab -

‎.env.example‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,29 @@
11
APP_ENV=production
22
APP_DEBUG=false
3-
APP_KEY=SomeRandomString3232RandomString
3+
APP_KEY=
44
APP_THEME=pterodactyl
5-
APP_TIMEZONE=UTC
5+
APP_TIMEZONE=America/New_York
66
APP_CLEAR_TASKLOG=720
77
APP_DELETE_MINUTES=10
8-
APP_URL=http://yoursite.com/
8+
APP_ENVIRONMENT_ONLY=true
99

10-
DB_HOST=localhost
10+
DB_HOST=127.0.0.1
1111
DB_PORT=3306
12-
DB_DATABASE=homestead
13-
DB_USERNAME=homestead
14-
DB_PASSWORD=secret
12+
DB_DATABASE=panel
13+
DB_USERNAME=pterodactyl
14+
DB_PASSWORD=
1515

16-
CACHE_DRIVER=file
17-
SESSION_DRIVER=database
16+
HASHIDS_SALT=
17+
HASHIDS_LENGTH=8
1818

1919
MAIL_DRIVER=smtp
2020
MAIL_HOST=mailtrap.io
2121
MAIL_PORT=2525
22-
MAIL_USERNAME=null
23-
MAIL_PASSWORD=null
24-
MAIL_ENCRYPTION=null
25-
MAIL_FROM=you@example.com
22+
MAIL_USERNAME=
23+
MAIL_PASSWORD=
24+
MAIL_ENCRYPTION=tls
25+
MAIL_FROM=no-reply@example.com
2626

27-
API_PREFIX=api
28-
API_VERSION=v1
29-
API_DEBUG=false
30-
31-
QUEUE_DRIVER=database
3227
QUEUE_HIGH=high
3328
QUEUE_STANDARD=standard
3429
QUEUE_LOW=low
35-
36-
SQS_KEY=aws-public
37-
SQS_SECRET=aws-secret
38-
SQS_QUEUE_PREFIX=aws-queue-prefix

‎.env.travis‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
APP_ENV=testing
2+
APP_DEBUG=true
3+
APP_KEY=SomeRandomString3232RandomString
4+
APP_THEME=pterodactyl
5+
APP_TIMEZONE=UTC
6+
APP_URL=http://localhost/
7+
8+
DB_HOST=127.0.0.1
9+
DB_DATABASE=travis
10+
DB_USERNAME=root
11+
DB_PASSWORD=""
12+
13+
CACHE_DRIVER=array
14+
SESSION_DRIVER=array
15+
MAIL_DRIVER=array
16+
QUEUE_DRIVER=sync
17+
18+
HASHIDS_SALT=test123
19+
APP_ENVIRONMENT_ONLY=true

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ If you're just making a suggestion, be descriptive, and link to any issues that
44

55
You can delete from this line up.
66
---------------------
7+
8+
* Panel or Daemon:
9+
* Version of Panel/Daemon:
10+
* Server's OS:
11+
* Your Computer's OS & Browser:
12+
13+
## Add Details Below:
14+

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
.vscode/*
66
storage/framework/*
77
/.idea
8+
/nbproject
89

10+
package-lock.json
911
composer.lock
1012
node_modules
1113

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

‎.php_cs‎

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,55 @@
11
<?php
22

3-
require_once __DIR__ . '/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
3+
$finder = PhpCsFixer\Finder::create()
4+
->in([
5+
'app',
6+
'bootstrap',
7+
'config',
8+
'database',
9+
'resources/lang',
10+
'routes',
11+
'tests',
12+
]);
413

5-
use SLLH\StyleCIBridge\ConfigBridge;
6-
7-
return ConfigBridge::create();
14+
return PhpCsFixer\Config::create()
15+
->setRules([
16+
'@Symfony' => true,
17+
'@PSR1' => true,
18+
'@PSR2' => true,
19+
'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
20+
'array_syntax' => ['syntax' => 'short'],
21+
'blank_line_before_return' => true,
22+
'blank_line_before_statement' => false,
23+
'combine_consecutive_unsets' => true,
24+
'concat_space' => ['spacing' => 'one'],
25+
'declare_equal_normalize' => ['space' => 'single'],
26+
'heredoc_to_nowdoc' => true,
27+
'increment_style' => ['style' => 'post'],
28+
'linebreak_after_opening_tag' => true,
29+
'method_argument_space' => [
30+
'ensure_fully_multiline' => false,
31+
'keep_multiple_spaces_after_comma' => false,
32+
],
33+
'new_with_braces' => false,
34+
'no_alias_functions' => true,
35+
'no_multiline_whitespace_before_semicolons' => true,
36+
'no_unreachable_default_argument_value' => true,
37+
'no_useless_return' => true,
38+
'not_operator_with_successor_space' => true,
39+
'ordered_imports' => [
40+
'sortAlgorithm' => 'length',
41+
],
42+
'phpdoc_align' => ['tags' => ['param']],
43+
'phpdoc_separation' => false,
44+
'protected_to_private' => false,
45+
'psr0' => ['dir' => 'app'],
46+
'psr4' => true,
47+
'random_api_migration' => true,
48+
'standardize_not_equals' => true,
49+
'ternary_to_null_coalescing' => true,
50+
'yoda_style' => [
51+
'equal' => false,
52+
'identical' => false,
53+
'less_and_greater' => false,
54+
],
55+
])->setRiskyAllowed(true)->setFinder($finder);

‎.styleci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ disabled:
44
- concat_without_spaces
55
enabled:
66
- concat_with_spaces
7+
- no_unused_imports

‎.travis.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
language: php
2+
dist: trusty
3+
php:
4+
- 7.2
5+
sudo: false
6+
cache:
7+
directories:
8+
- $HOME/.composer/cache
9+
services:
10+
- mysql
11+
before_install:
12+
- mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
13+
before_script:
14+
- echo 'opcache.enable_cli=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
15+
- cp .env.travis .env
16+
- travis_retry composer install --no-interaction --prefer-dist --no-suggest
17+
- php artisan migrate --seed
18+
script:
19+
- vendor/bin/phpunit --coverage-clover coverage.xml
20+
notifications:
21+
email: false
22+
webhooks:
23+
urls:
24+
- https://misc.schrej.net/travistodiscord/pterodev.php
25+
on_success: change
26+
on_failure: always
27+
on_error: always
28+
on_cancel: always
29+
on_start: never
30+
after_success:
31+
- bash <(curl -s https://codecov.io/bash)

0 commit comments

Comments
 (0)