Merge branch 'develop' into dane/restore-backups

Author: DaneEveritt

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Create release archive
         run: |
           rm -rf node_modules/ test/ codecov.yml CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.dusk.xml phpunit.xml Vagrantfile
-          tar -czf panel.tar.gz * .env.example
+          tar -czf panel.tar.gz * .env.example .babel-plugin-macrosrc.js
 
       - name: Extract changelog
         id: extract_changelog

.php_cs.dist

@@ -23,6 +23,17 @@ return (new Config())
         'ordered_imports' => [
             'sortAlgorithm' => 'length',
         ],
+        'phpdoc_align' => [
+            'align' => 'left',
+            'tags' => [
+                'param',
+                'property',
+                'return',
+                'throws',
+                'type',
+                'var',
+            ],
+        ],
         'random_api_migration' => true,
         'ternary_to_null_coalescing' => true,
         'yoda_style' => [

app/Contracts/Extensions/HashidsInterface.php

@@ -17,7 +17,7 @@ interface HashidsInterface extends VendorHashidsInterface
      * Decode an encoded hashid and return the first result.
      *
      * @param string $encoded
-     * @param null   $default
+     * @param null $default
      *
      * @return mixed
      *

app/Exceptions/DisplayException.php

@@ -26,7 +26,7 @@ class DisplayException extends PterodactylException
      *
      * @param string $message
      * @param string $level
-     * @param int    $code
+     * @param int $code
      */
     public function __construct($message, Throwable $previous = null, $level = self::LEVEL_ERROR, $code = 0)
     {

app/Extensions/DynamicDatabaseConnection.php

@@ -51,9 +51,9 @@ public function __construct(
     /**
      * Adds a dynamic database connection entry to the runtime config.
      *
-     * @param string                               $connection
+     * @param string $connection
      * @param \Pterodactyl\Models\DatabaseHost|int $host
-     * @param string                               $database
+     * @param string $database
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -88,7 +88,7 @@ function ($user, $password) {
      * form with a note telling them their password was changed and to log back in.
      *
      * @param \Illuminate\Contracts\Auth\CanResetPassword|\Pterodactyl\Models\User $user
-     * @param string                                                               $password
+     * @param string $password
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException

app/Http/Requests/Admin/Egg/EggFormRequest.php

@@ -22,7 +22,7 @@ public function rules()
             'name' => 'required|string|max:191',
             'description' => 'nullable|string',
             'docker_images' => 'required|string',
-            'file_denylist' => 'string',
+            'file_denylist' => 'array',
             'startup' => 'required|string',
             'config_from' => 'sometimes|bail|nullable|numeric',
             'config_stop' => 'required_without:config_from|nullable|string|max:191',

app/Models/Allocation.php

@@ -3,19 +3,19 @@
 namespace Pterodactyl\Models;
 
 /**
- * @property int                             $id
- * @property int                             $node_id
- * @property string                          $ip
- * @property string|null                     $ip_alias
- * @property int                             $port
- * @property int|null                        $server_id
- * @property string|null                     $notes
- * @property \Carbon\Carbon|null             $created_at
- * @property \Carbon\Carbon|null             $updated_at
- * @property string                          $alias
- * @property bool                            $has_alias
+ * @property int $id
+ * @property int $node_id
+ * @property string $ip
+ * @property string|null $ip_alias
+ * @property int $port
+ * @property int|null $server_id
+ * @property string|null $notes
+ * @property \Carbon\Carbon|null $created_at
+ * @property \Carbon\Carbon|null $updated_at
+ * @property string $alias
+ * @property bool $has_alias
  * @property \Pterodactyl\Models\Server|null $server
- * @property \Pterodactyl\Models\Node        $node
+ * @property \Pterodactyl\Models\Node $node
  */
 class Allocation extends Model
 {

app/Models/ApiKey.php

@@ -5,16 +5,16 @@
 use Pterodactyl\Services\Acl\Api\AdminAcl;
 
 /**
- * @property int                 $id
- * @property int                 $user_id
- * @property int                 $key_type
- * @property string              $identifier
- * @property string              $token
- * @property array               $allowed_ips
- * @property string              $memo
+ * @property int $id
+ * @property int $user_id
+ * @property int $key_type
+ * @property string $identifier
+ * @property string $token
+ * @property array $allowed_ips
+ * @property string $memo
  * @property \Carbon\Carbon|null $last_used_at
- * @property \Carbon\Carbon      $created_at
- * @property \Carbon\Carbon      $updated_at
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
  */
 class ApiKey extends Model
 {

app/Models/Backup.php

@@ -5,21 +5,21 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * @property int                          $id
- * @property int                          $server_id
- * @property string                       $uuid
- * @property bool                         $is_successful
- * @property string                       $name
- * @property string[]                     $ignored_files
- * @property string                       $disk
- * @property string|null                  $checksum
- * @property int                          $bytes
- * @property string|null                  $upload_id
+ * @property int $id
+ * @property int $server_id
+ * @property string $uuid
+ * @property bool $is_successful
+ * @property string $name
+ * @property string[] $ignored_files
+ * @property string $disk
+ * @property string|null $checksum
+ * @property int $bytes
+ * @property string|null $upload_id
  * @property \Carbon\CarbonImmutable|null $completed_at
- * @property \Carbon\CarbonImmutable      $created_at
- * @property \Carbon\CarbonImmutable      $updated_at
+ * @property \Carbon\CarbonImmutable $created_at
+ * @property \Carbon\CarbonImmutable $updated_at
  * @property \Carbon\CarbonImmutable|null $deleted_at
- * @property \Pterodactyl\Models\Server   $server
+ * @property \Pterodactyl\Models\Server $server
  */
 class Backup extends Model
 {