Merge 11e3e63 into 6922fc0

AydinHassan · web-flow · commit dad1b27de0f9 · 2018-05-08T08:34:32.000Z
diff --git a/src/CliMenu.php b/src/CliMenu.php
@@ -387,7 +387,7 @@ protected function drawMenuItem(MenuItemInterface $item, bool $selected = false)
 
         return array_map(function ($row) use ($invertedColour, $notInvertedColour, $borderColour) {
             return sprintf(
-                "%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+                "%s%s%s%s%s%s%s%s%s%s%s%s\n",
                 str_repeat(' ', $this->style->getMargin()),
                 $borderColour,
                 str_repeat(' ', $this->style->getBorderLeftWidth()),
@@ -399,8 +399,7 @@ protected function drawMenuItem(MenuItemInterface $item, bool $selected = false)
                 $notInvertedColour,
                 $borderColour,
                 str_repeat(' ', $this->style->getBorderRightWidth()),
-                $this->style->getColoursResetCode(),
-                str_repeat(' ', $this->style->getMargin())
+                $this->style->getColoursResetCode()
             );
         }, $rows);
     }
diff --git a/src/MenuStyle.php b/src/MenuStyle.php
@@ -489,12 +489,11 @@ public function setTitleSeparator(string $actionSeparator) : self
     private function generateBorderRows() : void
     {
         $borderRow = sprintf(
-            "%s%s%s%s%s\n",
+            "%s%s%s%s\n",
             str_repeat(' ', $this->margin),
             $this->getBorderColourCode(),
             str_repeat(' ', $this->width),
-            $this->coloursResetCode,
-            str_repeat(' ', $this->margin)
+            $this->coloursResetCode
         );
 
         $this->borderTopRows = array_fill(0, $this->borderTopWidth, $borderRow);
diff --git a/test/res/testAddCustomControlMapping.txt b/test/res/testAddCustomControlMapping.txt
@@ -1,9 +1,9 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testAddCustomControlMappings.txt b/test/res/testAddCustomControlMappings.txt
@@ -1,9 +1,9 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testConfirmCanOnlyBeClosedWithEnter.txt b/test/res/testConfirmCanOnlyBeClosedWithEnter.txt
@@ -1,10 +1,10 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 [31;43m                   [0m
@@ -14,10 +14,10 @@
 [31;43m                   [0m
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testConfirmWithEvenLengthConfirmAndButton.txt b/test/res/testConfirmWithEvenLengthConfirmAndButton.txt
@@ -1,10 +1,10 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 [31;43m                  [0m
@@ -14,10 +14,10 @@
 [31;43m                  [0m
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testConfirmWithEvenLengthConfirmAndOddLengthButton.txt b/test/res/testConfirmWithEvenLengthConfirmAndOddLengthButton.txt
@@ -1,10 +1,10 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 [31;43m                  [0m
@@ -14,10 +14,10 @@
 [31;43m                  [0m
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testConfirmWithOddLengthConfirmAndButton.txt b/test/res/testConfirmWithOddLengthConfirmAndButton.txt
@@ -1,10 +1,10 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 [31;43m                   [0m
@@ -14,10 +14,10 @@
 [31;43m                   [0m
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testConfirmWithOddLengthConfirmAndEvenLengthButton.txt b/test/res/testConfirmWithOddLengthConfirmAndEvenLengthButton.txt
@@ -1,10 +1,10 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 [31;43m                   [0m
@@ -14,10 +14,10 @@
 [31;43m                   [0m
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testFlashCanBeClosedWithAnyKey.txt b/test/res/testFlashCanBeClosedWithAnyKey.txt
@@ -1,21 +1,21 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 [31;43m                   [0m
 [31;43m  PHP School FTW!  [0m
 [31;43m                   [0m
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testFlashWithEvenLength.txt b/test/res/testFlashWithEvenLength.txt
@@ -1,21 +1,21 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 [31;43m                  [0m
 [31;43m  PHP School FTW  [0m
 [31;43m                  [0m
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testFlashWithOddLength.txt b/test/res/testFlashWithOddLength.txt
@@ -1,21 +1,21 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 [31;43m                   [0m
 [31;43m  PHP School FTW!  [0m
 [31;43m                   [0m
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testReDrawReDrawsImmediately.txt b/test/res/testReDrawReDrawsImmediately.txt
@@ -1,18 +1,18 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
 
 
-  [37;41m                                              [0m  
-  [37;41m  PHP School FTW                              [0m  
-  [37;41m  ==========================================  [0m  
-  [37;41m[7m  ● Item 1                                    [27m[0m  
-  [37;41m                                              [0m  
+  [37;41m                                              [0m
+  [37;41m  PHP School FTW                              [0m
+  [37;41m  ==========================================  [0m
+  [37;41m[7m  ● Item 1                                    [27m[0m
+  [37;41m                                              [0m
 
 
diff --git a/test/res/testSimpleOpenClose.txt b/test/res/testSimpleOpenClose.txt
@@ -1,9 +1,9 @@
 
 
-  [37;44m                                              [0m  
-  [37;44m  PHP School FTW                              [0m  
-  [37;44m  ==========================================  [0m  
-  [37;44m[7m  ● Item 1                                    [27m[0m  
-  [37;44m                                              [0m  
+  [37;44m                                              [0m
+  [37;44m  PHP School FTW                              [0m
+  [37;44m  ==========================================  [0m
+  [37;44m[7m  ● Item 1                                    [27m[0m
+  [37;44m                                              [0m
 
 
diff --git a/test/res/testSimpleOpenCloseWithBorders.txt b/test/res/testSimpleOpenCloseWithBorders.txt
@@ -1,11 +1,11 @@
 
 
-  [41m                                              [0m  
-  [41m  [37;44m                                          [41m  [0m  
-  [41m  [37;44m  PHP School FTW                          [41m  [0m  
-  [41m  [37;44m  ======================================  [41m  [0m  
-  [41m  [37;44m[7m  ● Item 1                                [27m[41m  [0m  
-  [41m  [37;44m                                          [41m  [0m  
-  [41m                                              [0m  
+  [41m                                              [0m
+  [41m  [37;44m                                          [41m  [0m
+  [41m  [37;44m  PHP School FTW                          [41m  [0m
+  [41m  [37;44m  ======================================  [41m  [0m
+  [41m  [37;44m[7m  ● Item 1                                [27m[41m  [0m
+  [41m  [37;44m                                          [41m  [0m
+  [41m                                              [0m
 
 
diff --git a/test/res/testSimpleOpenCloseWithLeftAndRightBorders.txt b/test/res/testSimpleOpenCloseWithLeftAndRightBorders.txt
@@ -1,9 +1,9 @@
 
 
-  [41m  [37;44m                                          [41m  [0m  
-  [41m  [37;44m  PHP School FTW                          [41m  [0m  
-  [41m  [37;44m  ======================================  [41m  [0m  
-  [41m  [37;44m[7m  ● Item 1                                [27m[41m  [0m  
-  [41m  [37;44m                                          [41m  [0m  
+  [41m  [37;44m                                          [41m  [0m
+  [41m  [37;44m  PHP School FTW                          [41m  [0m
+  [41m  [37;44m  ======================================  [41m  [0m
+  [41m  [37;44m[7m  ● Item 1                                [27m[41m  [0m
+  [41m  [37;44m                                          [41m  [0m
 
 
diff --git a/test/res/testSimpleOpenCloseWithMarginAutoAndBorders.txt b/test/res/testSimpleOpenCloseWithMarginAutoAndBorders.txt

-Original file line number
+Diff line change
@@ @@ -1,9 +1,9 @@ @@
 -  [37;44m                                              [0m
 -  [37;44m  PHP School FTW                              [0m
 -  [37;44m  ==========================================  [0m
 -  [37;44m[7m  ● Item 1                                    [27m[0m
 -  [37;44m                                              [0m
 +  [37;44m                                              [0m
 +  [37;44m  PHP School FTW                              [0m
 +  [37;44m  ==========================================  [0m
 +  [37;44m[7m  ● Item 1                                    [27m[0m
 +  [37;44m                                              [0m