From 704e05f90ba40f795092fc73125c48d838512d1d Mon Sep 17 00:00:00 2001 From: Anand Capur Date: Thu, 25 Jul 2019 18:38:09 -0400 Subject: [PATCH 1/3] update php-cs-fixer version --- composer.json | 2 +- composer.lock | 59 ++++++++++++++++++++++++--------------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index dcac00e1d..e1bc76f5e 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "barryvdh/laravel-ide-helper": "^2.5", "codedungeon/phpunit-result-printer": "^0.17.1", "filp/whoops": "^2.1", - "friendsofphp/php-cs-fixer": "^2.11.1", + "friendsofphp/php-cs-fixer": "^2.15.1", "fzaninotto/faker": "^1.6", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", diff --git a/composer.lock b/composer.lock index c5530927e..714d18675 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8a99f4996405b8080a0dcabb2609c39d", + "content-hash": "175a2431d23dd32f79b42bbc8030ace1", "packages": [ { "name": "appstract/laravel-blade-directives", @@ -46,9 +46,9 @@ "authors": [ { "name": "Gijs Jorissen", + "role": "Developer", "email": "hello@appstract.team", - "homepage": "https://appstract.team", - "role": "Developer" + "homepage": "https://appstract.team" } ], "description": "Handy Blade directives", @@ -973,12 +973,12 @@ "version": "3.0.0", "source": { "type": "git", - "url": "https://github.com/ivanakimov/hashids.php.git", + "url": "https://github.com/vinkla/hashids.git", "reference": "b6c61142bfe36d43740a5419d11c351dddac0458" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ivanakimov/hashids.php/zipball/b6c61142bfe36d43740a5419d11c351dddac0458", + "url": "https://api.github.com/repos/vinkla/hashids/zipball/b6c61142bfe36d43740a5419d11c351dddac0458", "reference": "b6c61142bfe36d43740a5419d11c351dddac0458", "shasum": "" }, @@ -2149,8 +2149,8 @@ "authors": [ { "name": "Antonio Carlos Ribeiro", - "email": "acr@antoniocarlosribeiro.com", - "role": "Creator & Designer" + "role": "Creator & Designer", + "email": "acr@antoniocarlosribeiro.com" } ], "description": "A One Time Password Authentication package, compatible with Google Authenticator.", @@ -2259,9 +2259,9 @@ "authors": [ { "name": "Dries Vints", + "role": "Maintainer", "email": "dries.vints@gmail.com", - "homepage": "http://driesvints.com", - "role": "Maintainer" + "homepage": "http://driesvints.com" } ], "description": "Prologue Alerts is a package that handles global site messages.", @@ -2720,9 +2720,9 @@ "authors": [ { "name": "Jarek Tkaczyk", + "role": "Developer", "email": "jarek@softonsofa.com", - "homepage": "https://softonsofa.com/", - "role": "Developer" + "homepage": "https://softonsofa.com/" } ], "description": "Flexible Searchable, Mappable, Metable, Validation and more extensions for Laravel Eloquent ORM.", @@ -2822,9 +2822,9 @@ "authors": [ { "name": "Jarek Tkaczyk", + "role": "Developer", "email": "jarek@softonsofa.com", - "homepage": "http://softonsofa.com/", - "role": "Developer" + "homepage": "http://softonsofa.com/" } ], "description": "Laravel Eloquent hooks system.", @@ -4968,16 +4968,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.13.1", + "version": "v2.15.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161" + "reference": "20064511ab796593a3990669eff5f5b535001f7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/54814c62d5beef3ba55297b9b3186ed8b8a1b161", - "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/20064511ab796593a3990669eff5f5b535001f7c", + "reference": "20064511ab796593a3990669eff5f5b535001f7c", "shasum": "" }, "require": { @@ -4986,7 +4986,7 @@ "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", - "php": "^5.6 || >=7.0 <7.3", + "php": "^5.6 || ^7.0", "php-cs-fixer/diff": "^1.3", "symfony/console": "^3.4.17 || ^4.1.6", "symfony/event-dispatcher": "^3.0 || ^4.0", @@ -4998,21 +4998,18 @@ "symfony/process": "^3.0 || ^4.0", "symfony/stopwatch": "^3.0 || ^4.0" }, - "conflict": { - "hhvm": "*" - }, "require-dev": { "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.1", + "keradus/cli-executor": "^1.2", "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.1", "php-cs-fixer/accessible-object": "^1.0", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1", "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", - "phpunitgoodpractices/traits": "^1.5.1", - "symfony/phpunit-bridge": "^4.0" + "phpunitgoodpractices/traits": "^1.8", + "symfony/phpunit-bridge": "^4.3" }, "suggest": { "ext-mbstring": "For handling non-UTF8 characters in cache signature.", @@ -5055,7 +5052,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2018-10-21T00:32:10+00:00" + "time": "2019-06-01T10:32:12+00:00" }, { "name": "fzaninotto/faker", @@ -6102,8 +6099,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -6375,8 +6372,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "The PHP Unit Testing framework.", From a15079063052a3ef5f7d3f9f7d292dbe70dba978 Mon Sep 17 00:00:00 2001 From: Anand Capur Date: Thu, 25 Jul 2019 18:43:35 -0400 Subject: [PATCH 2/3] update insurgency steam app id (closes #1602) Co-authored-by: Richard Moore --- database/seeds/eggs/source-engine/egg-insurgency.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/seeds/eggs/source-engine/egg-insurgency.json b/database/seeds/eggs/source-engine/egg-insurgency.json index 4e3df4a8e..950743fdd 100644 --- a/database/seeds/eggs/source-engine/egg-insurgency.json +++ b/database/seeds/eggs/source-engine/egg-insurgency.json @@ -27,10 +27,10 @@ "name": "Game ID", "description": "The ID corresponding to the game to download and run using SRCDS.", "env_variable": "SRCDS_APPID", - "default_value": "17705", + "default_value": "237410", "user_viewable": 1, "user_editable": 0, - "rules": "required|regex:\/^(17705)$\/" + "rules": "required|regex:\/^(237410)$\/" }, { "name": "Game Name", @@ -51,4 +51,4 @@ "rules": "required|regex:\/^(\\w{1,20})$\/" } ] -} \ No newline at end of file +} From 09f2d538fa1e15208452002121f9abbfa1bba560 Mon Sep 17 00:00:00 2001 From: Anand Capur Date: Fri, 26 Jul 2019 00:32:01 -0400 Subject: [PATCH 3/3] update teamspeak egg (closes #1628) Co-authored-by: Michael (Parker) Parker --- .../voice-servers/egg-teamspeak3-server.json | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json index 2058ec225..d3d889bc0 100644 --- a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json +++ b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-01T16:35:15+00:00", + "exported_at": "2019-07-05T11:59:29-04:00", "name": "Teamspeak3 Server", "author": "support@pterodactyl.io", "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.", - "image": "quay.io\/pterodactyl\/core:glibc", - "startup": ".\/ts3server_minimal_runscript.sh default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}} license_accepted=1", + "image": "quay.io/parkervcp/pterodactyl-images:base_debian", + "startup": "./ts3server default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} license_accepted=1", "config": { "files": "{}", - "startup": "{\"done\": \"listening on 0.0.0.0:\", \"userInteraction\": []}", - "logs": "{\"custom\": true, \"location\": \"logs\/ts3.log\"}", + "startup": "{\r\n \"done\": \"listening on 0.0.0.0:\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs/ts3.log\"\r\n}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\n# TS3 Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add tar curl\n\ncd \/mnt\/server\n\ncurl http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", + "script": "#!/bin/ash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: /mnt/server\r\napk add --no-cache tar curl jq\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(wget https://teamspeak.com/versions/server.json -qO - | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd /mnt/server\r\n\r\n\r\necho -e \"getting files from http://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\"\r\ncurl http://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", "container": "alpine:3.9", "entrypoint": "ash" } @@ -27,10 +27,19 @@ "name": "Server Version", "description": "The version of Teamspeak 3 to use when running the server.", "env_variable": "TS_VERSION", - "default_value": "3.7.1", + "default_value": "latest", "user_viewable": 1, "user_editable": 1, - "rules": "required|regex:\/^([0-9_\\.-]{5,10})$\/" + "rules": "required|string|max:6" + }, + { + "name": "File Transfer Port", + "description": "The Teamspeak file transfer port", + "env_variable": "FILE_TRANSFER", + "default_value": "30033", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|integer|between:1,65535" } ] -} \ No newline at end of file +}