From cc838f9b4daa17933e16914993f515c050854933 Mon Sep 17 00:00:00 2001 From: Terry Fleury Date: Mon, 2 Apr 2018 10:02:42 -0500 Subject: [PATCH 1/4] Use latest version of cebe/markdown library. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6b2174c..1cf950a 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "require": { "php": ">=5.4", "cakephp/plugin-installer": "*", - "cebe/markdown": "1.0.x" + "cebe/markdown": "1.x" }, "require-dev": { "cakephp/cakephp": "3.0.*-dev", From fdb74f55a267f8d0b75deb5d010f2be0db144e3d Mon Sep 17 00:00:00 2001 From: Terry Fleury Date: Mon, 2 Apr 2018 10:16:22 -0500 Subject: [PATCH 2/4] Use latest version of CakePHP. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1cf950a..8dd4871 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "cebe/markdown": "1.x" }, "require-dev": { - "cakephp/cakephp": "3.0.*-dev", + "cakephp/cakephp": "3.*", "phpunit/phpunit": "*", "cakephp/cakephp-codesniffer": "dev-master" }, From 35d81c14630dbd530434d6337aa4ed0043754ebe Mon Sep 17 00:00:00 2001 From: Terry Fleury Date: Mon, 2 Apr 2018 10:16:36 -0500 Subject: [PATCH 3/4] For TravisCI, test PHP 7.x. '-dev' now included by default. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff6bb90..d98b8e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ php: - 5.4 - 5.5 - 5.6 + - 7.0 + - 7.1 + - 7.2 matrix: include: @@ -14,7 +17,7 @@ matrix: before_script: - composer self-update - - composer install --prefer-dist --no-interaction --dev + - composer install --prefer-dist --no-interaction - mysql -e "create database IF NOT EXISTS markdown_test;" -uroot script: From 905657d6c93c2081e5eb3ba5039292233bc1889f Mon Sep 17 00:00:00 2001 From: Terry Fleury Date: Mon, 2 Apr 2018 10:21:09 -0500 Subject: [PATCH 4/4] Fix PHP CodeSniffer error "Missing blank line before return statement." --- src/View/Helper/MarkdownHelper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/View/Helper/MarkdownHelper.php b/src/View/Helper/MarkdownHelper.php index 17bcbe3..acca07e 100644 --- a/src/View/Helper/MarkdownHelper.php +++ b/src/View/Helper/MarkdownHelper.php @@ -37,6 +37,7 @@ public function transform($input) $this->parser = new $className(); $this->parser->html5 = true; } + return $this->parser->parse($input); } }