diff --git a/src/Server.php b/src/Server.php index 512354548..7b3496dd2 100644 --- a/src/Server.php +++ b/src/Server.php @@ -28,10 +28,10 @@ declare(strict_types=1); namespace pocketmine; use pocketmine\command\Command; -use pocketmine\command\CommandReaderThread; use pocketmine\command\CommandSender; -use pocketmine\command\ConsoleCommandSender; use pocketmine\command\SimpleCommandMap; +use pocketmine\console\CommandReaderThread; +use pocketmine\console\ConsoleCommandSender; use pocketmine\crafting\CraftingManager; use pocketmine\crafting\CraftingManagerFromDataHelper; use pocketmine\entity\EntityDataHelper; diff --git a/src/command/Command.php b/src/command/Command.php index 740571e63..d77972101 100644 --- a/src/command/Command.php +++ b/src/command/Command.php @@ -27,6 +27,7 @@ declare(strict_types=1); namespace pocketmine\command; use pocketmine\command\utils\CommandException; +use pocketmine\console\ConsoleCommandSender; use pocketmine\lang\TranslationContainer; use pocketmine\permission\PermissionManager; use pocketmine\Server; diff --git a/src/command/defaults/SayCommand.php b/src/command/defaults/SayCommand.php index 64adf3d90..ac3faa8e5 100644 --- a/src/command/defaults/SayCommand.php +++ b/src/command/defaults/SayCommand.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\command\ConsoleCommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\console\ConsoleCommandSender; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; diff --git a/src/command/CommandReader.php b/src/console/CommandReader.php similarity index 98% rename from src/command/CommandReader.php rename to src/console/CommandReader.php index 0aeefdf2b..ce10c587d 100644 --- a/src/command/CommandReader.php +++ b/src/console/CommandReader.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\command; +namespace pocketmine\console; use function fclose; use function fgets; diff --git a/src/command/CommandReaderThread.php b/src/console/CommandReaderThread.php similarity index 98% rename from src/command/CommandReaderThread.php rename to src/console/CommandReaderThread.php index 5ae04a1c5..4bcd99305 100644 --- a/src/command/CommandReaderThread.php +++ b/src/console/CommandReaderThread.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\command; +namespace pocketmine\console; use pocketmine\snooze\SleeperNotifier; use pocketmine\thread\Thread; diff --git a/src/command/ConsoleCommandSender.php b/src/console/ConsoleCommandSender.php similarity index 97% rename from src/command/ConsoleCommandSender.php rename to src/console/ConsoleCommandSender.php index 5649f9f4c..eba16586a 100644 --- a/src/command/ConsoleCommandSender.php +++ b/src/console/ConsoleCommandSender.php @@ -21,8 +21,9 @@ declare(strict_types=1); -namespace pocketmine\command; +namespace pocketmine\console; +use pocketmine\command\CommandSender; use pocketmine\lang\Language; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissions; diff --git a/tests/phpstan/configs/actual-problems.neon b/tests/phpstan/configs/actual-problems.neon index 49b2c5f07..e01519bff 100644 --- a/tests/phpstan/configs/actual-problems.neon +++ b/tests/phpstan/configs/actual-problems.neon @@ -6,7 +6,7 @@ parameters: path: ../../../src/CrashDump.php - - message: "#^Instanceof between pocketmine\\\\command\\\\CommandReaderThread and pocketmine\\\\command\\\\CommandReaderThread will always evaluate to true\\.$#" + message: "#^Instanceof between pocketmine\\\\console\\\\CommandReaderThread and pocketmine\\\\console\\\\CommandReaderThread will always evaluate to true\\.$#" count: 1 path: ../../../src/Server.php diff --git a/tests/phpstan/configs/l7-baseline.neon b/tests/phpstan/configs/l7-baseline.neon index f3d116666..cec2e9a22 100644 --- a/tests/phpstan/configs/l7-baseline.neon +++ b/tests/phpstan/configs/l7-baseline.neon @@ -436,9 +436,9 @@ parameters: path: ../../../src/block/tile/TileFactory.php - - message: "#^Property pocketmine\\\\command\\\\CommandReader\\:\\:\\$stdin \\(resource\\) does not accept resource\\|false\\.$#" + message: "#^Property pocketmine\\\\console\\\\CommandReader\\:\\:\\$stdin \\(resource\\) does not accept resource\\|false\\.$#" count: 1 - path: ../../../src/command/CommandReader.php + path: ../../../src/console/CommandReader.php - message: "#^Only booleans are allowed in an if condition, int\\|false given\\.$#" diff --git a/tests/phpstan/configs/phpstan-bugs.neon b/tests/phpstan/configs/phpstan-bugs.neon index d4a774353..215140dba 100644 --- a/tests/phpstan/configs/phpstan-bugs.neon +++ b/tests/phpstan/configs/phpstan-bugs.neon @@ -3,7 +3,7 @@ parameters: - message: "#^Call to function is_resource\\(\\) with resource will always evaluate to true\\.$#" count: 2 - path: ../../../src/command/CommandReader.php + path: ../../../src/console/CommandReader.php - message: "#^Method pocketmine\\\\crafting\\\\CraftingManager\\:\\:getDestructorCallbacks\\(\\) should return pocketmine\\\\utils\\\\ObjectSet\\ but returns pocketmine\\\\utils\\\\ObjectSet\\\\|pocketmine\\\\utils\\\\ObjectSet\\\\.$#"