Fix mess detections

terremoth · Feb 21, 2024 · 2a1299c · 2a1299c
1 parent d94038d
commit 2a1299c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 20 deletions.
diff --git a/demos/drawing.php b/demos/drawing.php
@@ -44,4 +44,5 @@
     echo $output_filtered($rectangle->draw($doubleBorder));
 } catch (SideLessThanOneException $e) {
     echo $output_filtered($e->getMessage());
-}
+}//end try
+
diff --git a/src/BoxDesigner/Rectangle.php b/src/BoxDesigner/Rectangle.php
@@ -71,12 +71,14 @@ public function draw(LineAsciiCharsInterface|null $lineDrawerProvider = null): s
                 if ($column == 0 || $column == ($columns - 1)) {
                     $rectangleBox .= $lineDrawerProvider->verticalLine();
                 } else {
+                    $add = ' ';
+
                     if ($this->content != ' ' && $contentCharPosition < $contentLength) {
-                        $rectangleBox .= $this->content[$contentCharPosition];
+                        $add = $this->content[$contentCharPosition];
                         $contentCharPosition++;
-                    } else {
-                        $rectangleBox .= ' ';
                     }
+
+                    $rectangleBox .= $add;
                 }
             }
 

diff --git a/tests/BoxDesigner/DoubleLineBorderTest.php b/tests/BoxDesigner/DoubleLineBorderTest.php
@@ -14,11 +14,11 @@ final class DoubleLineBorderTest extends TestCase
     public function testLinesOutput(): void
     {
         $border = new DoubleLineBorder();
-        TestCase::assertEquals('╔', $border->topLeft());
-        TestCase::assertEquals('╗', $border->topRight());
-        TestCase::assertEquals('╚', $border->bottomLeft());
-        TestCase::assertEquals('╝', $border->bottomRight());
-        TestCase::assertEquals('═', $border->horizontalLine());
-        TestCase::assertEquals('║', $border->verticalLine());
+        self::assertEquals('╔', $border->topLeft());
+        self::assertEquals('╗', $border->topRight());
+        self::assertEquals('╚', $border->bottomLeft());
+        self::assertEquals('╝', $border->bottomRight());
+        self::assertEquals('═', $border->horizontalLine());
+        self::assertEquals('║', $border->verticalLine());
     }
 }
diff --git a/tests/BoxDesigner/SingleBorderBoxTest.php b/tests/BoxDesigner/SingleBorderBoxTest.php
@@ -14,7 +14,7 @@
 
 #[CoversClass(Rectangle::class)]
 #[UsesClass(SingleLineBorder::class)]
-final class SingleLineRectanglesDrawingTest extends TestCase
+final class SingleBorderBoxTest extends TestCase
 {
     /**
      * @return array[]
@@ -82,6 +82,6 @@ public static function boxValuesProvider(): array
     public function testSidesLessThanOne(string $box, int $rows, int $columns): void
     {
         $rectangle = new Rectangle($rows, $columns);
-        $this->assertEquals($box, $rectangle->draw());
+        self::assertEquals($box, $rectangle->draw());
     }
 }
diff --git a/tests/BoxDesigner/SingleBorderWithContentTest.php b/tests/BoxDesigner/SingleBorderWithContentTest.php
@@ -13,7 +13,7 @@
 
 #[CoversClass(Rectangle::class)]
 #[UsesClass(SingleLineBorder::class)]
-final class SingleLineRectangleDrawingWithContentTest extends TestCase
+final class SingleBorderWithContentTest extends TestCase
 {
     /**
      * @return array[]
@@ -80,6 +80,6 @@ public function testSidesLessThanOne(string $box, int $rows, int $columns, strin
         $rectangle = new Rectangle($rows, $columns);
         $rectangle->setContentInsideBox($content);
         $draw = $rectangle->draw();
-        $this->assertEquals($box, $draw);
+        self::assertEquals($box, $draw);
     }
 }
diff --git a/tests/BoxDesigner/SingleLineBorderTest.php b/tests/BoxDesigner/SingleLineBorderTest.php
@@ -14,11 +14,11 @@ final class SingleLineBorderTest extends TestCase
     public function testLinesOutput(): void
     {
         $border = new SingleLineBorder();
-        TestCase::assertEquals('┌', $border->topLeft());
-        TestCase::assertEquals('┐', $border->topRight());
-        TestCase::assertEquals('└', $border->bottomLeft());
-        TestCase::assertEquals('┘', $border->bottomRight());
-        TestCase::assertEquals('─', $border->horizontalLine());
-        TestCase::assertEquals('│', $border->verticalLine());
+        self::assertEquals('┌', $border->topLeft());
+        self::assertEquals('┐', $border->topRight());
+        self::assertEquals('└', $border->bottomLeft());
+        self::assertEquals('┘', $border->bottomRight());
+        self::assertEquals('─', $border->horizontalLine());
+        self::assertEquals('│', $border->verticalLine());
     }
 }