Merge f7cd462 into 70524d5

CHANGELOG.md

@@ -3,6 +3,11 @@
 
 Full changelog for PHP Quill Renderer
 
+## v3.14.2 - 2018-09-11
+
+* New line only inserts no longer ignored by parser, updated a couple of tests because of logic update.
+* Updated README, added new credit.
+
 ## v3.14.1 - 2018-08-20
 
 * Multiple attributes ignored by the Markdown and the GitHub Markdown parsers, added two tests to catch regressions.

README.md

@@ -130,12 +130,13 @@ for use under the MIT License (MIT).
 
 ## Credits
 
-* [carlos](https://github.com/sald19) [Bugfix] v1.01.0
-* [pdiveris](https://github.com/pdiveris) [Issue #43] - Null inserts
-* [Mark Davison](https://github.com/markdavison) - Pushed me in the right direction for v3.00.0
-* [tominventisbe](https://github.com/tominventisbe) [Issue #54] - Parser::load() does not reset the deltas array
-* [tominventisbe](https://github.com/tominventisbe) [Issue #55] - Image deltas with multiple attributes incorrectly being passed to Compound delta
-* [bcorcoran](https://github.com/bcorcoran) [Issue #81] - Suggested reverting requirements to necessary requirements
-* [kingga](https://github.com/kingga) [Issue #86] - Video support
-* [Jonathanm10](https://github.com/Jonathanm10) [Issue #87] - Newlines proceeding inserts ignored, bug report
-* [raphaelsaunier](https://github.com/raphaelsaunier) [Issue #87] - Newlines proceeding inserts ignored, bug location
+* [carlos](https://github.com/sald19) [Bugfix] v1.01.0.
+* [pdiveris](https://github.com/pdiveris) [Issue #43] - Null inserts.
+* [Mark Davison](https://github.com/markdavison) - Pushed me in the right direction for v3.00.0.
+* [tominventisbe](https://github.com/tominventisbe) [Issue #54] - Parser::load() does not reset the deltas array.
+* [tominventisbe](https://github.com/tominventisbe) [Issue #55] - Image deltas with multiple attributes incorrectly being passed to Compound delta.
+* [bcorcoran](https://github.com/bcorcoran) [Issue #81] - Suggested reverting requirements to necessary requirements.
+* [kingga](https://github.com/kingga) [Issue #86] - Video support.
+* [Jonathanm10](https://github.com/Jonathanm10) [Issue #87] - Newlines proceeding inserts ignored, bug report.
+* [raphaelsaunier](https://github.com/raphaelsaunier) [Issue #87] - Newlines proceeding inserts ignored, bug location.
+* [Basil](https://github.com/nadar) [Issue #101] - Newline only inserts being ignored by parser.

Tests/Api/BugTest.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace DBlackborough\Quill\Tests\Api;
+
+require __DIR__ . '../../../vendor/autoload.php';
+
+use DBlackborough\Quill\Render as QuillRender;
+use DBlackborough\Quill\RenderMultiple as QuillRenderMultiple;
+
+/**
+ * Specific tests for raised bugs
+ */
+final class BugTest extends \PHPUnit\Framework\TestCase
+{
+    private $delta_bug_101 = '{
+  "ops": [
+    {
+      "insert": "Hallo"
+    },
+    {
+      "attributes": {
+        "header": 1
+      },
+      "insert": "\n"
+    },
+    {
+      "insert": "\nDas ist ein normaler Text:\n\n"
+    },
+    {
+      "attributes": {
+        "bold": true
+      },
+      "insert": "Test: Eintrag"
+    },
+    {
+      "insert": "\n"
+    },
+    {
+      "attributes": {
+        "bold": true
+      },
+      "insert": "Test: Zwei"
+    },
+    {
+      "insert": "\n\nhttps://heartbeat.gmbh\n\n\n"
+    }
+  ]
+}';
+
+    private $expected_bug_101 = "<h1>Hallo</h1>
+<p>Das ist ein normaler Text:</p>
+<p><strong>Test: Eintrag</strong><br />
+<strong>Test: Zwei</strong></p>
+<p>https://heartbeat.gmbh</p>
+<p></p>";
+
+    /**
+     * Inserts with just a new line are being ignored
+     * Submitted by https://github.com/nadar -
+     * Bug report https://github.com/deanblackborough/php-quill-renderer/issues/101
+     *
+     * @return void
+     * @throws \Exception
+     */
+    public function testNewlineOnlyInsertsIgnored()
+    {
+        $result = null;
+
+        try {
+            $quill = new QuillRender($this->delta_bug_101);
+            $result = $quill->render();
+        } catch (\Exception $e) {
+            $this->fail(__METHOD__ . 'failure, ' . $e->getMessage());
+        }
+
+        $this->assertEquals(
+            $this->expected_bug_101,
+            trim($result),
+            __METHOD__ . ' newline only inserts ignored failure'
+        );
+    }
+}

Tests/Attributes/Html/HrefTest.php

@@ -11,7 +11,7 @@
  */
 final class HrefTest extends \PHPUnit\Framework\TestCase
 {
-    private $delta_href = '{"ops":[{"insert":"Lorem ipsum dolor sit amet, "},{"attributes":{"link":"http://www.example.com"},"insert":"consectetur"},{"insert":" adipiscing elit. In sed efficitur enim. Suspendisse mattis purus id odio varius suscipit. Nunc posuere fermentum blandit. \nIn vitae eros nec mauris dignissim porttitor. Morbi a tempus tellus. Mauris quis velit sapien. "},{"attributes":{"link":"http://www.example.com"},"insert":"Etiam "},{"insert":"sit amet enim venenatis, eleifend lectus ac, ultricies orci. Sed tristique laoreet mi nec imperdiet. Vivamus non dui diam. Aliquam erat eros, dignissim in quam id.\n"}]}';
+    private $delta_href = '{"ops":[{"insert":"Lorem ipsum dolor sit amet, "},{"attributes":{"link":"http://www.example.com"},"insert":"consectetur"},{"insert":" adipiscing elit. In sed efficitur enim. Suspendisse mattis purus id odio varius suscipit. Nunc posuere fermentum blandit. \nIn vitae eros nec mauris dignissim porttitor. Morbi a tempus tellus. Mauris quis velit sapien. "},{"attributes":{"link":"http://www.example.com"},"insert":"Etiam "},{"insert":"sit amet enim venenatis, eleifend lectus ac, ultricies orci. Sed tristique laoreet mi nec imperdiet. Vivamus non dui diam. Aliquam erat eros, dignissim in quam id."}]}';
 
     private $expected_href = '<p>Lorem ipsum dolor sit amet, <a href="http://www.example.com">consectetur</a> adipiscing elit. In sed efficitur enim. Suspendisse mattis purus id odio varius suscipit. Nunc posuere fermentum blandit. <br />
 In vitae eros nec mauris dignissim porttitor. Morbi a tempus tellus. Mauris quis velit sapien. <a href="http://www.example.com">Etiam </a>sit amet enim venenatis, eleifend lectus ac, ultricies orci. Sed tristique laoreet mi nec imperdiet. Vivamus non dui diam. Aliquam erat eros, dignissim in quam id.</p>';

Tests/Attributes/Html/VideoTest.php

@@ -11,7 +11,7 @@
  */
 final class VideoTest extends \PHPUnit\Framework\TestCase
 {
-    private $delta_video = '{"ops":[{"insert":{"video":"https://video.url"}},{"insert":"\n"}]}';
+    private $delta_video = '{"ops":[{"insert":{"video":"https://video.url"}}]}';
 
     private $expected_video = '<p><iframe class="ql-video" frameborder="0" allowfullscreen="true" src="https://video.url"></iframe></p>';
 

Tests/Combined/Html/BreaksTest.php

@@ -11,7 +11,7 @@
  */
 final class BreaksTest extends \PHPUnit\Framework\TestCase
 {
-    private $delta_paragraphs_with_attributes = '{"ops":[{"insert":"This is a three "},{"attributes":{"bold":true},"insert":"paragraph"},{"insert":" test\n\nthe "},{"attributes":{"strike":true},"insert":"difference"},{"insert":" being this time we \n\nare "},{"attributes":{"underline":true},"insert":"going to add"},{"insert":" attributes.\n"}]}';
+    private $delta_paragraphs_with_attributes = '{"ops":[{"insert":"This is a three "},{"attributes":{"bold":true},"insert":"paragraph"},{"insert":" test\n\nthe "},{"attributes":{"strike":true},"insert":"difference"},{"insert":" being this time we \n\nare "},{"attributes":{"underline":true},"insert":"going to add"},{"insert":" attributes."}]}';
     private $delta_single_paragraph = '{"ops":[{"insert":"Lorem ipsum dolor sit amet"}]}';
     private $delta_two_paragraphs = '{"ops":[{"insert":"Lorem ipsum dolor sit amet.\n\nLorem ipsum dolor sit amet."}]}';
     private $delta_three_paragraphs = '{"ops":[{"insert":"This is a single entry that \n\nshould create three paragraphs \n\nof HTML.\n"}]}';