Merge pull request #424 from phalcon/3.x

3.4.0

Author: sergeyklay

.gitignore

@@ -16,7 +16,6 @@
 /humbuglog.json
 /humbuglog.txt
 /composer.phar
-/composer.lock
 /public/robots.txt
 /public/sitemap.xml
 /public/google*.html

.htrouter.php

@@ -4,7 +4,7 @@
   +------------------------------------------------------------------------+
   | Phosphorum                                                             |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2013-2017 Phalcon Team and contributors                  |
+  | Copyright (c) 2013-present Phalcon Team and contributors               |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file LICENSE.txt.                             |

.travis.yml

@@ -3,10 +3,11 @@ language: php
 sudo: false
 dist: trusty
 
+# TODO: Add 7.2 after Phalcon 3.3.0 release
 php:
   - 5.6
   - 7.0
-  - 7.1
+  - 7.1.11
 
 git:
   depth: 1

app/cache/views/.gitignore

@@ -4,7 +4,7 @@
   +------------------------------------------------------------------------+
   | Phosphorum                                                             |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2013-2017 Phalcon Team and contributors                  |
+  | Copyright (c) 2013-present Phalcon Team and contributors               |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file LICENSE.txt.                             |
@@ -32,6 +32,34 @@ public function __construct()
 
         $this->InlineTypes['@'][]= 'UrlMentions';
         $this->inlineMarkerList .= '@';
+
+        $this->InlineTypes['~'][]= 'InsTags';
+        $this->inlineMarkerList .= '~';
+    }
+
+    /**
+     * Extension Added <del> tag to HTML tree
+     *
+     * Using in editor:
+     * Foo ~Some code~ Bar
+     *
+     * Result in HTML tree:
+     * Foo <del>Some code</del> Bar
+     *
+     * @param array $excerpt
+     * @return array
+     */
+    protected function inlineStrikethrough($Excerpt)
+    {
+        if (preg_match('/^~{1}([^~].*?)~{1}/', $Excerpt['text'], $matches)) {
+            return [
+                'extent' => strlen($matches[0]),
+                'element' => [
+                    'name' => 'del',
+                    'text' => $matches[1],
+                ],
+            ];
+        }
     }
 
     /**
@@ -68,6 +96,32 @@ protected function inlineUrlMentions($excerpt)
         }
     }
 
+    /**
+     * Extension Added <ins> tag to HTML tree
+     *
+     * Using in editor:
+     * Foo ~~Some code~~ Bar
+     *
+     * Result in HTML tree:
+     * Foo <ins>Some code</ins> Bar
+     *
+     * @param array $excerpt
+     * @return array
+     */
+    protected function inlineInsTags($excerpt)
+    {
+        if (preg_match('/^~{2}(.*?)~{2}/', $excerpt['text'], $matches)) {
+            //var_dump($excerpt);
+            return [
+                'extent' => strlen($matches[0]),
+                'element' => [
+                    'name' => 'ins',
+                    'text' => $matches[1],
+                ],
+            ];
+        }
+    }
+
     /* Escaping text, to prevent adding injection
      * @todo: the below code should be deleted after include it to the major class.
      * Please insert other extension above this code block

app/library/Markdown/Markdown.php

@@ -4,7 +4,7 @@
  +------------------------------------------------------------------------+
  | Phosphorum                                                             |
  +------------------------------------------------------------------------+
- | Copyright (c) 2013-2016 Phalcon Team and contributors                  |
+ | Copyright (c) 2013-present Phalcon Team and contributors               |
  +------------------------------------------------------------------------+
  | This source file is subject to the New BSD License that is bundled     |
  | with this package in the file LICENSE.txt.                             |
@@ -34,7 +34,7 @@ class Version extends PhVersion
      */
     protected static function _getVersion()
     {
-        return [3, 3, 2, 0, 0];
+        // @codingStandardsIgnoreEnd
+        return [3, 4, 0, 0, 0];
     }
-    // @codingStandardsIgnoreEnd
 }

app/library/Version.php

@@ -211,6 +211,9 @@ This [link][id2] has title attribute.
     </p>
 <p>
 <pre>
+My favorite color is ~blue~ ~~red~~!
+</pre>
+<pre>
 My favorite color is <del>blue</del> <ins>red</ins>!
 </pre>
 </p>
@@ -221,6 +224,9 @@ My favorite color is <del>blue</del> <ins>red</ins>!
     </p>
 <p>
 <pre>
+My favorite color is ~blue~ ~~red~~!
+</pre>
+<pre>
 My favorite color is <del>blue</del> <ins>red</ins>!
 </pre>
 </p>

app/views/help/markdown.volt

@@ -34,6 +34,7 @@
     {{- stylesheet_link("css/octicons.css?v=" ~ forum_version(), true) -}}
     {{- stylesheet_link("css/diff.css?v=" ~ forum_version(), true) -}}
     {{- stylesheet_link("css/style.css?v=" ~ forum_version(), true) -}}
+    {{- stylesheet_link("css/prism.css?v=" ~ forum_version(), true) -}}
 
     {#- reCaptcha -#}
     {%- if recaptcha.isEnabled() -%}
@@ -47,6 +48,7 @@
     <script type="text/javascript" src="//cdn.jsdelivr.net/g/[email protected],[email protected],[email protected](prettify.js+lang-css.js+lang-sql.js+lang-yaml.js)"></script>
     {{ javascript_include("js/editor.js?v=" ~ forum_version()) }}
     {{ javascript_include("js/forum.js?v=" ~ forum_version()) }}
+    {{ javascript_include("js/prism.js?v=" ~ forum_version()) }}
 
     <script type="text/javascript">Forum.initializeView('{{ url() }}');</script>
 </body>

app/views/index.volt

@@ -4,7 +4,7 @@
   +------------------------------------------------------------------------+
   | Phosphorum                                                             |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2013-2017 Phalcon Team and contributors                  |
+  | Copyright (c) 2013-present Phalcon Team and contributors               |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file LICENSE.txt.                             |
@@ -25,7 +25,7 @@
  */
 define('APP_START_MEMORY', memory_get_usage());
 
-// Register The Composer Auto Loader
+// Then register the Composer autoloader
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 // Load environment