Merge branch 'develop' of https://github.com/getgrav/grav into featur…

…e/session

CHANGELOG.md

@@ -1,8 +1,11 @@
 # v1.4.3
-## mm/dd//2018
+## 04/12/2018
 
 1. [](#new)
-    * moved sortArrayByKey logic into `Utils::` class
+    * moved Twig `sortArrayByKey` logic into `Utils::` class
+1. [](#improved)
+    * Rolled back Parsedown library to stable `1.6.4` until a better solution for `1.8.0` compatibility can fe found
+    * Updated vendor libraries to latest versions
 1. [](#bugfix)
     * Fix for bad reference to `ZipArchive` in `GPM::Installer`
 
@@ -70,7 +73,6 @@
     * Optimizations & refactoring to the test suite [#1779](https://github.com/getgrav/grav/pull/1779)
     * Slight modification of Whoops error colors
     * Added new configuration option `system.session.initialize` to delay session initialization if needed by a plugin
-    * Vendor library updated to latest
     * Updated vendor libraries to latest versions
     * Removed constructor from `ObjectInterface`
     * Make it possible to include debug bar also into non-HTML responses

composer.json

@@ -6,10 +6,9 @@
     "homepage": "http://getgrav.org",
     "license": "MIT",
     "require": {
-        "roave/security-advisories": "dev-master",
         "php": ">=5.5.9",
         "twig/twig": "~1.24",
-        "erusev/parsedown": "~1.7",
+        "erusev/parsedown": "1.6.4",
         "erusev/parsedown-extra": "~0.7",
         "symfony/yaml": "~2.8",
         "symfony/console": "~2.8",

system/defines.php

@@ -8,7 +8,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.4.2');
+define('GRAV_VERSION', '1.4.3');
 define('GRAV_TESTING', false);
 define('DS', '/');
 

system/src/Grav/Common/Markdown/ParsedownGravTrait.php

@@ -243,19 +243,6 @@ protected function inlineLink($excerpt)
         return $excerpt;
     }
 
-    /**
-     * Return Text as-is to get around Parsedown security fixes
-     * which break these fields
-     *
-     * @param $text
-     * @param $nestable
-     * @return mixed
-     */
-    public function html($text, $nestable)
-    {
-        return $text;
-    }
-
     // For extending this class via plugins
     public function __call($method, $args)
     {

system/src/Grav/Common/Page/Medium/AudioMedium.php

@@ -25,7 +25,6 @@ protected function sourceParsedownElement(array $attributes, $reset = true)
 
         return [
             'name' => 'audio',
-            'handler' => 'html',
             'text' => '<source src="' . $location . '">Your browser does not support the audio tag.',
             'attributes' => $attributes
         ];

system/src/Grav/Common/Page/Medium/VideoMedium.php

@@ -25,8 +25,7 @@ protected function sourceParsedownElement(array $attributes, $reset = true)
 
         return [
             'name' => 'video',
-            'handler' => 'html',
-            'text' => '<source src="' . $location . '">Your2 browser does not support the video tag.',
+            'text' => '<source src="' . $location . '">Your browser does not support the video tag.',
             'attributes' => $attributes
         ];
     }

tests/unit/Grav/Common/Markdown/ParsedownTest.php

@@ -315,7 +315,7 @@ public function testExternalLinks()
             $this->parsedown->text('[cnn.com](http://www.cnn.com)'));
         $this->assertSame('<p><a href="https://www.google.com">google.com</a></p>',
             $this->parsedown->text('[google.com](https://www.google.com)'));
-        $this->assertSame('<p><a href="/getgrav/grav/issues/new?title=%5Badd-resource%5D%20New%20Plugin%2FTheme&amp;body=Hello%20%2A%2AThere%2A%2A">complex url</a></p>',
+        $this->assertSame('<p><a href="/getgrav/grav/issues/new?title=%5Badd-resource%5D%20New%20Plugin%2FTheme&body=Hello%20%2A%2AThere%2A%2A">complex url</a></p>',
             $this->parsedown->text('[complex url](https://github.com/getgrav/grav/issues/new?title=[add-resource]%20New%20Plugin/Theme&body=Hello%20**There**)'));
     }
 
@@ -689,7 +689,7 @@ public function testAttributeLinks()
             $this->parsedown->text('[Relative Target](../item2-3?target=_blank)'));
         $this->assertSame('<p><a href="/item2/item2-3" rel="nofollow">Relative Rel</a></p>',
             $this->parsedown->text('[Relative Rel](../item2-3?rel=nofollow)'));
-        $this->assertSame('<p><a href="/item2/item2-3?foo=bar&amp;baz=qux" rel="nofollow" class="button">Relative Mixed</a></p>',
+        $this->assertSame('<p><a href="/item2/item2-3?foo=bar&baz=qux" rel="nofollow" class="button">Relative Mixed</a></p>',
             $this->parsedown->text('[Relative Mixed](../item2-3?foo=bar&baz=qux&rel=nofollow&class=button)'));
     }