qa: mutation testing with phsptan

coopryan · solcloud · commit a671b96ea8b0 · 2025-08-31T15:15:53.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: "Tests"
 on:
   push:
-    branches: [master]
+    branches: ['*']
     paths-ignore:
       - '**.md'
       - 'cli/'
@@ -24,7 +24,7 @@ jobs:
           persist-credentials: false
 
       - name: "Install Linux dependencies"
-        timeout-minutes: 2
+        timeout-minutes: 4
         run: |
           sudo apt-get update && sudo apt-get install -y \
             composer
@@ -36,7 +36,7 @@ jobs:
           composer install
 
       - name: "Run Composer check-full"
-        timeout-minutes: 10
+        timeout-minutes: 20
         run: |
           grep '"timeout": 20,' infection.json5
           sed -i 's/"timeout": 20,/"timeout": 40,/' infection.json5
diff --git a/cli/server.php b/cli/server.php
@@ -14,6 +14,7 @@
 $port = (int)($argv[2] ?? 8080);
 $debug = in_array('--debug', $argv);
 $bindAddress = "udp://0.0.0.0:$port";
+$map = new Maps\DefaultMap();
 /////
 
 $settings = new ServerSetting($playersMax); // must be first for correctly setting the global tickRate (Util::$TICK_RATE)
@@ -22,7 +23,7 @@
 $logger->info("Preparing game for launch, please wait...");
 
 $game = ($debug ? GameFactory::createDebug() : GameFactory::createDefaultCompetitive());
-$game->loadMap(new Maps\DefaultMap());
+$game->loadMap($map);
 
 $logger->info("Starting server on '{$bindAddress}', waiting maximum of '{$settings->warmupWaitSec}' sec for '{$playersMax}' player" . ($playersMax > 1 ? 's' : '') . " to connect.");
 $net = new ClueSocket($bindAddress);
diff --git a/composer.json b/composer.json
@@ -2,8 +2,8 @@
     "scripts": {
         "post-install-cmd": "@php -d memory_limit=200M cli/generateNavmesh.php",
         "stan": "@php vendor/bin/phpstan --memory-limit=300M analyze",
-        "unit": "@php vendor/bin/phpunit -d memory_limit=70M",
-        "infection": "@php -d memory_limit=180M vendor/bin/infection --show-mutations --only-covered --threads=max --min-covered-msi=100",
+        "unit": "@php vendor/bin/phpunit -d memory_limit=200M",
+        "infection": "@php -d memory_limit=300M vendor/bin/infection --show-mutations --threads=max --min-covered-msi=100",
         "dev": "php cli/server.php 1 8080 --debug & php cli/udp-ws-bridge.php",
         "dev2": "php cli/server.php 2 8080 --debug & php cli/udp-ws-bridge.php & php cli/udp-ws-bridge.php 8082",
         "dev2c": "php cli/server.php 2 8080 --debug & php cli/udp-ws-bridge.php & sleep 2 && php cli/client.php acode 8080",
@@ -28,7 +28,7 @@
         "check-full": [
             "@check",
             "@coverage",
-            "@infection-cache"
+            "@infection-cache --skip-initial-tests"
         ]
     },
     "require": {
@@ -60,7 +60,7 @@
         "platform": {
             "php": "8.3"
         },
-        "process-timeout": 720,
+        "process-timeout": 0,
         "allow-plugins": {
             "infection/extension-installer": false
         }
diff --git a/infection.json5 b/infection.json5
@@ -7,33 +7,31 @@
     },
     "timeout": 20,
     "testFramework": "phpunit",
+    "staticAnalysisTool": "phpstan",
+    "staticAnalysisToolOptions": "--memory-limit=300M",
     "mutators": {
         "global-ignoreSourceCodeByRegex": [
             "\\$this->log\\(.*\\);",
             "throw new GameException\\(.+\\);",
             "GameException::invalid\\(.*\\);",
             "GameException::notImplementedYet\\(.*\\);",
             "assert\\(.+?\\);",
+            "if\\s*\\(\\$count > 10 && \\$count % 2 === 0\\)\\s\\{",
         ],
         "@default": true,
         "@conditional_boundary": false,
         "@conditional_negotiation": false,
-        "CastInt": false,
         "Continue_": false,
         "DecrementInteger": false,
         "FalseValue": false,
-        "IfNegation": false,
         "Increment": false,
         "IncrementInteger": false,
-        "LogicalAnd": false,
         "LogicalAndAllSubExprNegation": false,
         "LogicalOr": false,
-        "LogicalOrAllSubExprNegation": false,
         "Minus": false,
-        "Modulus": false,
         "Multiplication": false,
-        "NullSafeMethodCall": false,
         "Plus": false,
+        "ReturnRemoval": false,
         "RoundingFamily": false,
         "TrueValue": false,
         "ArrayItem": {
@@ -69,11 +67,6 @@
                 "if\\s*\\(\\$this->ball->getResolutionAngleVertical\\(\\) > 0 && \\(.+",
             ],
         },
-        "LogicalAndNegation": {
-            "ignoreSourceCodeByRegex": [
-                "if\\s*\\(\\$count > 10 && \\$count % 2 === 0\\)\\s\\{",
-            ],
-        },
         "LogicalNot": {
             "ignoreSourceCodeByRegex": [
                 ".+\\$this->lastMoveX === -\\$moveX.+",
@@ -85,6 +78,9 @@
             ],
         },
         "MethodCallRemoval": {
+            "ignore": [
+                "cs\\Equipment\\Bomb::unEquip",
+            ],
             "ignoreSourceCodeByRegex": [
                 "\\$this->setActiveFloor\\(.+\\);",
                 "\\$prevPos->setFrom\\(\\$candidate\\);",
diff --git a/phpunit.xml b/phpunit.xml
@@ -25,7 +25,6 @@
             <directory>server/src/</directory>
         </include>
         <exclude>
-            <directory>server/src/Equipment/</directory>
             <directory>server/src/Map/</directory>
             <directory>server/src/Weapon/</directory>
         </exclude>
diff --git a/server/src/Core/BuyMenu.php b/server/src/Core/BuyMenu.php
@@ -29,7 +29,7 @@ public function reset(bool $forAttackerStore, array $alreadyHaveItems): void
 
         foreach ($alreadyHaveItems as $item) {
             if ($item->getType() === ItemType::TYPE_GRENADE) {
-                $this->grenadeCount++;
+                $this->grenadeCount += $item->getQuantity();
             }
 
             if (!isset($this->itemBuyCount[$item->getId()])) {
diff --git a/server/src/Core/HitBox.php b/server/src/Core/HitBox.php
@@ -34,6 +34,7 @@ public function reset(): void
         $this->damage = 0;
     }
 
+    /** @infection-ignore-all */
     public function getHitAntiForce(Point $point): int
     {
         if ($this->type === HitBoxType::HEAD) {
@@ -84,6 +85,7 @@ public function registerHit(Bullet $bullet): void
         }
     }
 
+    /** @infection-ignore-all */
     private function calculateArmorDamage(BaseWeapon $shootItem, ArmorType $armorType, HitBoxType $hitBoxType): int
     {
         if ($armorType->hasNoArmor() || $hitBoxType === HitBoxType::LEG) {
diff --git a/server/src/Core/PathFinder.php b/server/src/Core/PathFinder.php
@@ -9,7 +9,7 @@
 final class PathFinder
 {
     private Graph $graph;
-    /** @var array<string,bool> */
+    /** @var array<string,null> */
     private array $visited = [];
     private readonly int $obstacleOvercomeHeight;
     /** @var array<int,array{int,int,int}> */
@@ -105,8 +105,8 @@ public function findTile(Point $pointOnFloor, int $radius): ?Point
             return $floorNavmeshPoint;
         }
 
-        $maxDistance = $this->navigationMesh->tileSize * 2;
-        $maxY = $this->obstacleOvercomeHeight * 2;
+        $maxDistance = $this->navigationMesh->tileSize + $this->navigationMesh->tileSize;
+        $maxY = $this->obstacleOvercomeHeight + $this->obstacleOvercomeHeight;
         $checkAbove = function (Point $start, int $maxY, int $radius): ?Point {
             $yCandidate = $start->clone();
             $navMeshCenter = $yCandidate->clone();
@@ -188,7 +188,7 @@ public function buildNavigationMesh(Point $start, int $objectHeight, int $maxNod
                 continue;
             }
 
-            $this->visited[$currentKey] = true;
+            $this->visited[$currentKey] = null;
             $currentNode = $this->graph->getNodeById($currentKey);
             if ($currentNode === null) {
                 $currentNode = new Node($currentKey, $current);
@@ -210,7 +210,7 @@ public function buildNavigationMesh(Point $start, int $objectHeight, int $maxNod
                 $this->graph->addEdge(new DirectedEdge($currentNode, $newNode, 1));
                 $queue->enqueue($newNeighbour);
             }
-            if (++$nodeCount === $maxNodeCount) {
+            if (++$nodeCount === $maxNodeCount) { // @codeCoverageIgnore
                 GameException::notImplementedYet('MaxNodeCount hit - new map, tileSize or bad test (no boundary box, bad starting point)?'); // @codeCoverageIgnore
             }
         }
diff --git a/server/src/Core/PlayerStat.php b/server/src/Core/PlayerStat.php
@@ -41,6 +41,11 @@ public function getKills(): int
         return $this->kills;
     }
 
+    public function getHeadshotKills(): int
+    {
+        return $this->killsHeadshot;
+    }
+
     public function getDeaths(): int
     {
         return $this->deaths;
diff --git a/server/src/Core/Score.php b/server/src/Core/Score.php
@@ -73,7 +73,7 @@ public function roundEnd(RoundEndEvent $event): void
         }
 
         if ($this->secondHalfScore !== []) {
-            $this->secondHalfScore[(int)$attackersWins]++;
+            $this->secondHalfScore[$attackersWins ? 1 : 0]++;
         }
         $this->lastRoundAttackerWins = $attackersWins;
         $this->roundsHistory[$this->roundNumber] = [
@@ -145,7 +145,7 @@ public function toArray(): array
         $scoreboard = [[], []];
         foreach ($this->playerStats as $playerId => $playerStat) {
             $key = sprintf('%d-%d-%d', $playerStat->getKills(), $playerStat->getDamage(), $playerId);
-            $scoreboard[(int)$playerStat->isAttacker()][$key] = $playerStat->toArray();
+            $scoreboard[$playerStat->isAttacker() ? 1 : 0][$key] = $playerStat->toArray();
         }
         $teamDefenders = $scoreboard[0];
         $teamAttackers = $scoreboard[1];
diff --git a/server/src/Equipment/Grenade.php b/server/src/Equipment/Grenade.php
@@ -35,6 +35,7 @@ public function attackSecondary(Attackable $event): ?AttackResult
         return $event->fire();
     }
 
+    /** @codeCoverageIgnore **/
     public function getDamageValue(HitBoxType $hitBox, ArmorType $armor): int
     {
         GameException::invalid();
@@ -55,6 +56,7 @@ public function getSpeedMultiplier(): float
         return ($this->primaryAttack ? 1.0 : 0.5);
     }
 
+    /** @codeCoverageIgnore **/
     public function createBullet(): Bullet
     {
         GameException::invalid(get_class($this));
diff --git a/server/src/Equipment/HighExplosive.php b/server/src/Equipment/HighExplosive.php
@@ -27,7 +27,7 @@ public function calculateDamage(int $distanceSquared, bool $harArmor): int
     {
         $distanceSquared = max(1, $distanceSquared);
         if ($distanceSquared >= self::MAX_BLAST_RADIUS_SQUARED) {
-            return 0;
+            return 0; // @codeCoverageIgnore
         }
 
         $damage = self::DAMAGE * (1 - ($distanceSquared / self::MAX_BLAST_RADIUS_SQUARED));
diff --git a/server/src/Equipment/Incendiary.php b/server/src/Equipment/Incendiary.php
@@ -31,6 +31,7 @@ public function getMaxAreaMetersSquared(): int
         return 200_000;
     }
 
+    /** @codeCoverageIgnore **/
     public function calculateDamage(bool $hasKevlar): int
     {
         return $hasKevlar ? 7 : 3;
diff --git a/server/src/Equipment/Kevlar.php b/server/src/Equipment/Kevlar.php
@@ -29,6 +29,7 @@ public function repairArmor(): void
         $this->armor = 100;
     }
 
+    /** @codeCoverageIgnore **/
     public function lowerArmor(int $armorDamage): void
     {
         assert($armorDamage >= 0);
@@ -86,12 +87,12 @@ public function canPurchaseMultipleTime(Item $newSlotItem): bool
     public function getPrice(?Item $alreadyHaveSlotItem = null): int
     {
         /** @var ?self $alreadyHaveSlotItem */
-        if ($alreadyHaveSlotItem && $this->type === ArmorType::BODY_AND_HEAD && $alreadyHaveSlotItem->type === ArmorType::BODY && $alreadyHaveSlotItem->armor === 100) {
-            return 350;
-        }
         if ($alreadyHaveSlotItem && $alreadyHaveSlotItem->type === ArmorType::BODY_AND_HEAD) {
             return 650;
         }
+        if ($alreadyHaveSlotItem && $this->type === ArmorType::BODY_AND_HEAD && $alreadyHaveSlotItem->type === ArmorType::BODY && $alreadyHaveSlotItem->armor === 100) {
+            return 350;
+        }
         return $this->bodyPlusHelmet ? 1000 : 650;
     }
 
diff --git a/server/src/Event/GrillEvent.php b/server/src/Event/GrillEvent.php
@@ -4,7 +4,6 @@
 
 use cs\Core\Column;
 use cs\Core\Point;
-use cs\Core\Setting;
 use cs\Enum\SoundType;
 
 final class GrillEvent extends VolumetricEvent
@@ -35,7 +34,6 @@ protected function shrinkPart(Column $column): void
 
     protected function expandPart(Point $center): Column
     {
-        assert($this->partHeight < Setting::playerHeadHeightCrouch());
         $flame = new Column($center, $this->partRadius, $this->partHeight);
         if ($this->world->flameCanIgnite($flame)) {
             $soundEvent = new SoundEvent($flame->center, SoundType::FLAME_SPAWN);
@@ -57,7 +55,7 @@ public function extinguish(Column $flame): void
 
     public function canHitPlayer(int $playerId, int $tickId): bool
     {
-        return (($this->playerTickHits[$playerId] ?? 0) + $this->damageCoolDownTickCount <= $tickId);
+        return (($this->playerTickHits[$playerId] ?? -$this->damageCoolDownTickCount) + $this->damageCoolDownTickCount <= $tickId);
     }
 
     public function playerHit(int $playerId, int $tickId): void
diff --git a/server/src/Event/PauseStartEvent.php b/server/src/Event/PauseStartEvent.php
@@ -10,7 +10,7 @@ final class PauseStartEvent extends TimeoutEvent
 {
 
     /** @param Closure(static,int):void $callback */
-    public function __construct(private Game $game, private PauseReason $reason, Closure $callback, int $timeoutMs)
+    public function __construct(private Game $game, public readonly PauseReason $reason, Closure $callback, int $timeoutMs)
     {
         parent::__construct($callback, $timeoutMs);
     }
diff --git a/server/src/Event/ThrowEvent.php b/server/src/Event/ThrowEvent.php
@@ -143,6 +143,7 @@ public function process(int $tick): void
                 continue;
             }
 
+            /** @infection-ignore-all */
             if (
                 $this->ball->getResolutionAngleVertical() > 0
                 && ($this->item instanceof Flammable || $this->item instanceof Smoke)
diff --git a/server/src/Net/ClueSocket.php b/server/src/Net/ClueSocket.php
@@ -36,7 +36,7 @@ public function sendTo(Client $client, string &$msg): void
         }
     }
 
-    public function receive(?string &$peerAddress, ?int &$peerPort, int $readMaxBytes = 100): ?string
+    public function receive(?string &$peerAddress, ?int &$peerPort, int $readMaxBytes): ?string
     {
         $ret = @socket_recvfrom($this->resource, $buffer, $readMaxBytes, 0, $peerAddress, $peerPort); // @phpstan-ignore-line
         if ($ret === false) {
diff --git a/server/src/Net/NetConnector.php b/server/src/Net/NetConnector.php
@@ -8,7 +8,7 @@ interface NetConnector
     /**
      * @throws NetException
      */
-    public function receive(?string &$peerAddress, ?int &$peerPort, int $readMaxBytes = 100): ?string;
+    public function receive(?string &$peerAddress, ?int &$peerPort, int $readMaxBytes): ?string;
 
     /**
      * @throws NetException
diff --git a/server/src/Net/TestConnector.php b/server/src/Net/TestConnector.php
@@ -20,7 +20,7 @@ public function __construct(private array $requests)
     {
     }
 
-    public function receive(?string &$peerAddress, ?int &$peerPort, int $readMaxBytes = 100): ?string
+    public function receive(?string &$peerAddress, ?int &$peerPort, int $readMaxBytes): ?string
     {
         if (!$this->expectReceive) {
             return null;
diff --git a/test/og/Game/RoundTest.php b/test/og/Game/RoundTest.php
diff --git a/test/og/Inventory/InventoryTest.php b/test/og/Inventory/InventoryTest.php
diff --git a/test/og/Shooting/BombTest.php b/test/og/Shooting/BombTest.php
diff --git a/test/og/Shooting/PlayerKillTest.php b/test/og/Shooting/PlayerKillTest.php
diff --git a/test/og/Shooting/ShootTest.php b/test/og/Shooting/ShootTest.php
diff --git a/test/og/Unit/CollisionTest.php b/test/og/Unit/CollisionTest.php

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function reset(bool $forAttackerStore, array $alreadyHaveItems): void`
`29`	`29`
`30`	`30`	`foreach ($alreadyHaveItems as $item) {`
`31`	`31`	`if ($item->getType() === ItemType::TYPE_GRENADE) {`
`32`		`- $this->grenadeCount++;`
	`32`	`+ $this->grenadeCount += $item->getQuantity();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (!isset($this->itemBuyCount[$item->getId()])) {`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public function reset(): void`
`34`	`34`	`$this->damage = 0;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ /** @infection-ignore-all */`
`37`	`38`	`public function getHitAntiForce(Point $point): int`
`38`	`39`	`{`
`39`	`40`	`if ($this->type === HitBoxType::HEAD) {`
`@@ -84,6 +85,7 @@ public function registerHit(Bullet $bullet): void`
`84`	`85`	`}`
`85`	`86`	`}`
`86`	`87`
	`88`	`+ /** @infection-ignore-all */`
`87`	`89`	`private function calculateArmorDamage(BaseWeapon $shootItem, ArmorType $armorType, HitBoxType $hitBoxType): int`
`88`	`90`	`{`
`89`	`91`	`if ($armorType->hasNoArmor() \|\| $hitBoxType === HitBoxType::LEG) {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`final class PathFinder`
`10`	`10`	`{`
`11`	`11`	`private Graph $graph;`
`12`		`- /** @var array<string,bool> */`
	`12`	`+ /** @var array<string,null> */`
`13`	`13`	`private array $visited = [];`
`14`	`14`	`private readonly int $obstacleOvercomeHeight;`
`15`	`15`	`/** @var array<int,array{int,int,int}> */`
`@@ -105,8 +105,8 @@ public function findTile(Point $pointOnFloor, int $radius): ?Point`
`105`	`105`	`return $floorNavmeshPoint;`
`106`	`106`	`}`
`107`	`107`
`108`		`- $maxDistance = $this->navigationMesh->tileSize * 2;`
`109`		`- $maxY = $this->obstacleOvercomeHeight * 2;`
	`108`	`+ $maxDistance = $this->navigationMesh->tileSize + $this->navigationMesh->tileSize;`
	`109`	`+ $maxY = $this->obstacleOvercomeHeight + $this->obstacleOvercomeHeight;`
`110`	`110`	`$checkAbove = function (Point $start, int $maxY, int $radius): ?Point {`
`111`	`111`	`$yCandidate = $start->clone();`
`112`	`112`	`$navMeshCenter = $yCandidate->clone();`
`@@ -188,7 +188,7 @@ public function buildNavigationMesh(Point $start, int $objectHeight, int $maxNod`
`188`	`188`	`continue;`
`189`	`189`	`}`
`190`	`190`
`191`		`- $this->visited[$currentKey] = true;`
	`191`	`+ $this->visited[$currentKey] = null;`
`192`	`192`	`$currentNode = $this->graph->getNodeById($currentKey);`
`193`	`193`	`if ($currentNode === null) {`
`194`	`194`	`$currentNode = new Node($currentKey, $current);`
`@@ -210,7 +210,7 @@ public function buildNavigationMesh(Point $start, int $objectHeight, int $maxNod`
`210`	`210`	`$this->graph->addEdge(new DirectedEdge($currentNode, $newNode, 1));`
`211`	`211`	`$queue->enqueue($newNeighbour);`
`212`	`212`	`}`
`213`		`- if (++$nodeCount === $maxNodeCount) {`
	`213`	`+ if (++$nodeCount === $maxNodeCount) { // @codeCoverageIgnore`
`214`	`214`	`GameException::notImplementedYet('MaxNodeCount hit - new map, tileSize or bad test (no boundary box, bad starting point)?'); // @codeCoverageIgnore`
`215`	`215`	`}`
`216`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,11 @@ public function getKills(): int`
`41`	`41`	`return $this->kills;`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ public function getHeadshotKills(): int`
	`45`	`+ {`
	`46`	`+ return $this->killsHeadshot;`
	`47`	`+ }`
	`48`	`+`
`44`	`49`	`public function getDeaths(): int`
`45`	`50`	`{`
`46`	`51`	`return $this->deaths;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function roundEnd(RoundEndEvent $event): void`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if ($this->secondHalfScore !== []) {`
`76`		`- $this->secondHalfScore[(int)$attackersWins]++;`
	`76`	`+ $this->secondHalfScore[$attackersWins ? 1 : 0]++;`
`77`	`77`	`}`
`78`	`78`	`$this->lastRoundAttackerWins = $attackersWins;`
`79`	`79`	`$this->roundsHistory[$this->roundNumber] = [`
`@@ -145,7 +145,7 @@ public function toArray(): array`
`145`	`145`	`$scoreboard = [[], []];`
`146`	`146`	`foreach ($this->playerStats as $playerId => $playerStat) {`
`147`	`147`	`$key = sprintf('%d-%d-%d', $playerStat->getKills(), $playerStat->getDamage(), $playerId);`
`148`		`- $scoreboard[(int)$playerStat->isAttacker()][$key] = $playerStat->toArray();`
	`148`	`+ $scoreboard[$playerStat->isAttacker() ? 1 : 0][$key] = $playerStat->toArray();`
`149`	`149`	`}`
`150`	`150`	`$teamDefenders = $scoreboard[0];`
`151`	`151`	`$teamAttackers = $scoreboard[1];`