mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-11 14:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Moved parseDocComment from PluginManager to Utils

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-05-13 11:24:04 +01:00
parent edaef588ab
commit 34b8557094
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/plugin/PluginManager.php
View File

@ -36,6 +36,7 @@ use pocketmine\Server;
use pocketmine\timings\Timings; use pocketmine\timings\Timings;
use pocketmine\timings\TimingsHandler; use pocketmine\timings\TimingsHandler;
use pocketmine\utils\MainLogger; use pocketmine\utils\MainLogger;
use pocketmine\utils\Utils;
/** /**
* Manages all the plugins, Permissions and Permissibles * Manages all the plugins, Permissions and Permissibles
@ -716,17 +717,6 @@ class PluginManager{
--$this->eventCallDepth; --$this->eventCallDepth;
} }
/**
* Extracts one-line tags from the doc-comment
*
* @param string $docComment
* @return string[] an array of tagName => tag value. If the tag has no value, an empty string is used as the value.
*/
public static function parseDocComment(string $docComment) : array{
preg_match_all('/^[\t ]*\* @([a-zA-Z]+)(?:[\t ]+(.+))?[\t ]*$/m', $docComment, $matches);
return array_combine($matches[1], array_map("trim", $matches[2]));
}
/** /**
* Registers all the events in the given Listener class * Registers all the events in the given Listener class
* *
@ -743,7 +733,7 @@ class PluginManager{
$reflection = new \ReflectionClass(get_class($listener)); $reflection = new \ReflectionClass(get_class($listener));
foreach($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method){ foreach($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method){
if(!$method->isStatic()){ if(!$method->isStatic()){
$tags = self::parseDocComment((string) $method->getDocComment()); $tags = Utils::parseDocComment((string) $method->getDocComment());
if(isset($tags["notHandler"])){ if(isset($tags["notHandler"])){
continue; continue;
} }
@ -789,7 +779,7 @@ class PluginManager{
throw new PluginException($event . " is not an Event"); throw new PluginException($event . " is not an Event");
} }
$tags = self::parseDocComment((string) (new \ReflectionClass($event))->getDocComment()); $tags = Utils::parseDocComment((string) (new \ReflectionClass($event))->getDocComment());
if(isset($tags["deprecated"]) and $this->server->getProperty("settings.deprecated-verbose", true)){ if(isset($tags["deprecated"]) and $this->server->getProperty("settings.deprecated-verbose", true)){
$this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.plugin.deprecatedEvent", [ $this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.plugin.deprecatedEvent", [
$plugin->getName(), $plugin->getName(),

13
src/pocketmine/utils/Utils.php
View File

@ -622,4 +622,17 @@ class Utils{
public static function cleanPath($path){ public static function cleanPath($path){
return str_replace(["\\", ".php", "phar://", str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH)], ["/", "", "", "", ""], $path); return str_replace(["\\", ".php", "phar://", str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH)], ["/", "", "", "", ""], $path);
} }
/**
* Extracts one-line tags from the doc-comment
*
* @param string $docComment
*
* @return string[] an array of tagName => tag value. If the tag has no value, an empty string is used as the value.
*/
public static function parseDocComment(string $docComment) : array{
preg_match_all('/^[\t ]*\* @([a-zA-Z]+)(?:[\t ]+(.+))?[\t ]*$/m', $docComment, $matches);
return array_combine($matches[1], array_map("trim", $matches[2]));
}
} }