Merge remote-tracking branch 'origin/release/3.4'

src/pocketmine/scheduler/ClosureTask.php

@@ -0,0 +1,58 @@
+<?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\scheduler;
+
+use pocketmine\utils\Utils;
+
+/**
+ * Task implementation which allows closures to be called by a scheduler.
+ *
+ * Example usage:
+ *
+ * ```
+ * TaskScheduler->scheduleTask(new ClosureTask(function(int $currentTick) : void{
+ *     echo "HI on $currentTick\n";
+ * });
+ * ```
+ */
+class ClosureTask extends Task{
+
+	/** @var \Closure */
+	private $closure;
+
+	/**
+	 * @param \Closure $closure Must accept only ONE parameter, $currentTick
+	 */
+	public function __construct(\Closure $closure){
+		$this->closure = $closure;
+	}
+
+	public function getName() : string{
+		return Utils::getNiceClosureName($this->closure);
+	}
+
+	public function onRun(int $currentTick){
+		($this->closure)($currentTick);
+	}
+}

src/pocketmine/utils/Utils.php

@@ -53,7 +53,20 @@ class Utils{
 	}
 
 	/**
-	 * Returns a readable identifier for the class of the given object. Sanitizes class names for closures.
+	 * Returns a readable identifier for the given Closure, including file and line.
+	 *
+	 * @param \Closure $closure
+	 *
+	 * @return string
+	 * @throws \ReflectionException
+	 */
+	public static function getNiceClosureName(\Closure $closure) : string{
+		$func = new \ReflectionFunction($closure);
+		return "closure@" . self::cleanPath($func->getFileName()) . "#L" . $func->getStartLine();
+	}
+
+	/**
+	 * Returns a readable identifier for the class of the given object. Sanitizes class names for anonymous classes.
 	 *
 	 * @param object $obj
 	 *