Revert "CV-142681 Chess-Game Do not allow pieces in rook position to castle"

Author: andreij

Tests/ChessGameTest.php

@@ -71,42 +71,6 @@ public function testBlankBoardFen()
         $this->assertEquals('8/8/8/8/8/8/8/8 w KQkq - 1 1', $this->game->renderFen());
     }
 
-    public function testCastlingForbiddenIfNotRook()
-    {
-        $startFen = 'q3k2q/pbpqppbp/1pnp1np1/8/8/1PNP1NP1/PBPQPPBP/Q3K2Q w KQkq - 2 9';
-        $this->game->resetGame($startFen);
-
-        self::assertFalse($this->game->canCastleKingside());
-        self::assertFalse($this->game->canCastleQueenside());
-
-        $this->game->moveSAN('e3');
-
-        self::assertFalse($this->game->canCastleKingside());
-        self::assertFalse($this->game->canCastleQueenside());
-
-        $startFen = 'r3k2q/pppppppp/8/8/8/8/PPPPPPPP/Q3K2R w KQkq - 0 1';
-        $this->game->resetGame($startFen);
-
-        self::assertTrue($this->game->canCastleKingside());
-        self::assertFalse($this->game->canCastleQueenside());
-
-        $this->game->moveSAN('e3');
-
-        self::assertFalse($this->game->canCastleKingside());
-        self::assertTrue($this->game->canCastleQueenside());
-
-        $startFen = 'q3k2r/pppppppp/8/8/8/8/PPPPPPPP/R3K2Q w KQkq - 0 1';
-        $this->game->resetGame($startFen);
-
-        self::assertFalse($this->game->canCastleKingside());
-        self::assertTrue($this->game->canCastleQueenside());
-
-        $this->game->moveSAN('e3');
-
-        self::assertTrue($this->game->canCastleKingside());
-        self::assertFalse($this->game->canCastleQueenside());
-    }
-
     public function testCastlingBlackFromTheKingSide()
     {
         $startFen = 'rnbqk2r/pppp1ppp/5n2/2b1p3/P1P1P1P1/8/1P1P1P1P/RNBQKBNR b KQkq a3 0 4';

src/Chess/Game/ChessGame.php

@@ -2193,30 +2193,23 @@ public function _parseFen($fen)
         $this->_WCastleK = false;
         $this->_BCastleQ = false;
         $this->_BCastleK = false;
-
-        $wr1 = $this->getPiece('WR1');
-        $wr2 = $this->getPiece('WR2');
-        $br1 = $this->getPiece('BR1');
-        $br2 = $this->getPiece('BR2');
-
         if ($splitFen[2] != '-') {
             for ($i = 0; $i < 4; $i++) {
                 if ($i >= strlen($splitFen[2])) {
                     continue;
                 }
-
                 switch ($splitFen[2][$i]) {
                     case 'K' :
-                        $this->_WCastleK = $wr1 === 'h1' || $wr2 === 'h1';
+                        $this->_WCastleK = true;
                         break;
                     case 'Q' :
-                        $this->_WCastleQ = $wr1 === 'a1' || $wr2 === 'a1';
+                        $this->_WCastleQ = true;
                         break;
                     case 'k' :
-                        $this->_BCastleK = $br1 === 'h8' || $br2 === 'h8';
+                        $this->_BCastleK = true;
                         break;
                     case 'q' :
-                        $this->_BCastleQ = $br1 === 'a8' || $br2 === 'a8';
+                        $this->_BCastleQ = true;
                         break;
                     default:
                         return $this->raiseError(self::GAMES_CHESS_ERROR_FEN_CASTLEWRONG,
@@ -3621,8 +3614,8 @@ public function rollbackTransaction()
     public function isBishop($pieceName)
     {
         return $pieceName[1] == 'B' ||
-            ($pieceName[1] == 'P' &&
-                $this->_pieces[$pieceName][1] == 'B');
+        ($pieceName[1] == 'P' &&
+            $this->_pieces[$pieceName][1] == 'B');
     }
 
     /**
@@ -3638,8 +3631,8 @@ public function isBishop($pieceName)
     public function isRook($pieceName)
     {
         return $pieceName[1] == 'R' ||
-            ($pieceName[1] == 'P' &&
-                $this->_pieces[$pieceName][1] == 'R');
+        ($pieceName[1] == 'P' &&
+            $this->_pieces[$pieceName][1] == 'R');
     }
 
     /**
@@ -3655,7 +3648,7 @@ public function isRook($pieceName)
     public function isPawn($pieceName)
     {
         return $pieceName[1] == 'P' &&
-            $this->_pieces[$pieceName][1] == 'P';
+        $this->_pieces[$pieceName][1] == 'P';
     }
 
     /**
@@ -3681,8 +3674,8 @@ public function isKing($pieceName)
     public function _isKnight($pieceName)
     {
         return $pieceName[1] == 'N' ||
-            ($pieceName[1] == 'P' &&
-                $this->_pieces[$pieceName][1] == 'N');
+        ($pieceName[1] == 'P' &&
+            $this->_pieces[$pieceName][1] == 'N');
     }
 
     /**