Remove spaces after quotes

app/Libraries/BBCodeFromDB.php

@@ -230,9 +230,9 @@ public function parseProfile($text)
 
     public function parseQuote($text)
     {
-        $text = preg_replace("#\[quote=&quot;([^:]+)&quot;:{$this->uid}\]#", '<h4>\\1 wrote:</h4><blockquote>', $text);
-        $text = str_replace("[quote:{$this->uid}]", '<blockquote>', $text);
-        $text = str_replace("[/quote:{$this->uid}]", '</blockquote>', $text);
+        $text = preg_replace("#\[quote=&quot;([^:]+)&quot;:{$this->uid}\]\s*#", '<h4>\\1 wrote:</h4><blockquote>', $text);
+        $text = preg_replace("#\[quote:{$this->uid}\]\s*#", '<blockquote>', $text);
+        $text = preg_replace("#\s*\[/quote:{$this->uid}\]\s*#", '</blockquote>', $text);
 
         return $text;
     }

resources/assets/less/bbcode.less

@@ -41,6 +41,7 @@
 
   blockquote {
     font-size: inherit;
+    padding-right: 0;
   }
 
   img {

resources/assets/less/bem/forum-post.less

@@ -96,6 +96,7 @@
     flex: none;
 
     padding: 20px 30px;
+    overflow: hidden;
 
     &--edit-bar {
       background-color: @gray-lighter;

tests/Libraries/BBCodeForDBTest.php

@@ -30,11 +30,13 @@ public function testAll()
         $path = __DIR__.'/bbcode_examples';
 
         foreach (glob("{$path}/*.base.txt") as $baseFilePath) {
-            $dbFilePath = preg_replace("/\.base\.txt$/", '.db.txt', $baseFilePath);
+            $dbFilePath = preg_replace('/\.base\.txt$/', '.db.txt', $baseFilePath);
             $text->text = trim(file_get_contents($baseFilePath));
-            $referenceDbOutput = trim(file_get_contents($dbFilePath));
 
-            $this->assertSame($referenceDbOutput, $text->generate());
+            $output = $this->normalizeHTML($text->generate());
+            $referenceOutput = $this->normalizeHTML(file_get_contents($dbFilePath));
+
+            $this->assertSame($referenceOutput, $output);
         }
     }
 }

tests/Libraries/BBCodeFromDBTest.php

@@ -29,16 +29,13 @@ public function testAll()
         $path = __DIR__.'/bbcode_examples';
 
         foreach (glob("{$path}/*.db.txt") as $dbFilePath) {
-            $htmlFilePath = preg_replace("/\.db\.txt$/", '.html', $dbFilePath);
+            $htmlFilePath = preg_replace('/\.db\.txt$/', '.html', $dbFilePath);
             $text->text = trim(file_get_contents($dbFilePath));
-            $referenceHtmlOutput = $this->wrapDiv(str_replace("\n", '', trim(file_get_contents($htmlFilePath))));
 
-            $this->assertSame($referenceHtmlOutput, $text->toHTML());
-        }
-    }
+            $output = $this->normalizeHTML($text->toHTML());
+            $referenceOutput = $this->normalizeHTML("<div class='bbcode'>".file_get_contents($htmlFilePath).'</div>');
 
-    private function wrapDiv($text)
-    {
-        return "<div class='bbcode'>{$text}</div>";
+            $this->assertSame($referenceOutput, $output);
+        }
     }
 }

tests/Libraries/bbcode_examples/quote_newline.base.txt

@@ -0,0 +1,11 @@
+[quote]
+Here is a quote.
+[/quote]
+
+Some text goes here.
+
+[quote="some poster"]
+And another quote with title.
+[/quote]
+
+And here is some other text.

tests/Libraries/bbcode_examples/quote_newline.db.txt

@@ -0,0 +1,11 @@
+[quote:1]
+Here is a quote.
+[/quote:1]
+
+Some text goes here.
+
+[quote="some poster":1]
+And another quote with title.
+[/quote:1]
+
+And here is some other text.

tests/Libraries/bbcode_examples/quote_newline.html

@@ -0,0 +1,12 @@
+<blockquote>
+Here is a quote.
+</blockquote>
+
+Some text goes here.<br />
+<br />
+<h4>some poster wrote:</h4>
+<blockquote>
+And another quote with title.
+</blockquote>
+
+And here is some other text.

tests/TestCase.php

@@ -80,4 +80,9 @@ protected function invokeProperty($obj, string $name)
 
         return $property->getValue($obj);
     }
+
+    protected function normalizeHTML($html)
+    {
+        return str_replace("\n", '', preg_replace("/>\s*</s", '><', trim($html)));
+    }
 }