Merge branch 'release/3.1'

src/pocketmine/level/format/io/LevelProviderManager.php

@@ -27,7 +27,6 @@ use pocketmine\level\format\io\leveldb\LevelDB;
 use pocketmine\level\format\io\region\Anvil;
 use pocketmine\level\format\io\region\McRegion;
 use pocketmine\level\format\io\region\PMAnvil;
-use pocketmine\level\LevelException;
 
 abstract class LevelProviderManager{
 	protected static $providers = [];
@@ -42,12 +41,21 @@ abstract class LevelProviderManager{
 	/**
 	 * @param string $class
 	 *
-	 * @throws LevelException
+	 * @throws \InvalidArgumentException
 	 */
 	public static function addProvider(string $class){
-		if(!is_subclass_of($class, LevelProvider::class)){
-			throw new LevelException("Class is not a subclass of LevelProvider");
+		try{
+			$reflection = new \ReflectionClass($class);
+		}catch(\ReflectionException $e){
+			throw new \InvalidArgumentException("Class $class does not exist");
 		}
+		if(!$reflection->implementsInterface(LevelProvider::class)){
+			throw new \InvalidArgumentException("Class $class does not implement " . LevelProvider::class);
+		}
+		if(!$reflection->isInstantiable()){
+			throw new \InvalidArgumentException("Class $class cannot be constructed");
+		}
+
 		/** @var LevelProvider $class */
 		self::$providers[strtolower($class::getProviderName())] = $class;
 	}

tests/phpunit/level/format/io/AbstractLevelProvider.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\level\format\io;
+
+abstract class AbstractLevelProvider implements LevelProvider{
+
+}

tests/phpunit/level/format/io/InterfaceLevelProvider.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\level\format\io;
+
+interface InterfaceLevelProvider extends LevelProvider{
+
+}

tests/phpunit/level/format/io/LevelProviderManagerTest.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\level\format\io;
+
+use PHPUnit\Framework\TestCase;
+
+class LevelProviderManagerTest extends TestCase{
+
+	public function testAddNonClassProvider() : void{
+		$this->expectException(\InvalidArgumentException::class);
+
+		LevelProviderManager::addProvider("lol");
+	}
+
+	public function testAddAbstractClassProvider() : void{
+		$this->expectException(\InvalidArgumentException::class);
+
+		LevelProviderManager::addProvider(AbstractLevelProvider::class);
+	}
+
+	public function testAddInterfaceProvider() : void{
+		$this->expectException(\InvalidArgumentException::class);
+
+		LevelProviderManager::addProvider(InterfaceLevelProvider::class);
+	}
+}