Merge branch 'master' into develop

Author: InkoHX

.scrutinizer.yml

@@ -18,10 +18,6 @@ changetracking:
   bug_patterns: ["\bfix(?:es|ed)?\b"]
   feature_patterns: ["\badd(?:s|ed)?\b", "\bimplement(?:s|ed)?\b"]
 
-checks:
-  php:
-    sql_injection_vulnerabilities: true
-
 coding_style:
   php:
     indentation:
@@ -125,4 +121,4 @@ coding_style:
       keywords:
         general: lower
       constants:
-        true_false_null: lower
+        true_false_null: lower

src/VectorNetworkProject/DataProvider/Main.php

@@ -37,7 +37,7 @@ public function onEnable()
 
 	public function onDisable()
 	{
-		if($this->connector !== null)
+		if ($this->connector !== null)
 		{
 			$this->connector->close();
 		}

src/VectorNetworkProject/DataProvider/Tables/Accounts/Accounts.php

@@ -30,8 +30,7 @@ public function init(): void
 	 * @param callable|null $onInserted
 	 * @param callable|null $onError
 	 */
-	public function register(IPlayer $player, ?callable $onInserted = null, ?callable $onError = null)
-	{
+	public function register(IPlayer $player, ?callable $onInserted = null, ?callable $onError = null) {
 		$this->connector->executeInsert(self::ACCOUNT_REGISTER, [$player->getName()], $onInserted, $onError);
 	}
 
@@ -42,8 +41,7 @@ public function register(IPlayer $player, ?callable $onInserted = null, ?callabl
 	 * @param callable|null $onSuccess
 	 * @param callable|null $onError
 	 */
-	public function unregister(IPlayer $player, ?callable $onSuccess = null, ?callable $onError = null)
-	{
+	public function unregister(IPlayer $player, ?callable $onSuccess = null, ?callable $onError = null) {
 		$this->connector->executeChange(self::ACCOUNT_UNREGISTER, [$player->getName()], $onSuccess, $onError);
 	}
 
@@ -54,7 +52,7 @@ public function unregister(IPlayer $player, ?callable $onSuccess = null, ?callab
 	 * @param callable|null $onSelect
 	 * @param callable|null $onError
 	 */
-	public function get(IPlayer $player, ?callable $onSelect = null, ?callable $onError = null){
+	public function get(IPlayer $player, ?callable $onSelect = null, ?callable $onError = null) {
 		$this->connector->executeSelect(self::ACCOUNT_GET, [$player->getName()], $onSelect, $onError);
 	}
 }

src/VectorNetworkProject/DataProvider/Tables/Dual/Dual.php

@@ -13,11 +13,11 @@
 
 class Dual extends TableBase
 {
-	public const INIT			= 'userdataprovider.duel.init';
-	public const REGISTER		= 'userdataprovider.duel.register';
+	public const INIT = 'userdataprovider.duel.init';
+	public const REGISTER = 'userdataprovider.duel.register';
 	public const UNREGISTER		= 'userdataprovider.duel.unregister';
-	public const GET			= 'userdataprovider.duel.get';
-	public const ADD_COUNT		= 'userdataprovider.duel.add';
+	public const GET = 'userdataprovider.duel.get';
+	public const ADD_COUNT = 'userdataprovider.duel.addcount';
 	public const GET_RANKING	= 'userdataprovider.duel.getrankingbywin';
 
 	public function init(): void

src/VectorNetworkProject/DataProvider/Tables/FFAPvP/FFAPvP.php

@@ -13,11 +13,11 @@
 
 class FFAPvP extends TableBase
 {
-	public const INIT					= 'userdataprovider.ffapvp.init';
-	public const REGISTER				= 'userdataprovider.ffapvp.register';
-	public const UNREGISTER				= 'userdataprovider.ffapvp.unregister';
-	public const GET					= 'userdataprovider.ffapvp.get';
-	public const ADD_COUNT				= 'userdataprovider.ffapvp.add';
+	public const INIT = 'userdataprovider.ffapvp.init';
+	public const REGISTER = 'userdataprovider.ffapvp.register';
+	public const UNREGISTER = 'userdataprovider.ffapvp.unregister';
+	public const GET = 'userdataprovider.ffapvp.get';
+	public const ADD_COUNT = 'userdataprovider.ffapvp.addcount';
 	public const GET_RANKING_BY_KILL	= 'userdataprovider.ffapvp.getrankingbykill';
 	public const GET_RANKING_BY_EXP		= 'userdataprovider.ffapvp.getrankingbyexp';
 
@@ -48,7 +48,7 @@ public function register(IPLayer $player, ?callable $onInserted = null, ?callabl
 	 */
 	public function unregister(IPLayer $player, ?callable $onSuccess = null, ?callable $onError = null): void
 	{
-		$this->connector->executeChange(self::UNREGISTER, [$player->getName()], $onSuccess, $onError );
+		$this->connector->executeChange(self::UNREGISTER, [$player->getName()], $onSuccess, $onError);
 	}
 
 	/**
@@ -71,8 +71,7 @@ public function get(IPlayer $player, callable $onSuccess = null, ?callable $onEr
 	 * @param int $death
 	 * @param int $exp
 	 */
-	public function add(IPlayer $player, int $kill = 0, int $death = 0, int $exp = 0)
-	{
+	public function add(IPlayer $player, int $kill = 0, int $death = 0, int $exp = 0) {
 		$this->connector->executeChange(self::ADD_COUNT, [$player->getName(), $kill, $death, $exp]);
 	}
 
@@ -82,8 +81,7 @@ public function add(IPlayer $player, int $kill = 0, int $death = 0, int $exp = 0
 	 * @param IPlayer $player
 	 * @param int $kill
 	 */
-	public function addKill(IPlayer $player, int $kill)
-	{
+	public function addKill(IPlayer $player, int $kill) {
 		$this->add($player, $kill);
 	}
 
@@ -93,8 +91,7 @@ public function addKill(IPlayer $player, int $kill)
 	 * @param IPlayer $player
 	 * @param int $death
 	 */
-	public function addDeath(IPlayer $player, int $death)
-	{
+	public function addDeath(IPlayer $player, int $death) {
 		$this->add($player, 0, $death);
 	}
 
@@ -104,7 +101,7 @@ public function addDeath(IPlayer $player, int $death)
 	 * @param IPlayer $player
 	 * @param int $exp
 	 */
-	public function addExp(IPlayer $player,int $exp)
+	public function addExp(IPlayer $player, int $exp)
 	{
 		$this->add($player, 0, 0, $exp);
 	}

src/VectorNetworkProject/DataProvider/Tables/TableBase.php

@@ -15,8 +15,7 @@ abstract class TableBase
 {
 	/** @var DataConnector */
 	protected $connector;
-	public final function __construct(DataConnector $connector)
-	{
+	public final function __construct(DataConnector $connector) {
 		$this->connector = $connector;
 		$this->init();
 	}

src/VectorNetworkProject/DataProvider/Tables/TableManager.php

@@ -29,8 +29,7 @@ class TableManager
 	/** @var CorePvP */
 	protected $corepvp;
 
-	public function __construct(DataConnector $connector)
-	{
+	public function __construct(DataConnector $connector) {
 		$this->connector = $connector;
 		$this->accounts = new Accounts($connector);
 		$this->ffapvp = new FFAPvP($connector);