Refactored try-catch blocks

chesslablab · Feb 22, 2025 · 844fe50 · 844fe50
1 parent 7b62b4a
commit 844fe50
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 40 deletions.
diff --git a/src/Variant/Capablanca/FenToBoardFactory.php b/src/Variant/Capablanca/FenToBoardFactory.php
@@ -25,13 +25,12 @@ public static function create(string $string = null): AbstractBoard
         if (!$string) {
             return new Board();
         }
-
-        $fenStr = new Str();
-        $string = $fenStr->validate($string);
-        $fields = array_filter(explode(' ', $string));
-        $namespace = 'Capablanca';
-
+
         try {
+            $fenStr = new Str();
+            $string = $fenStr->validate($string);
+            $fields = array_filter(explode(' ', $string));
+            $namespace = 'Capablanca';
             $pieces = PieceArrayFactory::create(
                 $fenStr->toArray($fields[0]),
                 new Square(),

diff --git a/src/Variant/CapablancaFischer/FenToBoardFactory.php b/src/Variant/CapablancaFischer/FenToBoardFactory.php
@@ -26,13 +26,12 @@ public static function create(string $string = null): AbstractBoard
             return new Board((new Shuffle())->shuffle());
         }
 
-        $fenStr = new Str();
-        $string = $fenStr->validate($string);
-        $fields = array_filter(explode(' ', $string));
-        $namespace = 'Capablanca';
-        $shuffle = (new Shuffle())->extract($string);
-
         try {
+            $fenStr = new Str();
+            $string = $fenStr->validate($string);
+            $fields = array_filter(explode(' ', $string));
+            $namespace = 'Capablanca';
+            $shuffle = (new Shuffle())->extract($string);
             $pieces = PieceArrayFactory::create(
                 $fenStr->toArray($fields[0]),
                 new Square(),

diff --git a/src/Variant/Chess960/FenToBoardFactory.php b/src/Variant/Chess960/FenToBoardFactory.php
@@ -27,14 +27,13 @@ public static function create(string $string = null): AbstractBoard
             return new Board((new Shuffle())->shuffle());
         }
 
-        $fenStr = new Str();
-        $string = $fenStr->validate($string);
-        $fields = array_filter(explode(' ', $string));
-        $namespace = 'Classical';
-        $shuffle = (new Shuffle())->extract($string);
-        $castlingRule = new CastlingRule($shuffle);
-
         try {
+            $fenStr = new Str();
+            $string = $fenStr->validate($string);
+            $fields = array_filter(explode(' ', $string));
+            $namespace = 'Classical';
+            $shuffle = (new Shuffle())->extract($string);
+            $castlingRule = new CastlingRule($shuffle);
             $pieces = PieceArrayFactory::create(
                 $fenStr->toArray($fields[0]),
                 new Square(),

diff --git a/src/Variant/Classical/FenToBoardFactory.php b/src/Variant/Classical/FenToBoardFactory.php
@@ -25,13 +25,12 @@ public static function create(string $string = null): AbstractBoard
         if (!$string) {
             return new Board();
         }
-
-        $fenStr = new Str();
-        $string = $fenStr->validate($string);
-        $fields = array_filter(explode(' ', $string));
-        $namespace = 'Classical';
-
+
         try {
+            $fenStr = new Str();
+            $string = $fenStr->validate($string);
+            $fields = array_filter(explode(' ', $string));
+            $namespace = 'Classical';
             $pieces = PieceArrayFactory::create(
                 $fenStr->toArray($fields[0]),
                 new Square(),

diff --git a/src/Variant/Dunsany/FenToBoardFactory.php b/src/Variant/Dunsany/FenToBoardFactory.php
@@ -26,13 +26,12 @@ public static function create(string $string = null): AbstractBoard
         if (!$string) {
             return new Board();
         }
-
-        $fenStr = new Str();
-        $string = $fenStr->validate($string);
-        $fields = array_filter(explode(' ', $string));
-        $namespace = 'Dunsany';
 
         try {
+            $fenStr = new Str();
+            $string = $fenStr->validate($string);
+            $fields = array_filter(explode(' ', $string));
+            $namespace = 'Dunsany';
             $pieces = PieceArrayFactory::create(
                 $fenStr->toArray($fields[0]),
                 new Square(),

diff --git a/src/Variant/Losing/FenToBoardFactory.php b/src/Variant/Losing/FenToBoardFactory.php
@@ -26,13 +26,12 @@ public static function create(string $string = null): AbstractBoard
         if (!$string) {
             return new Board();
         }
-
-        $fenStr = new Str();
-        $string = $fenStr->validate($string);
-        $fields = array_filter(explode(' ', $string));
-        $namespace = 'Losing';
 
         try {
+            $fenStr = new Str();
+            $string = $fenStr->validate($string);
+            $fields = array_filter(explode(' ', $string));
+            $namespace = 'Losing';
             $pieces = PieceArrayFactory::create(
                 $fenStr->toArray($fields[0]),
                 new Square(),

diff --git a/src/Variant/RacingKings/FenToBoardFactory.php b/src/Variant/RacingKings/FenToBoardFactory.php
@@ -25,13 +25,12 @@ public static function create(string $string = null): AbstractBoard
         if (!$string) {
             return new Board();
         }
-
-        $fenStr = new Str();
-        $string = $fenStr->validate($string);
-        $fields = array_filter(explode(' ', $string));
-        $namespace = 'RacingKings';
 
         try {
+            $fenStr = new Str();
+            $string = $fenStr->validate($string);
+            $fields = array_filter(explode(' ', $string));
+            $namespace = 'RacingKings';
             $pieces = PieceArrayFactory::create(
                 $fenStr->toArray($fields[0]),
                 new Square(),