Merge pull request #410 from phalcon/3.x

3.3.2

Author: sergeyklay

app/library/Version.php

@@ -34,7 +34,7 @@ class Version extends PhVersion
      */
     protected static function _getVersion()
     {
-        return [3, 3, 1, 0, 0];
+        return [3, 3, 2, 0, 0];
     }
     // @codingStandardsIgnoreEnd
 }

app/views/partials/post/reply.volt

@@ -66,7 +66,7 @@
         <div class="post-content">
             {%- cache "reply-body-" ~ reply.id -%}
             <div itemprop="text">
-                {{- markdown.render(reply.content|e) -}}
+                {{- markdown.render(reply.content) -}}
             </div>
             {%- endcache -%}
         </div>

tests/acceptance/PostAndReplyTestCest.php

@@ -0,0 +1,96 @@
+<?php
+
+/*
+   +------------------------------------------------------------------------+
+   | Phalcon forum                                                          |
+   +------------------------------------------------------------------------+
+   | Copyright (c) 2011-2017 Phalcon Team (https://www.phalconphp.com)      |
+   +------------------------------------------------------------------------+
+   | This source file is subject to the New BSD License that is bundled     |
+   | with this package in the file LICENSE.txt.                             |
+   |                                                                        |
+   | If you did not receive a copy of the license and are unable to         |
+   | obtain it through the world-wide-web, please send an email             |
+   | to [email protected] so we can send you a copy immediately.       |
+   +------------------------------------------------------------------------+
+   | Authors: Sergii Svyrydenko <[email protected]>             |
+   +------------------------------------------------------------------------+
+ */
+
+use Helper\Post;
+use Helper\User;
+use Helper\Category;
+
+class PostAndReplyTestCest
+{
+    /** @var Category */
+    protected $category;
+
+    /** @var User */
+    protected $user;
+
+    /** @var Post */
+    protected $post;
+
+
+    protected function _inject(Category $category, User $user, Post $post)
+    {
+        $this->user     = $user;
+        $this->post     = $post;
+        $this->category = $category;
+    }
+
+    public function shouldCreatePostWithCorrectSymbols(AcceptanceTester $I)
+    {
+        $I->wantTo("Check special symbols in post's text");
+
+        $user  = $this->user->haveUser();
+        $catId = $this->category->haveCategory();
+
+        $postId = $this->post->havePost([
+            'title'         => 'Test special symbols in post text',
+            'content'       => "Code < > ' ! <h1>Code content < </h1> `{<h2>Code content2 > ' </h2>}`",
+            'slug'          => 'test_spec_sumbol',
+            'users_id'      => $user['id'],
+            'categories_id' => $catId,
+        ]);
+
+        $I->amOnPage("/discussion/{$postId}/test_spec_sumbol");
+        $I->seeInSource('Test special symbols in post text');
+
+        $I->seeInSource("Code &lt; &gt; ' !");
+        $I->seeInSource("&lt;h1&gt;Code content &lt; &lt;/h1&gt;");
+        $I->seeInSource("&lt;h2&gt;Code content2 &gt; ' &lt;/h2&gt;");
+    }
+
+    public function shouldCreateReplyWithCorrectSymbols(AcceptanceTester $I)
+    {
+        $I->wantTo("Check special symbols in post's reply");
+
+        $user  = $this->user->haveUser();
+        $catId = $this->category->haveCategory();
+
+        $postId = $this->post->havePost([
+            'title'         => 'Test special symbols in post reply',
+            'content'       => "Test Reply",
+            'slug'          => 'test_spec_reply',
+            'users_id'      => $user['id'],
+            'categories_id' => $catId,
+        ]);
+
+        $I->amOnPage("/discussion/{$postId}/test_spec_reply");
+        $I->seeInSource('Test special symbols in post reply');
+
+        $replyId = $this->post->havePostReply([
+            'posts_id' => $postId,
+            'users_id' => $user['id'],
+            'accepted' => 'N',
+            'content'  => "Code < > ' ! <h1>Code content < </h1> `{<h2>Code content > ' </h2>}`",
+        ]);
+
+        $I->amOnPage("/discussion/{$postId}/test_spec_reply#{$replyId}");
+        $I->seeInSource("Code &lt; &gt; ' !");
+        $I->seeInSource("&lt;h1&gt;Code content &lt; &lt;/h1&gt;");
+        $I->seeInSource("&lt;h2&gt;Code content &gt; ' &lt;/h2&gt;");
+    }
+}

tests/console/HelpCept.php

@@ -8,7 +8,7 @@
 $I->wantToTest('getting help from command line');
 
 $output=<<<OUT
-Phosphorum 3.3.1
+Phosphorum 3.3.2
 Usage: php forum [command <arguments>] [--help | -H] [--version | -V] [--list]
 OUT;
 

tests/console/VersionCept.php

@@ -11,7 +11,7 @@
 $sha = substr(trim($I->runShellCommand('git rev-parse HEAD')), 0, 7);
 
 $output=<<<OUT
-Phosphorum version 3.3.1, git commit $sha
+Phosphorum version 3.3.2, git commit $sha
 OUT;
 
 $I->runShellCommand('php forum -V');