From 0330692456fef3e9beea09f9ea4b06963cdc88cc Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 30 Jun 2019 23:09:44 +0100 Subject: [PATCH] Avoid deprecated Laravel code --- CHANGELOG.md | 5 +++++ src/MarkdownServiceProvider.php | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a509c2c..68b6e1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ CHANGE LOG ========== +## V10.3.1 (Upcoming) + +* Avoid deprecated Laravel code + + ## V10.3 (17/02/2019) * Added Laravel 5.8 support diff --git a/src/MarkdownServiceProvider.php b/src/MarkdownServiceProvider.php index 263bb19..f5f5ac2 100644 --- a/src/MarkdownServiceProvider.php +++ b/src/MarkdownServiceProvider.php @@ -18,6 +18,7 @@ use GrahamCampbell\Markdown\Engines\PhpMarkdownEngine; use Illuminate\Contracts\Container\Container; use Illuminate\Foundation\Application as LaravelApplication; +use Illuminate\Support\Arr; use Illuminate\Support\ServiceProvider; use Illuminate\View\Engines\CompilerEngine; use Laravel\Lumen\Application as LumenApplication; @@ -165,9 +166,9 @@ protected function registerEnvironment() $config = $app->config->get('markdown'); - $environment->mergeConfig(array_except($config, ['extensions', 'views'])); + $environment->mergeConfig(Arr::except($config, ['extensions', 'views'])); - foreach ((array) array_get($config, 'extensions') as $extension) { + foreach ((array) Arr::get($config, 'extensions') as $extension) { $environment->addExtension($app->make($extension)); }