Fixed the lines of squares

chesslablab · Jan 31, 2025 · d223dfc · d223dfc
1 parent efbf5f0
commit d223dfc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/src/Variant/Classical/PGN/Square.php b/src/Variant/Classical/PGN/Square.php
@@ -128,7 +128,11 @@ public function isDiagonalLine(array $line): bool
      */
     public function isStraightLine(array $line): bool
     {
-       return $this->hasConsecutiveFiles($line) || $this->hasConsecutiveRanks($line, 1);
+        if ($this->hasConsecutiveFiles($line)) {
+            return !$this->hasConsecutiveRanks($line, -1) && !$this->hasConsecutiveRanks($line, 1);
+        }
+
+        return $this->hasConsecutiveRanks($line, -1) xor $this->hasConsecutiveRanks($line, 1);
     }
 
     /**

diff --git a/tests/unit/Variant/Classical/PGN/SquareTest.php b/tests/unit/Variant/Classical/PGN/SquareTest.php
@@ -175,6 +175,14 @@ public function is_diagonal_line_b4_c3_d6()
         $this->assertFalse(self::$square->isDiagonalLine(['b4', 'c3', 'd6']));
     }
 
+    /**
+     * @test
+     */
+    public function is_straight_line_b4_c3_d2()
+    {
+        $this->assertFalse(self::$square->isStraightLine(['b4', 'c3', 'd2']));
+    }
+
     /**
      * @test
      */
@@ -196,7 +204,7 @@ public function is_straight_line_c7_e7_d7()
      */
     public function is_straight_line_c7_c6_c5()
     {
-        $this->assertFalse(self::$square->isStraightLine(['c7', 'c6', 'c5']));
+        $this->assertTrue(self::$square->isStraightLine(['c7', 'c6', 'c5']));
     }
 
     /**
@@ -206,4 +214,20 @@ public function is_straight_line_c5_c6_c7()
     {
         $this->assertTrue(self::$square->isStraightLine(['c5', 'c6', 'c7']));
     }
+
+    /**
+     * @test
+     */
+    public function is_diagonal_line_c5_c6_c7()
+    {
+        $this->assertFalse(self::$square->isDiagonalLine(['c5', 'c6', 'c7']));
+    }
+
+    /**
+     * @test
+     */
+    public function is_diagonal_line_c7_d7_e7()
+    {
+        $this->assertFalse(self::$square->isDiagonalLine(['c7', 'd7', 'e7']));
+    }
 }