Merge commit '30f2e7527818e3275ceb0ff26093c4f26a84c51c'

phpstan.neon.dist

@@ -1,8 +1,9 @@
 includes:
+	- tests/phpstan/configs/com-dotnet-magic.neon
+	- tests/phpstan/configs/custom-leveldb.neon
 	- tests/phpstan/configs/ds-bugs.neon
 	- tests/phpstan/configs/gc-hacks.neon
 	- tests/phpstan/configs/gradual-level6.neon
-	- tests/phpstan/configs/optional-com-dotnet.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
 	- tests/phpstan/configs/pthreads-bugs.neon
 	- tests/phpstan/configs/runtime-type-checks.neon

tests/phpstan/configs/com-dotnet-magic.neon

@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Access to an undefined property COM\\:\\:\\$StaticPortMappingCollection\\.$#"
+			count: 1
+			path: ../../../src/network/upnp/UPnP.php
+

tests/phpstan/configs/custom-leveldb.neon

@@ -0,0 +1,12 @@
+parameters:
+	ignoreErrors:
+		#TODO: use custom stubs
+		-
+			message: "#^Used constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
+			count: 1
+			path: ../../../src/world/format/io/leveldb/LevelDB.php
+
+		-
+			message: "#^Constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
+			count: 1
+			path: ../../../src/world/format/io/leveldb/LevelDB.php

tests/phpstan/configs/optional-com-dotnet.neon

@@ -1,21 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Instantiated class COM not found\\.$#"
-			count: 1
-			path: ../../../src/network/upnp/UPnP.php
-
-		-
-			message: "#^Access to property \\$StaticPortMappingCollection on an unknown class COM\\.$#"
-			count: 2
-			path: ../../../src/network/upnp/UPnP.php
-
-		-
-			message: "#^Caught class com_exception not found\\.$#"
-			count: 2
-			path: ../../../src/network/upnp/UPnP.php
-
-		-
-			message: "#^Call to method getMessage\\(\\) on an unknown class com_exception\\.$#"
-			count: 1
-			path: ../../../src/network/upnp/UPnP.php

tests/phpstan/configs/phpstan-bugs.neon

@@ -60,6 +60,18 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/protocol/types/entity/EntityMetadataCollection.php
 
+		-
+			#missing from current stubs
+			message: "#^Caught class com_exception not found\\.$#"
+			count: 2
+			path: ../../../src/network/upnp/UPnP.php
+
+		-
+			#missing from current stubs
+			message: "#^Call to method getMessage\\(\\) on an unknown class com_exception\\.$#"
+			count: 1
+			path: ../../../src/network/upnp/UPnP.php
+
 		-
 			message: "#^Strict comparison using \\=\\=\\= between int\\<1, max\\> and 0 will always evaluate to false\\.$#"
 			count: 1

tests/travis.sh

@@ -14,7 +14,7 @@ while getopts "p:t:" OPTION 2> /dev/null; do
 	esac
 done
 
-[ ! -f phpstan.phar ] && echo "Downloading PHPStan..." && curl -sSLO https://github.com/phpstan/phpstan/releases/download/0.12.3/phpstan.phar
+[ ! -f phpstan.phar ] && echo "Downloading PHPStan..." && curl -sSLO https://github.com/phpstan/phpstan/releases/download/0.12.5/phpstan.phar
 "$PHP_BINARY" phpstan.phar analyze --no-progress --memory-limit=2G || exit 1
 echo "PHPStan scan succeeded"