Merge branch 'develop' into blacktek-toml

phpstan.neon

@@ -30,7 +30,6 @@ parameters:
 		# Eloquent models
 		- '#Call to an undefined method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\)#'
 		- '#Call to an undefined static method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\)#'
-		# system/pages/highscores.php
 		-
 			message: '#Variable \$tmp in empty\(\) always exists and is always falsy#'
 			path: templates\kathrine\javascript.php

system/src/Models/Player.php

@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
  * @property string $name
  * @property int $level
  * @property int $vocation
+ * @property int $promotion
  * @property int $online
  * @property int $looktype
  * @property int $lookhead
@@ -15,7 +16,6 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
  * @property int $looklegs
  * @property int $lookfeet
  * @property int $lookaddons
- * @property int $promotion
  * @property bool $online_status
  * @property string $vocation_name
  * @property string $outfit_url