Moved console-specific stuff to its own namespace

this stuff has different functionality than everything else in the
command namespace (specifically console handling), so it doesn't belong
in here.

I know that this will probably break some plugins, but I don't care,
because plugins shouldn't have been abusing ConsoleCommandSender in the
first place.
This commit is contained in:
Dylan K. Taylor 2021-06-26 19:24:42 +01:00
parent bf7d69b69e
commit a70bd115f1
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
9 changed files with 12 additions and 10 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\command;
namespace pocketmine\console;
use function fclose;
use function fgets;

View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\command;
namespace pocketmine\console;
use pocketmine\snooze\SleeperNotifier;
use pocketmine\thread\Thread;

View File

@ -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;

View File

@ -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

View File

@ -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\\.$#"

View File

@ -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\\<Closure\\(\\)\\: void\\> but returns pocketmine\\\\utils\\\\ObjectSet\\<Closure\\(\\)\\: void\\>\\|pocketmine\\\\utils\\\\ObjectSet\\<object\\>\\.$#"