Skip to content

Commit

Permalink
Updated to PHP Chess 1.5.26
Browse files Browse the repository at this point in the history
  • Loading branch information
@programarivm
programarivm committed Feb 18, 2025
1 parent 22f561a commit 9ebc954
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 48 deletions.
14 changes: 4 additions & 10 deletions src/Command/Game/Blocking/ExtractTask.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@
use Chess\SanExtractor;
use Chess\Eval\FastFunction;
use Chess\Variant\VariantType;
use Chess\Variant\Capablanca\Board as CapablancaBoard;
use Chess\Variant\Capablanca\FenToBoardFactory as CapablancaFenToBoardFactory;
use Chess\Variant\CapablancaFischer\Board as CapablancaFischerBoard;
use Chess\Variant\CapablancaFischer\FenToBoardFactory as CapablancaFischerFenToBoardFactory;
use Chess\Variant\CapablancaFischer\Shuffle as CapablancaFischerShuffle;
use Chess\Variant\Chess960\Board as Chess960Board;
use Chess\Variant\Chess960\FenToBoardFactory as Chess960FenToBoardFactory;
use Chess\Variant\Chess960\Shuffle as Chess960Shuffle;
use Chess\Variant\Classical\Board as ClassicalBoard;
use Chess\Variant\Classical\FenToBoardFactory as ClassicalFenToBoardFactory;
use ChessServer\Command\AbstractBlockingTask;

Expand All @@ -26,19 +20,19 @@ public function run()
if ($this->params['variant'] === VariantType::CHESS_960) {
$board = isset($this->params['fen'])
? Chess960FenToBoardFactory::create($this->params['fen'])
: new Chess960Board((new Chess960Shuffle())->create());
: Chess960FenToBoardFactory::create();
} elseif ($this->params['variant'] === VariantType::CAPABLANCA) {
$board = isset($this->params['fen'])
? CapablancaFenToBoardFactory::create($this->params['fen'])
: new CapablancaBoard();
: CapablancaFenToBoardFactory::create();
} elseif ($this->params['variant'] === VariantType::CAPABLANCA_FISCHER) {
$board = isset($this->params['fen'])
? CapablancaFischerFenToBoardFactory::create($this->params['fen'])
: new CapablancaFischerBoard((new CapablancaFischerShuffle())->create());
: CapablancaFischerFenToBoardFactory::create();
} elseif ($this->params['variant'] === VariantType::CLASSICAL) {
$board = isset($this->params['fen'])
? ClassicalFenToBoardFactory::create($this->params['fen'])
: new ClassicalBoard();
: ClassicalFenToBoardFactory::create();
}

$steinitz = SanExtractor::steinitz($f, $board->clone(), $this->params['movetext']);
Expand Down
7 changes: 2 additions & 5 deletions src/Command/Game/Blocking/PlayRavTask.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@

use Chess\Play\RavPlay;
use Chess\Variant\VariantType;
use Chess\Variant\Chess960\Board as Chess960Board;
use Chess\Variant\Chess960\FenToBoardFactory as Chess960FenToBoardFactory;
use Chess\Variant\Chess960\Shuffle as Chess960Shuffle;
use Chess\Variant\Classical\Board as ClassicalBoard;
use Chess\Variant\Classical\FenToBoardFactory as ClassicalFenToBoardFactory;
use ChessServer\Command\AbstractBlockingTask;

Expand All @@ -18,12 +15,12 @@ public function run()
if ($this->params['variant'] === VariantType::CHESS_960) {
$board = isset($this->params['fen'])
? Chess960FenToBoardFactory::create($this->params['fen'])
: new Chess960Board((new Chess960Shuffle())->create());
: Chess960FenToBoardFactory::create();
$ravPlay = new RavPlay($this->params['movetext'], $board);
} else {
$board = isset($this->params['fen'])
? ClassicalFenToBoardFactory::create($this->params['fen'])
: new ClassicalBoard();
: ClassicalFenToBoardFactory::create();
$ravPlay = new RavPlay($this->params['movetext'], $board);
}

Expand Down
14 changes: 4 additions & 10 deletions src/Command/Game/Blocking/PlotTask.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@
use Chess\SanPlotter;
use Chess\Eval\CompleteFunction;
use Chess\Variant\VariantType;
use Chess\Variant\Capablanca\Board as CapablancaBoard;
use Chess\Variant\Capablanca\FenToBoardFactory as CapablancaFenToBoardFactory;
use Chess\Variant\CapablancaFischer\Board as CapablancaFischerBoard;
use Chess\Variant\CapablancaFischer\FenToBoardFactory as CapablancaFischerFenToBoardFactory;
use Chess\Variant\CapablancaFischer\Shuffle as CapablancaFischerShuffle;
use Chess\Variant\Chess960\Board as Chess960Board;
use Chess\Variant\Chess960\FenToBoardFactory as Chess960FenToBoardFactory;
use Chess\Variant\Chess960\Shuffle as Chess960Shuffle;
use Chess\Variant\Classical\Board as ClassicalBoard;
use Chess\Variant\Classical\FenToBoardFactory as ClassicalFenToBoardFactory;
use ChessServer\Command\AbstractBlockingTask;

Expand All @@ -24,19 +18,19 @@ public function run()
if ($this->params['variant'] === VariantType::CHESS_960) {
$board = isset($this->params['fen'])
? Chess960FenToBoardFactory::create($this->params['fen'])
: new Chess960Board((new Chess960Shuffle())->create());
: Chess960FenToBoardFactory::create();
} elseif ($this->params['variant'] === VariantType::CAPABLANCA) {
$board = isset($this->params['fen'])
? CapablancaFenToBoardFactory::create($this->params['fen'])
: new CapablancaBoard();
: CapablancaFenToBoardFactory::create();
} elseif ($this->params['variant'] === VariantType::CAPABLANCA_FISCHER) {
$board = isset($this->params['fen'])
? CapablancaFischerFenToBoardFactory::create($this->params['fen'])
: new CapablancaFischerBoard((new CapablancaFischerShuffle())->create());
: CapablancaFischerFenToBoardFactory::create();
} elseif ($this->params['variant'] === VariantType::CLASSICAL) {
$board = isset($this->params['fen'])
? ClassicalFenToBoardFactory::create($this->params['fen'])
: new ClassicalBoard();
: ClassicalFenToBoardFactory::create();
}

$time = SanPlotter::time(
Expand Down
37 changes: 14 additions & 23 deletions src/Command/Game/NonBlocking/StartCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,13 @@

use Chess\Play\SanPlay;
use Chess\Variant\VariantType;
use Chess\Variant\Capablanca\Board as CapablancaBoard;
use Chess\Variant\Capablanca\FenToBoardFactory as CapablancaFenToBoardFactory;
use Chess\Variant\CapablancaFischer\Board as CapablancaFischerBoard;
use Chess\Variant\CapablancaFischer\FenToBoardFactory as CapablancaFischerFenToBoardFactory;
use Chess\Variant\CapablancaFischer\Shuffle as CapablancaFischerShuffle;
use Chess\Variant\Chess960\Board as Chess960Board;
use Chess\Variant\Chess960\FenToBoardFactory as Chess960FenToBoardFactory;
use Chess\Variant\Chess960\Shuffle as Chess960Shuffle;
use Chess\Variant\Classical\Board as ClassicalBoard;
use Chess\Variant\Classical\FenToBoardFactory as ClassicalFenToBoardFactory;
use Chess\Variant\Classical\PGN\Color;
use Chess\Variant\Dunsany\Board as DunsanyBoard;
use Chess\Variant\Dunsany\FenToBoardFactory as DunsanyFenToBoardFactory;
use Chess\Variant\Losing\Board as LosingBoard;
use Chess\Variant\Losing\FenToBoardFactory as LosingFenToBoardFactory;
use Chess\Variant\RacingKings\Board as RacingKingsBoard;
use Chess\Variant\RacingKings\FenToBoardFactory as RacingKingsFenToBoardFactory;
use ChessServer\Command\AbstractNonBlockingCommand;
use ChessServer\Command\Game\Game;
Expand Down Expand Up @@ -53,31 +44,31 @@ public function run(AbstractSocket $socket, array $argv, int $id)
if ($params['variant'] === VariantType::CHESS_960) {
$board = isset($params['settings']['fen'])
? Chess960FenToBoardFactory::create($params['settings']['fen'])
: new Chess960Board((new Chess960Shuffle())->create());
: Chess960FenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::CAPABLANCA) {
$board = isset($params['settings']['fen'])
? CapablancaFenToBoardFactory::create($params['settings']['fen'])
: new CapablancaBoard();
: CapablancaFenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::CAPABLANCA_FISCHER) {
$board = isset($params['settings']['fen'])
? CapablancaFischerFenToBoardFactory::create($params['settings']['fen'])
: new CapablancaFischerBoard((new CapablancaFischerShuffle())->create());
: CapablancaFischerFenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::DUNSANY) {
$board = isset($params['settings']['fen'])
? DunsanyFenToBoardFactory::create($params['settings']['fen'])
: new DunsanyBoard();
: DunsanyFenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::LOSING) {
$board = isset($params['settings']['fen'])
? LosingFenToBoardFactory::create($params['settings']['fen'])
: new LosingBoard();
: LosingFenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::RACING_KINGS) {
$board = isset($params['settings']['fen'])
? RacingKingsFenToBoardFactory::create($params['settings']['fen'])
: new RacingKingsBoard();
: RacingKingsFenToBoardFactory::create();
} else {
$board = isset($params['settings']['fen'])
? ClassicalFenToBoardFactory::create($params['settings']['fen'])
: new ClassicalBoard();
: ClassicalFenToBoardFactory::create();
}
$sanPlay = new SanPlay($params['settings']['movetext'] ?? '', $board);
$sanPlay->validate();
Expand All @@ -98,31 +89,31 @@ public function run(AbstractSocket $socket, array $argv, int $id)
if ($params['variant'] === VariantType::CHESS_960) {
$board = isset($params['settings']['fen'])
? Chess960FenToBoardFactory::create($params['settings']['fen'])
: new Chess960Board((new Chess960Shuffle())->create());
: Chess960FenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::CAPABLANCA) {
$board = isset($params['settings']['fen'])
? CapablancaFenToBoardFactory::create($params['settings']['fen'])
: new CapablancaBoard();
: CapablancaFenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::CAPABLANCA_FISCHER) {
$board = isset($params['settings']['fen'])
? CapablancaFischerFenToBoardFactory::create($params['settings']['fen'])
: new CapablancaFischerBoard((new CapablancaFischerShuffle())->create());
: CapablancaFischerFenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::DUNSANY) {
$board = isset($params['settings']['fen'])
? DunsanyFenToBoardFactory::create($params['settings']['fen'])
: new DunsanyBoard();
: DunsanyFenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::LOSING) {
$board = isset($params['settings']['fen'])
? LosingFenToBoardFactory::create($params['settings']['fen'])
: new LosingBoard();
: LosingFenToBoardFactory::create();
} elseif ($params['variant'] === VariantType::RACING_KINGS) {
$board = isset($params['settings']['fen'])
? RacingKingsFenToBoardFactory::create($params['settings']['fen'])
: new RacingKingsBoard();
: RacingKingsFenToBoardFactory::create();
} else {
$board = isset($params['settings']['fen'])
? ClassicalFenToBoardFactory::create($params['settings']['fen'])
: new ClassicalBoard();
: ClassicalFenToBoardFactory::create();
}
$game = (new Game($params['variant'], $params['mode']))->setBoard($board);
$payload = [
Expand Down

0 comments on commit 9ebc954

Please sign in to comment.