Merge pull request #42 from ChessCom/BP/PHP8

PHP8 support

Author: bojanpejic

.travis.yml

@@ -5,6 +5,7 @@ php:
   - "7.2"
   - "7.3"
   - "7.4"
+  - "8.0"
 
 matrix:
   fast_finish: true

Tests/ChessGameTest.php

@@ -9,7 +9,7 @@ class ChessGameTest extends TestCase
     /** @var ChessGame */
     private $game;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->game = new ChessGame();
     }
@@ -1096,6 +1096,20 @@ public function testGameShouldEndInFiveFoldRepetition()
         $this->assertFiveFoldRepetitionDraw();
     }
 
+    public function testNotInBasicDrawTwoWhiteVsTwoBlack()
+    {
+        $fen = '8/8/8/8/4k3/8/3Kn3/6Q1 w - -';
+        $this->game->resetGame($fen);
+        $this->assertFalse($this->game->inBasicDraw());
+    }
+
+    public function testInBasicDrawThreePiecesRemained()
+    {
+        $fen = '8/8/8/8/4k3/8/3K4/6n1 w - -';
+        $this->game->resetGame($fen);
+        $this->assertTrue($this->game->inBasicDraw());
+    }
+
     private function assertFiveFoldRepetitionDraw()
     {
         $this->assertTrue($this->game->inRepetitionDraw());

composer.json

@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.3",
-        "phpunit/phpunit": "^7.3"
+        "phpunit/phpunit": "^7.3 || ^9.5"
     },
     "config": {
         "bin-dir": "bin"

src/Chess/Game/ChessGame.php

@@ -600,7 +600,7 @@ protected function getSquareFromParsedMove($parsedMove, $color = null)
 
                         if (count($legalMoves) != 1) {
                             $square = $col = $row = null;
-                            $pieces = implode($legalMoves, ' ');
+                            $pieces = implode(' ', $legalMoves);
 
                             return $this->raiseError(
                                 self::GAMES_CHESS_ERROR_TOO_AMBIGUOUS,
@@ -1448,9 +1448,11 @@ public function inBasicDraw()
 
             $playerWith3Pieces = count($whitePieces) === 3 ? $whitePieces : $blackPieces;
 
-            if (in_array($playerWith3Pieces[0], array('K', 'N'))
+            if (count($playerWith3Pieces) === 3
+                && in_array($playerWith3Pieces[0], array('K', 'N'))
                 && in_array($playerWith3Pieces[1], array('K', 'N'))
-                && in_array($playerWith3Pieces[2], array('K', 'N'))) {
+                && in_array($playerWith3Pieces[2], array('K', 'N'))
+            ) {
                 return true; //KNN vs K
             }