Merge branch 'stable'

.php_cs

@@ -0,0 +1,71 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+	->in(__DIR__ . '/src')
+	->in(__DIR__ . '/build')
+	->in(__DIR__ . '/tests')
+	->notPath('plugins/DevTools')
+	->notPath('preprocessor')
+	->notContains('#ifndef COMPILE') //preprocessor will break if these are changed
+	->notName('PocketMine.php');
+
+return PhpCsFixer\Config::create()
+	->setRiskyAllowed(true)
+	->setRules([
+		'align_multiline_comment' => [
+			'comment_type' => 'phpdocs_only'
+		],
+		'array_indentation' => true,
+		'array_syntax' => [
+			'syntax' => 'short'
+		],
+		'blank_line_after_namespace' => true,
+		'blank_line_after_opening_tag' => true,
+		'blank_line_before_statement' => [
+			'statements' => [
+				'declare'
+			]
+		],
+		'cast_spaces' => [
+			'space' => 'single'
+		],
+		'concat_space' => [
+			'spacing' => 'one'
+		],
+		'declare_strict_types' => true,
+		'elseif' => true,
+		'global_namespace_import' => [
+			'import_constants' => true,
+			'import_functions' => true,
+			'import_classes' => null,
+		],
+		'indentation_type' => true,
+		'native_function_invocation' => [
+		    'scope' => 'namespaced'
+		],
+		'no_closing_tag' => true,
+		'no_empty_phpdoc' => true,
+		'no_extra_blank_lines' => true,
+		'no_superfluous_phpdoc_tags' => [
+            'allow_mixed' => true,
+		],
+		'no_trailing_whitespace' => true,
+		'no_trailing_whitespace_in_comment' => true,
+		'no_whitespace_in_blank_line' => true,
+		'no_unused_imports' => true,
+		'ordered_imports' => [
+			'imports_order' => [
+				'class',
+				'function',
+				'const',
+			],
+			'sort_algorithm' => 'alpha'
+		],
+		'phpdoc_trim' => true,
+		'phpdoc_trim_consecutive_blank_line_separation' => true,
+		'single_import_per_statement' => true,
+		'strict_param' => true,
+	])
+	->setFinder($finder)
+	->setIndent("\t")
+	->setLineEnding("\n");

build/make-release.php

@@ -71,7 +71,7 @@ function main(array $argv) : void{
 
 	$versionInfoPath = dirname(__DIR__) . '/src/VersionInfo.php';
 	replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false);
-	
+
 	echo "please add appropriate notes to the changelog and press enter...";
 	fgets(STDIN);
 	system('git add "' . dirname(__DIR__) . '/changelogs"');

build/php

@@ -1 +1 @@
-Subproject commit d2d56be408386c5a4be787809e3a94eb81d054b6
+Subproject commit 949a3bb2fcce991794263020f882b69b7be0c004

src/network/upnp/UPnP.php

@@ -264,7 +264,7 @@ class UPnP implements NetworkInterface{
 			'<?xml version="1.0"?>' .
 			'<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">' .
 			'<s:Body>' . $body . '</s:Body></s:Envelope>';
-		
+
 		$headers = [
 			'Content-Type: text/xml',
 			'SOAPAction: "urn:schemas-upnp-org:service:WANIPConnection:1#DeletePortMapping"'

src/wizard/SetupWizard.php

@@ -203,7 +203,7 @@ LICENSE;
 
 		$config->save();
 	}
-	
+
 	private function printIpDetails() : void{
 		$this->message($this->lang->get("ip_get"));