From a05d7fcab11d695305f5b3c5efb0a9f967be4117 Mon Sep 17 00:00:00 2001
From: standard <info@programarivm.com>
Date: Tue, 14 Jan 2025 21:20:24 +0100
Subject: [PATCH] Object serialization micro-optimization

---
 src/Variant/AbstractPiece.php                             | 2 +-
 src/Variant/Capablanca/Board.php                          | 2 +-
 src/Variant/Capablanca/{Rule => }/CastlingRule.php        | 4 ++--
 src/Variant/Capablanca/FEN/Str.php                        | 2 +-
 src/Variant/Capablanca/FEN/StrToBoard.php                 | 2 +-
 src/Variant/CapablancaFischer/Board.php                   | 2 +-
 src/Variant/CapablancaFischer/{Rule => }/CastlingRule.php | 4 ++--
 src/Variant/CapablancaFischer/FEN/StrToBoard.php          | 2 +-
 src/Variant/Chess960/Board.php                            | 2 +-
 src/Variant/Chess960/{Rule => }/CastlingRule.php          | 4 ++--
 src/Variant/Chess960/FEN/StrToBoard.php                   | 2 +-
 src/Variant/Classical/Board.php                           | 2 +-
 src/Variant/Classical/{Rule => }/CastlingRule.php         | 2 +-
 src/Variant/Classical/FEN/Str.php                         | 2 +-
 src/Variant/Classical/FEN/StrToBoard.php                  | 2 +-
 src/Variant/Classical/PGN/Move.php                        | 3 +--
 src/Variant/Dunsany/Board.php                             | 2 +-
 src/Variant/Dunsany/FEN/Str.php                           | 2 +-
 src/Variant/Dunsany/FEN/StrToBoard.php                    | 2 +-
 src/Variant/Losing/FEN/StrToBoard.php                     | 2 +-
 src/Variant/PieceArray.php                                | 2 +-
 tests/unit/Variant/Classical/BoardTest.php                | 4 ++--
 tests/unit/Variant/Classical/KTest.php                    | 2 +-
 tests/unit/Variant/Classical/PGN/MoveTest.php             | 2 +-
 24 files changed, 28 insertions(+), 29 deletions(-)
 rename src/Variant/Capablanca/{Rule => }/CastlingRule.php (94%)
 rename src/Variant/CapablancaFischer/{Rule => }/CastlingRule.php (81%)
 rename src/Variant/Chess960/{Rule => }/CastlingRule.php (83%)
 rename src/Variant/Classical/{Rule => }/CastlingRule.php (98%)

diff --git a/src/Variant/AbstractPiece.php b/src/Variant/AbstractPiece.php
index f4318e7cc..dc9324186 100644
--- a/src/Variant/AbstractPiece.php
+++ b/src/Variant/AbstractPiece.php
@@ -10,7 +10,7 @@
 use Chess\Variant\Classical\PGN\AN\Castle;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Piece;
-use Chess\Variant\Classical\Rule\CastlingRule;
+use Chess\Variant\Classical\CastlingRule;
 
 abstract class AbstractPiece
 {
diff --git a/src/Variant/Capablanca/Board.php b/src/Variant/Capablanca/Board.php
index 2c8a0b185..47d07ba9b 100644
--- a/src/Variant/Capablanca/Board.php
+++ b/src/Variant/Capablanca/Board.php
@@ -7,7 +7,7 @@
 use Chess\Variant\VariantType;
 use Chess\Variant\Capablanca\A;
 use Chess\Variant\Capablanca\C;
-use Chess\Variant\Capablanca\Rule\CastlingRule;
+use Chess\Variant\Capablanca\CastlingRule;
 use Chess\Variant\Capablanca\PGN\Move;
 use Chess\Variant\Capablanca\PGN\AN\Square;
 use Chess\Variant\Classical\B;
diff --git a/src/Variant/Capablanca/Rule/CastlingRule.php b/src/Variant/Capablanca/CastlingRule.php
similarity index 94%
rename from src/Variant/Capablanca/Rule/CastlingRule.php
rename to src/Variant/Capablanca/CastlingRule.php
index ba75d8e3f..f041fadf4 100644
--- a/src/Variant/Capablanca/Rule/CastlingRule.php
+++ b/src/Variant/Capablanca/CastlingRule.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Chess\Variant\Capablanca\Rule;
+namespace Chess\Variant\Capablanca;
 
 use Chess\Variant\Classical\PGN\AN\Castle;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Piece;
-use Chess\Variant\Classical\Rule\CastlingRule as ClassicalCastlingRule;
+use Chess\Variant\Classical\CastlingRule as ClassicalCastlingRule;
 
 class CastlingRule extends ClassicalCastlingRule
 {
diff --git a/src/Variant/Capablanca/FEN/Str.php b/src/Variant/Capablanca/FEN/Str.php
index f44a0abcd..2b8537b63 100644
--- a/src/Variant/Capablanca/FEN/Str.php
+++ b/src/Variant/Capablanca/FEN/Str.php
@@ -4,7 +4,7 @@
 
 use Chess\Variant\Capablanca\FEN\PiecePlacement;
 use Chess\Variant\Capablanca\PGN\AN\Square;
-use Chess\Variant\Capablanca\Rule\CastlingRule;
+use Chess\Variant\Capablanca\CastlingRule;
 use Chess\Variant\Classical\FEN\Str as ClassicalFenStr;
 use Chess\Variant\Classical\PGN\AN\Color;
 
diff --git a/src/Variant/Capablanca/FEN/StrToBoard.php b/src/Variant/Capablanca/FEN/StrToBoard.php
index 5b1190ef3..7278c800a 100644
--- a/src/Variant/Capablanca/FEN/StrToBoard.php
+++ b/src/Variant/Capablanca/FEN/StrToBoard.php
@@ -7,9 +7,9 @@
 use Chess\Variant\PieceArray;
 use Chess\Variant\VariantType;
 use Chess\Variant\Capablanca\Board;
+use Chess\Variant\Capablanca\CastlingRule;
 use Chess\Variant\Capablanca\FEN\Str;
 use Chess\Variant\Capablanca\PGN\AN\Square;
-use Chess\Variant\Capablanca\Rule\CastlingRule;
 use Chess\Variant\Classical\FEN\StrToBoard as ClassicalFenStrToBoard;
 
 class StrToBoard extends ClassicalFenStrToBoard
diff --git a/src/Variant/CapablancaFischer/Board.php b/src/Variant/CapablancaFischer/Board.php
index 06867b9d3..5f48e8c0e 100644
--- a/src/Variant/CapablancaFischer/Board.php
+++ b/src/Variant/CapablancaFischer/Board.php
@@ -7,8 +7,8 @@
 use Chess\Variant\VariantType;
 use Chess\Variant\Capablanca\PGN\Move;
 use Chess\Variant\Capablanca\PGN\AN\Square;
+use Chess\Variant\CapablancaFischer\CastlingRule;
 use Chess\Variant\CapablancaFischer\StartPieces;
-use Chess\Variant\CapablancaFischer\Rule\CastlingRule;
 use Chess\Variant\Classical\PGN\AN\Color;
 
 class Board extends AbstractBoard implements RandomBoardInterface
diff --git a/src/Variant/CapablancaFischer/Rule/CastlingRule.php b/src/Variant/CapablancaFischer/CastlingRule.php
similarity index 81%
rename from src/Variant/CapablancaFischer/Rule/CastlingRule.php
rename to src/Variant/CapablancaFischer/CastlingRule.php
index 4ae72a0fc..33f982336 100644
--- a/src/Variant/CapablancaFischer/Rule/CastlingRule.php
+++ b/src/Variant/CapablancaFischer/CastlingRule.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Chess\Variant\CapablancaFischer\Rule;
+namespace Chess\Variant\CapablancaFischer;
 
 use Chess\Variant\RandomCastlingRuleTrait;
 use Chess\Variant\Capablanca\PGN\AN\Square;
-use Chess\Variant\Capablanca\Rule\CastlingRule as CapablancaCastlingRule;
+use Chess\Variant\Capablanca\CastlingRule as CapablancaCastlingRule;
 
 class CastlingRule extends CapablancaCastlingRule
 {
diff --git a/src/Variant/CapablancaFischer/FEN/StrToBoard.php b/src/Variant/CapablancaFischer/FEN/StrToBoard.php
index 86063cbac..1b511e42c 100644
--- a/src/Variant/CapablancaFischer/FEN/StrToBoard.php
+++ b/src/Variant/CapablancaFischer/FEN/StrToBoard.php
@@ -7,7 +7,7 @@
 use Chess\Variant\PieceArray;
 use Chess\Variant\VariantType;
 use Chess\Variant\CapablancaFischer\Board;
-use Chess\Variant\CapablancaFischer\Rule\CastlingRule;
+use Chess\Variant\CapablancaFischer\CastlingRule;
 use Chess\Variant\Capablanca\FEN\Str;
 use Chess\Variant\Capablanca\PGN\AN\Square;
 use Chess\Variant\Classical\FEN\StrToBoard as ClassicalFenStrToBoard;
diff --git a/src/Variant/Chess960/Board.php b/src/Variant/Chess960/Board.php
index d298947ed..df5ae1238 100644
--- a/src/Variant/Chess960/Board.php
+++ b/src/Variant/Chess960/Board.php
@@ -8,8 +8,8 @@
 use Chess\Variant\Classical\PGN\Move;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Square;
+use Chess\Variant\Chess960\CastlingRule;
 use Chess\Variant\Chess960\StartPieces;
-use Chess\Variant\Chess960\Rule\CastlingRule;
 
 class Board extends AbstractBoard implements RandomBoardInterface
 {
diff --git a/src/Variant/Chess960/Rule/CastlingRule.php b/src/Variant/Chess960/CastlingRule.php
similarity index 83%
rename from src/Variant/Chess960/Rule/CastlingRule.php
rename to src/Variant/Chess960/CastlingRule.php
index c81654cd5..594b67356 100644
--- a/src/Variant/Chess960/Rule/CastlingRule.php
+++ b/src/Variant/Chess960/CastlingRule.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Chess\Variant\Chess960\Rule;
+namespace Chess\Variant\Chess960;
 
 use Chess\Variant\RandomCastlingRuleTrait;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule as ClassicalCastlingRule;
+use Chess\Variant\Classical\CastlingRule as ClassicalCastlingRule;
 
 class CastlingRule extends ClassicalCastlingRule
 {
diff --git a/src/Variant/Chess960/FEN/StrToBoard.php b/src/Variant/Chess960/FEN/StrToBoard.php
index 1f3ec7da1..c1d5a368e 100644
--- a/src/Variant/Chess960/FEN/StrToBoard.php
+++ b/src/Variant/Chess960/FEN/StrToBoard.php
@@ -7,7 +7,7 @@
 use Chess\Variant\PieceArray;
 use Chess\Variant\VariantType;
 use Chess\Variant\Chess960\Board;
-use Chess\Variant\Chess960\Rule\CastlingRule;
+use Chess\Variant\Chess960\CastlingRule;
 use Chess\Variant\Classical\FEN\Str;
 use Chess\Variant\Classical\FEN\StrToBoard as ClassicalFenStrToBoard;
 use Chess\Variant\Classical\PGN\AN\Square;
diff --git a/src/Variant/Classical/Board.php b/src/Variant/Classical/Board.php
index 66c407f12..4110bb476 100644
--- a/src/Variant/Classical/Board.php
+++ b/src/Variant/Classical/Board.php
@@ -11,10 +11,10 @@
 use Chess\Variant\Classical\P;
 use Chess\Variant\Classical\Q;
 use Chess\Variant\Classical\R;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\PGN\Move;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
 
 class Board extends AbstractBoard
 {
diff --git a/src/Variant/Classical/Rule/CastlingRule.php b/src/Variant/Classical/CastlingRule.php
similarity index 98%
rename from src/Variant/Classical/Rule/CastlingRule.php
rename to src/Variant/Classical/CastlingRule.php
index 1f369e7bc..e027114b9 100644
--- a/src/Variant/Classical/Rule/CastlingRule.php
+++ b/src/Variant/Classical/CastlingRule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chess\Variant\Classical\Rule;
+namespace Chess\Variant\Classical;
 
 use Chess\Exception\UnknownNotationException;
 use Chess\Variant\AbstractNotation;
diff --git a/src/Variant/Classical/FEN/Str.php b/src/Variant/Classical/FEN/Str.php
index 527a8d92c..736bb04dd 100644
--- a/src/Variant/Classical/FEN/Str.php
+++ b/src/Variant/Classical/FEN/Str.php
@@ -6,7 +6,7 @@
 use Chess\Variant\Classical\FEN\PiecePlacement;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
+use Chess\Variant\Classical\CastlingRule;
 
 class Str
 {
diff --git a/src/Variant/Classical/FEN/StrToBoard.php b/src/Variant/Classical/FEN/StrToBoard.php
index 7ad06719c..42b95c125 100644
--- a/src/Variant/Classical/FEN/StrToBoard.php
+++ b/src/Variant/Classical/FEN/StrToBoard.php
@@ -7,10 +7,10 @@
 use Chess\Variant\PieceArray;
 use Chess\Variant\VariantType;
 use Chess\Variant\Classical\Board;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\FEN\Str;
 use Chess\Variant\Classical\PGN\AN\Piece;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
 
 class StrToBoard
 {
diff --git a/src/Variant/Classical/PGN/Move.php b/src/Variant/Classical/PGN/Move.php
index fe23b9f93..413736046 100644
--- a/src/Variant/Classical/PGN/Move.php
+++ b/src/Variant/Classical/PGN/Move.php
@@ -3,13 +3,12 @@
 namespace Chess\Variant\Classical\PGN;
 
 use Chess\Exception\UnknownNotationException;
-use Chess\Piece\K;
 use Chess\Variant\AbstractNotation;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\PGN\AN\Castle;
 use Chess\Variant\Classical\PGN\AN\Check;
 use Chess\Variant\Classical\PGN\AN\Piece;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
 
 class Move extends AbstractNotation
 {
diff --git a/src/Variant/Dunsany/Board.php b/src/Variant/Dunsany/Board.php
index 51bd1401b..7f718e523 100644
--- a/src/Variant/Dunsany/Board.php
+++ b/src/Variant/Dunsany/Board.php
@@ -11,11 +11,11 @@
 use Chess\Variant\Classical\P;
 use Chess\Variant\Classical\Q;
 use Chess\Variant\Classical\R;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\PGN\Move;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Piece;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
 
 class Board extends AbstractBoard
 {
diff --git a/src/Variant/Dunsany/FEN/Str.php b/src/Variant/Dunsany/FEN/Str.php
index d174fb0c4..d0addfc57 100644
--- a/src/Variant/Dunsany/FEN/Str.php
+++ b/src/Variant/Dunsany/FEN/Str.php
@@ -6,7 +6,7 @@
 use Chess\Variant\Classical\FEN\Str as ClassicalStr;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Dunsany\FEN\PiecePlacement;
 
 class Str extends ClassicalStr
diff --git a/src/Variant/Dunsany/FEN/StrToBoard.php b/src/Variant/Dunsany/FEN/StrToBoard.php
index 5606530e0..c9f5c3c2c 100644
--- a/src/Variant/Dunsany/FEN/StrToBoard.php
+++ b/src/Variant/Dunsany/FEN/StrToBoard.php
@@ -6,9 +6,9 @@
 use Chess\Variant\AbstractBoard;
 use Chess\Variant\PieceArray;
 use Chess\Variant\VariantType;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\FEN\StrToBoard as ClassicalFenStrToBoard;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
 use Chess\Variant\Dunsany\Board;
 use Chess\Variant\Dunsany\FEN\Str;
 
diff --git a/src/Variant/Losing/FEN/StrToBoard.php b/src/Variant/Losing/FEN/StrToBoard.php
index 7c91f58db..37a5e5173 100644
--- a/src/Variant/Losing/FEN/StrToBoard.php
+++ b/src/Variant/Losing/FEN/StrToBoard.php
@@ -6,9 +6,9 @@
 use Chess\Variant\AbstractBoard;
 use Chess\Variant\PieceArray;
 use Chess\Variant\VariantType;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\FEN\StrToBoard as ClassicalFenStrToBoard;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
 use Chess\Variant\Losing\Board;
 use Chess\Variant\Losing\FEN\Str;
 
diff --git a/src/Variant/PieceArray.php b/src/Variant/PieceArray.php
index 8615cb8b0..00e7c4394 100644
--- a/src/Variant/PieceArray.php
+++ b/src/Variant/PieceArray.php
@@ -7,7 +7,7 @@
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Piece;
 use Chess\Variant\Classical\PGN\AN\Square;
-use Chess\Variant\Classical\Rule\CastlingRule;
+use Chess\Variant\Classical\CastlingRule;
 
 class PieceArray
 {
diff --git a/tests/unit/Variant/Classical/BoardTest.php b/tests/unit/Variant/Classical/BoardTest.php
index 7bebb1d03..b552e4661 100644
--- a/tests/unit/Variant/Classical/BoardTest.php
+++ b/tests/unit/Variant/Classical/BoardTest.php
@@ -14,13 +14,13 @@
 use Chess\Variant\Classical\P;
 use Chess\Variant\Classical\Q;
 use Chess\Variant\Classical\R;
+use Chess\Variant\Classical\Board;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\FEN\StrToBoard;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Piece;
 use Chess\Variant\Classical\PGN\AN\Square;
 use Chess\Variant\Classical\PGN\Move;
-use Chess\Variant\Classical\Board;
-use Chess\Variant\Classical\Rule\CastlingRule;
 
 class BoardTest extends AbstractUnitTestCase
 {
diff --git a/tests/unit/Variant/Classical/KTest.php b/tests/unit/Variant/Classical/KTest.php
index 54bb95659..32f4cc45b 100644
--- a/tests/unit/Variant/Classical/KTest.php
+++ b/tests/unit/Variant/Classical/KTest.php
@@ -6,11 +6,11 @@
 use Chess\Tests\AbstractUnitTestCase;
 use Chess\Variant\Capablanca\PGN\AN\Square as CapablancaSquare;
 use Chess\Variant\Classical\K;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\PGN\AN\Castle;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Piece;
 use Chess\Variant\Classical\PGN\AN\Square as ClassicalSquare;
-use Chess\Variant\Classical\Rule\CastlingRule;
 
 class KTest extends AbstractUnitTestCase
 {
diff --git a/tests/unit/Variant/Classical/PGN/MoveTest.php b/tests/unit/Variant/Classical/PGN/MoveTest.php
index 231d6b245..0dee5a447 100644
--- a/tests/unit/Variant/Classical/PGN/MoveTest.php
+++ b/tests/unit/Variant/Classical/PGN/MoveTest.php
@@ -4,11 +4,11 @@
 
 use Chess\Piece\K;
 use Chess\Tests\AbstractUnitTestCase;
+use Chess\Variant\Classical\CastlingRule;
 use Chess\Variant\Classical\PGN\Move;
 use Chess\Variant\Classical\PGN\AN\Castle;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Piece;
-use Chess\Variant\Classical\Rule\CastlingRule;
 
 class MoveTest extends AbstractUnitTestCase
 {