Moved spl to PocketMine-SPL

.gitmodules

@@ -4,5 +4,8 @@
 	branch = master
 [submodule "src/raklib"]
 	path = src/raklib
-	url = git@github.com:PocketMine/RakLib.git
+	url = https://github.com/PocketMine/RakLib.git
 	branch = master
+[submodule "src/spl"]
+	path = src/spl
+	url = https://github.com/PocketMine/PocketMine-SPL.git

src/spl/LoggerAttachment.php → src/pocketmine/CompatibleClassLoader.php

@@ -19,12 +19,14 @@
  *
 */
 
-interface LoggerAttachment{
+namespace pocketmine;
+
+class CompatibleClassLoader extends \BaseClassLoader{
 
 	/**
-	 * @param mixed  $level
-	 * @param string $message
+	 * @deprecated
 	 */
-	public function log($level, $message);
-
+	public function add($namespace, $paths){
+		$this->addPath(array_shift($paths));
+	}
 }

src/pocketmine/PocketMine.php

@@ -89,16 +89,14 @@ function dummy(){
 		exit(1);
 	}
 
-	if(!class_exists("SplClassLoader", false)){
-		require_once(\pocketmine\PATH . "src/spl/SplClassLoader.php");
+	if(!class_exists("ClassLoader", false)){
+		require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
+		require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
+		require_once(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
 	}
 
-	$autoloader = new \SplClassLoader();
-	$autoloader->setMode(\SplAutoloader::MODE_DEBUG);
-	$autoloader->add("pocketmine", [
-		\pocketmine\PATH . "src"
-	]);
-
+	$autoloader = new CompatibleClassLoader();
+	$autoloader->addPath(\pocketmine\PATH . "src");
 	$autoloader->register(true);
 	if(!class_exists("raklib\\RakLib", false)){
 		require(\pocketmine\PATH . "src/raklib/raklib/RakLib.php");

src/pocketmine/Server.php

@@ -455,7 +455,7 @@ public function getMotd(){
 	}
 
 	/**
-	 * @return \SplClassLoader
+	 * @return \ClassLoader
 	 */
 	public function getLoader(){
 		return $this->autoloader;
@@ -1377,13 +1377,13 @@ public static function getInstance(){
 	}
 
 	/**
-	 * @param \SplClassLoader $autoloader
+	 * @param \ClassLoader $autoloader
 	 * @param \ThreadedLogger $logger
 	 * @param string          $filePath
 	 * @param string          $dataPath
 	 * @param string          $pluginPath
 	 */
-	public function __construct(\SplClassLoader $autoloader, \ThreadedLogger $logger, $filePath, $dataPath, $pluginPath){
+	public function __construct(\ClassLoader $autoloader, \ThreadedLogger $logger, $filePath, $dataPath, $pluginPath){
 		self::$instance = $this;
 
 		$this->autoloader = $autoloader;

src/pocketmine/level/generator/GenerationManager.php

@@ -93,7 +93,7 @@ class GenerationManager{
 	protected $socket;
 	/** @var \Logger */
 	protected $logger;
-	/** @var \SplAutoLoader */
+	/** @var \ClassLoader */
 	protected $loader;
 
 	/** @var GenerationChunkManager[] */
@@ -110,11 +110,11 @@ class GenerationManager{
 	protected $shutdown = false;
 
 	/**
-	 * @param resource       $socket
-	 * @param \Logger        $logger
-	 * @param \SplAutoloader $loader
+	 * @param resource     $socket
+	 * @param \Logger      $logger
+	 * @param \ClassLoader $loader
 	 */
-	public function __construct($socket, \Logger $logger, \SplAutoloader $loader){
+	public function __construct($socket, \Logger $logger, \ClassLoader $loader){
 		$this->socket = $socket;
 		$this->logger = $logger;
 		$this->loader = $loader;
@@ -282,7 +282,7 @@ protected function readPacket(){
 			$namespace = substr($packet, $offset, $len);
 			$offset += $len;
 			$path = substr($packet, $offset);
-			$this->loader->add($namespace, [$path]);
+			$this->loader->addPath($path);
 		}elseif($pid === self::PACKET_SHUTDOWN){
 			foreach($this->levels as $level){
 				$level->shutdown();

src/pocketmine/level/generator/GenerationThread.php

@@ -50,7 +50,7 @@ public function getLogger(){
 		return $this->logger;
 	}
 
-	public function __construct(\ThreadedLogger $logger, \SplAutoloader $loader){
+	public function __construct(\ThreadedLogger $logger, \ClassLoader $loader){
 		$this->loader = $loader;
 		$this->logger = $logger;
 		$loadPaths = [];

src/pocketmine/plugin/PharPluginLoader.php

@@ -58,9 +58,7 @@ public function loadPlugin($file){
 			}
 			$file = "phar://$file";
 			$className = $description->getMain();
-			$this->server->getLoader()->add(substr($className, 0, strrpos($className, "\\")), array(
-				"$file/src"
-			));
+			$this->server->getLoader()->addPath("$file/src");
 
 			if(class_exists($className, true)){
 				$plugin = new $className();

src/pocketmine/scheduler/AsyncWorker.php

@@ -26,11 +26,9 @@
 class AsyncWorker extends Worker{
 
 	public function run(){
-		require(\pocketmine\PATH . "src/spl/SplClassLoader.php");
-		$autoloader = new \SplClassLoader();
-		$autoloader->add("pocketmine", array(
-			\pocketmine\PATH . "src"
-		));
+		require(\pocketmine\PATH . "src/spl/ClassLoader.php");
+		$autoloader = new \BaseClassLoader();
+		$autoloader->addPath(\pocketmine\PATH . "src");
 		$autoloader->register(true);
 	}
 }