Remove some fully qualified function calls

PhpStorm can't see these or understand how they are being called, which is very annoying for bug hunting. Additionally, we already have the CodeOptimizer for this.
pmmp · Jun 18, 2018 · 2d3ce9e · 2d3ce9e
1 parent 49f8083
commit 2d3ce9e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
@@ -686,7 +686,7 @@ public function sendCommandData(){
 
 			$aliases = $command->getAliases();
 			if(!empty($aliases)){
-				if(!\in_array($data->commandName, $aliases, true)){
+				if(!in_array($data->commandName, $aliases, true)){
 					//work around a client bug which makes the original name not show when aliases are used
 					$aliases[] = $data->commandName;
 				}

diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
@@ -171,8 +171,8 @@ function critical_error($message){
 
 	$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-profiler"]);
 
-	define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \realpath(\getcwd()) . DIRECTORY_SEPARATOR);
-	define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : \realpath(\getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
+	define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR);
+	define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
 
 	if(!file_exists(\pocketmine\DATA)){
 		mkdir(\pocketmine\DATA, 0777, true);

diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
@@ -2162,7 +2162,7 @@ public function exceptionHandler(\Throwable $e, $trace = null){
 		$this->logger->logException($e, $trace);
 
 		$lastError = [
-			"type" => \get_class($e),
+			"type" => get_class($e),
 			"message" => $errstr,
 			"fullFile" => $e->getFile(),
 			"file" => $errfile,

diff --git a/src/pocketmine/entity/Effect.php b/src/pocketmine/entity/Effect.php
@@ -111,8 +111,8 @@ public static function getEffect(int $id) : ?Effect{
 	 */
 	public static function getEffectByName(string $name) : ?Effect{
 		$const = self::class . "::" . strtoupper($name);
-		if(\defined($const)){
-			return self::getEffect(\constant($const));
+		if(defined($const)){
+			return self::getEffect(constant($const));
 		}
 		return null;
 	}

diff --git a/src/pocketmine/entity/projectile/Projectile.php b/src/pocketmine/entity/projectile/Projectile.php
@@ -215,7 +215,7 @@ public function move(float $dx, float $dy, float $dz) : void{
 			}elseif($blockHit !== null){
 				$ev = new ProjectileHitBlockEvent($this, $hitResult, $blockHit);
 			}else{
-				\assert(false, "unknown hit type");
+				assert(false, "unknown hit type");
 			}
 
 			if($ev !== null){

diff --git a/src/pocketmine/event/EventPriority.php b/src/pocketmine/event/EventPriority.php
@@ -82,8 +82,8 @@ abstract class EventPriority{
 	public static function fromString(string $name) : int{
 		$name = strtoupper($name);
 		$const = self::class . "::" . $name;
-		if($name !== "ALL" and \defined($const)){
-			return \constant($const);
+		if($name !== "ALL" and defined($const)){
+			return constant($const);
 		}
 
 		throw new \InvalidArgumentException("Unable to resolve priority \"$name\"");

diff --git a/src/pocketmine/plugin/PluginDescription.php b/src/pocketmine/plugin/PluginDescription.php
@@ -59,7 +59,7 @@ class PluginDescription{
 	 * @param string|array $yamlString
 	 */
 	public function __construct($yamlString){
-		$this->loadMap(!is_array($yamlString) ? \yaml_parse($yamlString) : $yamlString);
+		$this->loadMap(!is_array($yamlString) ? yaml_parse($yamlString) : $yamlString);
 	}
 
 	/**

diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php
@@ -796,7 +796,7 @@ public function registerEvents(Listener $listener, Plugin $plugin) : void{
 				try{
 					$priority = isset($tags["priority"]) ? EventPriority::fromString($tags["priority"]) : EventPriority::NORMAL;
 				}catch(\InvalidArgumentException $e){
-					throw new PluginException("Event handler " . \get_class($listener) . "->" . $method->getName() . "() declares invalid/unknown priority \"" . $tags["priority"] . "\"");
+					throw new PluginException("Event handler " . get_class($listener) . "->" . $method->getName() . "() declares invalid/unknown priority \"" . $tags["priority"] . "\"");
 				}
 				$ignoreCancelled = isset($tags["ignoreCancelled"]) && strtolower($tags["ignoreCancelled"]) === "true";