From 3e70aa744fc3b62e14de043526a86eb48237ddf2 Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Sun, 21 Apr 2019 13:43:18 +0100 Subject: [PATCH 1/2] Adding Laravel 5.7 support --- README.md | 4 ++-- _docs/0-Home.md | 2 +- _docs/1-Installation-and-Setup.md | 3 +++ _docs/2-Configuration.md | 18 ++++++++++++++---- composer.json | 6 +++--- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index eff2ba8..41116a2 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelMarkdo ### Features - * Laravel `5.1` to `5.6` are supported. + * Laravel `5.1` to `5.7` are supported. * Easy setup & configuration. * Well tested (100% code coverage with maximum code quality). * Made with :heart: & :coffee:. @@ -45,7 +45,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail. - [All Contributors][link-contributors] [badge_license]: https://img.shields.io/packagist/l/arcanedev/laravel-markdown.svg?style=flat-square -[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.6-orange.svg?style=flat-square +[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.7-orange.svg?style=flat-square [badge_build]: https://img.shields.io/travis/ARCANEDEV/LaravelMarkdown.svg?style=flat-square [badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelMarkdown.svg?style=flat-square [badge_quality]: https://img.shields.io/scrutinizer/g/ARCANEDEV/LaravelMarkdown.svg?style=flat-square diff --git a/_docs/0-Home.md b/_docs/0-Home.md index 5c83d5b..90977bc 100644 --- a/_docs/0-Home.md +++ b/_docs/0-Home.md @@ -6,7 +6,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelMarkdo ### Features - * Laravel `5.1 | 5.2 | 5.3 | 5.4 | 5.5` are Supported. + * Laravel `5.1` to `5.7` are Supported. * Easy setup & configuration. * Well tested (100% code coverage with maximum code quality). * Made with :heart: & :coffee:. diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md index f672b77..fff7700 100644 --- a/_docs/1-Installation-and-Setup.md +++ b/_docs/1-Installation-and-Setup.md @@ -8,6 +8,7 @@ | ![Laravel Markdown v1.2.x][laravel_markdown_1_2_x] | ![Laravel v5.4][laravel_5_4] | | ![Laravel Markdown v1.3.x][laravel_markdown_1_3_x] | ![Laravel v5.5][laravel_5_5] | | ![Laravel Markdown v1.4.x][laravel_markdown_1_4_x] | ![Laravel v5.6][laravel_5_6] | +| ![Laravel Markdown v1.5.x][laravel_markdown_1_5_x] | ![Laravel v5.7][laravel_5_7] | [laravel_5_0]: https://img.shields.io/badge/v5.0-supported-brightgreen.svg?style=flat-square "Laravel v5.0" [laravel_5_1]: https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1" @@ -16,11 +17,13 @@ [laravel_5_4]: https://img.shields.io/badge/v5.4-supported-brightgreen.svg?style=flat-square "Laravel v5.4" [laravel_5_5]: https://img.shields.io/badge/v5.5-supported-brightgreen.svg?style=flat-square "Laravel v5.5" [laravel_5_6]: https://img.shields.io/badge/v5.6-supported-brightgreen.svg?style=flat-square "Laravel v5.6" +[laravel_5_7]: https://img.shields.io/badge/v5.7-supported-brightgreen.svg?style=flat-square "Laravel v5.7" [laravel_markdown_1_1_x]: https://img.shields.io/badge/version-1.1.*-blue.svg?style=flat-square "Laravel Markdown v1.1.*" [laravel_markdown_1_2_x]: https://img.shields.io/badge/version-1.2.*-blue.svg?style=flat-square "Laravel Markdown v1.2.*" [laravel_markdown_1_3_x]: https://img.shields.io/badge/version-1.3.*-blue.svg?style=flat-square "Laravel Markdown v1.3.*" [laravel_markdown_1_4_x]: https://img.shields.io/badge/version-1.4.*-blue.svg?style=flat-square "Laravel Markdown v1.4.*" +[laravel_markdown_1_5_x]: https://img.shields.io/badge/version-1.5.*-blue.svg?style=flat-square "Laravel Markdown v1.5.*" ## Composer diff --git a/_docs/2-Configuration.md b/_docs/2-Configuration.md index 14aee62..227e88f 100644 --- a/_docs/2-Configuration.md +++ b/_docs/2-Configuration.md @@ -5,19 +5,28 @@ return [ - /* ------------------------------------------------------------------------------------------------ + /* ----------------------------------------------------------------- + | Set Safe mode + | ----------------------------------------------------------------- + */ + + 'safe-mode' => false, + + /* ----------------------------------------------------------------- | Escape Cross-site scripting - | ------------------------------------------------------------------------------------------------ + | ----------------------------------------------------------------- | Allowing or not to escape the JavaScript in anchor tags. | e.g. markdown like "[Link](javascript:alert('hello'))". */ + 'xss' => true, - /* ------------------------------------------------------------------------------------------------ + /* ----------------------------------------------------------------- | Automatically link URLs - | ------------------------------------------------------------------------------------------------ + | ----------------------------------------------------------------- | Allowing or not to automatic-linking of URLs in your markdown. */ + 'urls' => true, /* ----------------------------------------------------------------- @@ -25,6 +34,7 @@ return [ | ----------------------------------------------------------------- | Allowing or not to escape the HTML markups. */ + 'markups' => true, ]; diff --git a/composer.json b/composer.json index a3afa8f..465aa9c 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,11 @@ "license": "MIT", "require": { "php": ">=7.1.3", - "arcanedev/support": "~4.3.0", - "erusev/parsedown": "~1.6" + "arcanedev/support": "~4.4.0", + "erusev/parsedown": "~1.7" }, "require-dev": { - "orchestra/testbench": "~3.6.0", + "orchestra/testbench": "~3.7.0", "phpunit/phpunit": "~7.0", "phpunit/phpcov": "~5.0" }, From ed74dea9c729320506cccb48b46f35748500c9cb Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Sun, 21 Apr 2019 13:49:45 +0100 Subject: [PATCH 2/2] Cleaning the tests --- tests/TestCase.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 61dcfca..6b8d206 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -36,20 +36,6 @@ protected function getPackageProviders($app) ]; } - /** - * Get package aliases. - * - * @param \Illuminate\Foundation\Application $app - * - * @return array - */ - protected function getPackageAliases($app) - { - return [ - 'Markdown' => \Arcanedev\LaravelMarkdown\Facades\Markdown::class, - ]; - } - /** * Define environment setup. *