diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cfe97aa7e..cabda54be 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,8 +30,8 @@ jobs:
       - name: Setup PHP and tools
         uses: shivammathur/setup-php@2.33.0
         with:
-          php-version: 8.2
-          tools: php-cs-fixer:3.49
+          php-version: 8.3
+          tools: php-cs-fixer:3.75
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index 2effafe17..81221c11c 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -5,6 +5,13 @@ $finder = PhpCsFixer\Finder::create()
 	->in(__DIR__ . '/build')
 	->in(__DIR__ . '/tests')
 	->in(__DIR__ . '/tools')
+
+	//JsonMapper will break if the FQNs in the doc comments for these are shortened :(
+	->notPath('crafting/json')
+	->notPath('inventory/json')
+	->notPath('data/bedrock/block/upgrade/model')
+	->notPath('data/bedrock/item/upgrade/model')
+
 	->notName('PocketMine.php');
 
 return (new PhpCsFixer\Config)
diff --git a/build/dump-version-info.php b/build/dump-version-info.php
index e13696f3d..3181acba6 100644
--- a/build/dump-version-info.php
+++ b/build/dump-version-info.php
@@ -31,8 +31,8 @@ require dirname(__DIR__) . '/vendor/autoload.php';
  */
 
 /**
- * @var string[]|\Closure[] $options
- * @phpstan-var array<string, string|\Closure() : string> $options
+ * @var string[]|Closure[] $options
+ * @phpstan-var array<string, string|Closure() : string> $options
  */
 $options = [
 	"base_version" => VersionInfo::BASE_VERSION,
diff --git a/src/block/tile/Spawnable.php b/src/block/tile/Spawnable.php
index 956652eac..d801e5324 100644
--- a/src/block/tile/Spawnable.php
+++ b/src/block/tile/Spawnable.php
@@ -32,7 +32,7 @@ use pocketmine\network\mcpe\protocol\types\CacheableNbt;
 use function get_class;
 
 abstract class Spawnable extends Tile{
-	/** @phpstan-var CacheableNbt<\pocketmine\nbt\tag\CompoundTag>|null */
+	/** @phpstan-var CacheableNbt<CompoundTag>|null */
 	private ?CacheableNbt $spawnCompoundCache = null;
 
 	public function clearSpawnCompoundCache() : void{
@@ -59,7 +59,7 @@ abstract class Spawnable extends Tile{
 	 * Returns encoded NBT (varint, little-endian) used to spawn this tile to clients. Uses cache where possible,
 	 * populates cache if it is null.
 	 *
-	 * @phpstan-return CacheableNbt<\pocketmine\nbt\tag\CompoundTag>
+	 * @phpstan-return CacheableNbt<CompoundTag>
 	 */
 	final public function getSerializedSpawnCompound() : CacheableNbt{
 		if($this->spawnCompoundCache === null){
diff --git a/src/world/World.php b/src/world/World.php
index c7a9775fb..8179d96c6 100644
--- a/src/world/World.php
+++ b/src/world/World.php
@@ -360,7 +360,7 @@ class World implements ChunkManager{
 
 	private bool $doingTick = false;
 
-	/** @phpstan-var class-string<\pocketmine\world\generator\Generator> */
+	/** @phpstan-var class-string<generator\Generator> */
 	private string $generator;
 
 	private bool $unloaded = false;