From 30f2e7527818e3275ceb0ff26093c4f26a84c51c Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sun, 12 Jan 2020 16:57:43 +0000
Subject: [PATCH] phpstan 0.12.5

---
 phpstan.neon.dist                             |  4 +--
 tests/phpstan/configs/com-dotnet-magic.neon   |  7 +++++
 tests/phpstan/configs/custom-leveldb.neon     | 12 ++++++++
 .../phpstan/configs/optional-com-dotnet.neon  | 12 --------
 tests/phpstan/configs/optional-leveldb.neon   | 30 -------------------
 tests/travis.sh                               |  2 +-
 6 files changed, 22 insertions(+), 45 deletions(-)
 create mode 100644 tests/phpstan/configs/com-dotnet-magic.neon
 create mode 100644 tests/phpstan/configs/custom-leveldb.neon
 delete mode 100644 tests/phpstan/configs/optional-com-dotnet.neon
 delete mode 100644 tests/phpstan/configs/optional-leveldb.neon

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 7597d680c..29ec94a42 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,8 +1,8 @@
 includes:
+	- tests/phpstan/configs/com-dotnet-magic.neon
+	- tests/phpstan/configs/custom-leveldb.neon
 	- tests/phpstan/configs/gc-hacks.neon
 	- tests/phpstan/configs/gradual-level6.neon
-	- tests/phpstan/configs/optional-com-dotnet.neon
-	- tests/phpstan/configs/optional-leveldb.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
 	- tests/phpstan/configs/pthreads-bugs.neon
 	- tests/phpstan/configs/runtime-type-checks.neon
diff --git a/tests/phpstan/configs/com-dotnet-magic.neon b/tests/phpstan/configs/com-dotnet-magic.neon
new file mode 100644
index 000000000..bb0f2cbad
--- /dev/null
+++ b/tests/phpstan/configs/com-dotnet-magic.neon
@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Access to an undefined property COM\\:\\:\\$StaticPortMappingCollection\\.$#"
+			count: 2
+			path: ../../../src/pocketmine/network/upnp/UPnP.php
+
diff --git a/tests/phpstan/configs/custom-leveldb.neon b/tests/phpstan/configs/custom-leveldb.neon
new file mode 100644
index 000000000..05e8a7702
--- /dev/null
+++ b/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/pocketmine/level/format/io/leveldb/LevelDB.php
+
+		-
+			message: "#^Constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
diff --git a/tests/phpstan/configs/optional-com-dotnet.neon b/tests/phpstan/configs/optional-com-dotnet.neon
deleted file mode 100644
index fb725539c..000000000
--- a/tests/phpstan/configs/optional-com-dotnet.neon
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Instantiated class COM not found\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/network/upnp/UPnP.php
-
-		-
-			message: "#^Access to property \\$StaticPortMappingCollection on an unknown class COM\\.$#"
-			count: 4
-			path: ../../../src/pocketmine/network/upnp/UPnP.php
-
diff --git a/tests/phpstan/configs/optional-leveldb.neon b/tests/phpstan/configs/optional-leveldb.neon
deleted file mode 100644
index 91ff01bb5..000000000
--- a/tests/phpstan/configs/optional-leveldb.neon
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Used constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
-			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
-
-		-
-			message: "#^Constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
-			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
-
-		-
-			message: "#^Instantiated class LevelDB not found\\.$#"
-			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
-
-		-
-			message: "#^Return typehint of method pocketmine\\\\level\\\\format\\\\io\\\\leveldb\\\\LevelDB\\:\\:createDB\\(\\) has invalid type LevelDB\\.$#"
-			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
-
-		-
-			message: "#^Return typehint of method pocketmine\\\\level\\\\format\\\\io\\\\leveldb\\\\LevelDB\\:\\:getDatabase\\(\\) has invalid type LevelDB\\.$#"
-			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
-
-		-
-			message: "#^Property pocketmine\\\\level\\\\format\\\\io\\\\leveldb\\\\LevelDB\\:\\:\\$db has unknown class LevelDB as its type\\.$#"
-			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
-
-		-
-			message: "#^Call to method (get|put|delete|close)\\(\\) on an unknown class LevelDB\\.$#"
-			path: ../../../src/pocketmine/level/format/io/leveldb/LevelDB.php
-
diff --git a/tests/travis.sh b/tests/travis.sh
index 181e7d2f0..4e0b9db58 100755
--- a/tests/travis.sh
+++ b/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"