Upgraded to PHP 7.4

Author: waltertamboer

composer.json

@@ -4,7 +4,7 @@
     "license": "MIT",
     "type": "library",
     "require": {
-        "php": "^7.2"
+        "php": "^7.4"
     },
     "require-dev": {
         "chesszebra/coding-standards": "dev-master",

src/CastlingAvailability.php

@@ -5,6 +5,7 @@
 namespace ChessZebra\ForsythEdwardsNotation;
 
 use ChessZebra\ForsythEdwardsNotation\Exception\InvalidCastlingAvailabilityException;
+
 use function strlen;
 
 /**
@@ -44,10 +45,8 @@ final class CastlingAvailability
 
     /**
      * The bitwise value that represents the castling availability.
-     *
-     * @var int
      */
-    private $value;
+    private int $value;
 
     /**
      * Initializes a new instance of this class.

src/Exception/InvalidCastlingAvailabilityException.php

@@ -6,6 +6,7 @@
 
 use RuntimeException;
 use Throwable;
+
 use function sprintf;
 
 final class InvalidCastlingAvailabilityException extends RuntimeException // phpcs:ignore

src/Exception/InvalidFenException.php

@@ -6,6 +6,7 @@
 
 use RuntimeException;
 use Throwable;
+
 use function count;
 use function explode;
 use function sprintf;

src/FenNotation.php

@@ -5,6 +5,7 @@
 namespace ChessZebra\ForsythEdwardsNotation;
 
 use ChessZebra\ForsythEdwardsNotation\Exception\InvalidFenException;
+
 use function explode;
 
 /**
@@ -17,18 +18,14 @@ final class FenNotation
 
     /**
      * The places of the pieces.
-     *
-     * @var string
      */
-    private $piecePlacement;
+    private string $piecePlacement;
 
     /**
      * An indication whether its black or white's turn.
      * The value 'b' means black, 'w' means white.
-     *
-     * @var string
      */
-    private $turn;
+    private string $turn;
 
     /**
      * A value that indicates whether or not castling is available.
@@ -37,35 +34,27 @@ final class FenNotation
      * - "Q" (White can castle queenside),
      * - "k" (Black can castle kingside), and/or
      * - "q" (Black can castle queenside).
-     *
-     * @var CastlingAvailability
      */
-    private $castlingAvailability;
+    private CastlingAvailability $castlingAvailability;
 
     /**
      * En passant target square in Standard Algebraic Notation (SAN).
      * If there's no en passant target square, this value is null. If a pawn has just made a two-square move, this is
      * the position "behind" the pawn. This is recorded regardless of whether there is a pawn in position to make an
      * en passant capture.
-     *
-     * @var string|null
      */
-    private $enPassantTargetSquare;
+    private ?string $enPassantTargetSquare;
 
     /**
      * Halfmove clock: This is the number of halfmoves since the last capture or pawn advance. This is used to
      * determine if a draw can be claimed under the fifty-move rule.
-     *
-     * @var int
      */
-    private $halfMoveClock;
+    private int $halfMoveClock;
 
     /**
      * Fullmove number: The number of the full move. It starts at 1, and is incremented after Black's move.
-     *
-     * @var int
      */
-    private $fullMoveNumber;
+    private int $fullMoveNumber;
 
     public function __construct(string $fen)
     {
@@ -91,29 +80,39 @@ private function validate(string $fen): void
 
             case ValidationResult::EN_PASSANT_INVALID_MOVE:
                 throw InvalidFenException::enPassantIllegal($fen);
+
             case ValidationResult::EN_PASSANT_INVALID_SQUARE:
                 throw InvalidFenException::enPassantInvalidSquare($fen);
+
             case ValidationResult::FIELD_COUNT_TOO_LARGE:
             case ValidationResult::FIELD_COUNT_TOO_SMALL:
                 throw InvalidFenException::incorrectFieldCount($fen);
+
             case ValidationResult::INVALID_CASTLING_PIECE:
                 throw InvalidFenException::invalidCastlingPiece($fen);
+
             case ValidationResult::INVALID_TURN:
                 throw InvalidFenException::invalidTurn($fen);
+
             case ValidationResult::HALFMOVE_COUNTER_NAN:
                 throw InvalidFenException::wrongHalfMoveCounter($fen);
+
             case ValidationResult::MOVE_NUMBER_NAN:
             case ValidationResult::MOVE_NUMBER_POSITIVE:
                 throw InvalidFenException::wrongMoveNumber($fen);
+
             case ValidationResult::PIECE_CONSECUTIVE_NUMBERS:
             case ValidationResult::PIECE_INVALID:
                 throw InvalidFenException::invalidPiecePlacement($fen);
+
             case ValidationResult::PIECE_ROW_TOO_LARGE:
             case ValidationResult::PIECE_ROW_TOO_SMALL:
                 throw InvalidFenException::incorrectPiecePlacementRowLength($fen);
+
             case ValidationResult::PIECE_NOT_ENOUGH_ROWS:
             case ValidationResult::PIECE_TOO_MANY_ROWS:
                 throw InvalidFenException::incorrectPiecePlacementRowsLength($fen);
+
             default:
                 throw InvalidFenException::unepectedError($fen); // @codeCoverageIgnore
         }

src/Validator.php

@@ -67,15 +67,15 @@ public function validate(string $fen): int
             $previousWasNumber = false;
 
             for ($k = 0; $k < strlen($rows[$i]); ++$k) {
-                if (ctype_digit($rows[$i]{$k})) {
+                if (ctype_digit($rows[$i][$k])) {
                     if ($previousWasNumber) {
                         return ValidationResult::PIECE_CONSECUTIVE_NUMBERS;
                     }
 
-                    $sumFields += intval($rows[$i]{$k}, 10);
+                    $sumFields += intval($rows[$i][$k], 10);
                     $previousWasNumber = true;
                 } else {
-                    if (strpos(self::SYMBOLS, $rows[$i]{$k}) === false) {
+                    if (strpos(self::SYMBOLS, $rows[$i][$k]) === false) {
                         return ValidationResult::PIECE_INVALID;
                     }
 
@@ -94,8 +94,12 @@ public function validate(string $fen): int
         }
 
         if ($tokens[FenFields::EN_PASSANT] !== '-') {
-            if (($tokens[FenFields::EN_PASSANT]{1} === '3' && $tokens[FenFields::TURN] === 'w') ||
-                ($tokens[FenFields::EN_PASSANT]{1} === '6' && $tokens[FenFields::TURN] === 'b')) {
+            $enPassant = $tokens[FenFields::EN_PASSANT];
+
+            if (
+                ($enPassant[1] === '3' && $tokens[FenFields::TURN] === 'w') ||
+                ($enPassant[1] === '6' && $tokens[FenFields::TURN] === 'b')
+            ) {
                 return ValidationResult::EN_PASSANT_INVALID_MOVE;
             }
         }