Avoid deprecated Laravel code

GrahamCampbell · Jun 30, 2019 · 0330692 · 0330692
1 parent a0b5749
commit 0330692
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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));
             }