Merge pull request #22 from cheeZery/fix-unnecessary-empty-lines

Fix unnecessary empty lines
cheeZery · Dec 17, 2018 · 7ad96aa · 7ad96aa
2 parents 0d6c0e9 + 4832c09
commit 7ad96aa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Parser/MarkdownParser.php b/src/Parser/MarkdownParser.php
@@ -68,7 +68,10 @@ public function getDocumentedDependencies(
                 continue;
             }
 
-            $currentDependency->getAdditionalContent()->add($line);
+            // Trim line breaks, because they will be added by the writer
+            $trimmedLine = trim($line, "\n\r");
+
+            $currentDependency->getAdditionalContent()->add($trimmedLine);
         }
 
         $this->cleanupAdditionalContent($dependencies);

diff --git a/tests/Parser/MarkdownParserTest.php b/tests/Parser/MarkdownParserTest.php
@@ -49,6 +49,11 @@ public function testItParsesDependenciesFileCorrectlyWithoutFilter()
         $this->assertNotNull($package);
         $this->assertCount(3, $package->getAdditionalContent()->getAll());
         $this->assertEquals(['', 'test 1  ', 'test 2'], array_values($package->getAdditionalContent()->getAll()));
+
+        $package = $packageList->get('Composer', 'symfony/yaml');
+        $this->assertNotNull($package);
+        $this->assertCount(4, $package->getAdditionalContent()->getAll());
+        $this->assertEquals(['', 'Will leave only one', '', 'consecutive empty line'], array_values($package->getAdditionalContent()->getAll()));
     }
 
     public function getValidDependenciesFileData(): string
@@ -84,6 +89,12 @@ public function getValidDependenciesFileData(): string
 ## symfony/yaml `v4.1.3` [link](https://packagist.org/packages/symfony/yaml)
 > Symfony Yaml Component
 
+Will leave only one
+
+
+
+consecutive empty line
+
 ## zendframework/zend-servicemanager `3.3.2` [link](https://packagist.org/packages/zendframework/zend-servicemanager)
 > Factory-Driven Dependency Injection Container