[9.x] De-couple Console component from framework (#44864)

* Do not resolve mutator through app * Check if app function exists
laravel · Nov 7, 2022 · e5398e7 · e5398e7
1 parent 4846e5f
commit e5398e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Illuminate/Console/View/Components/Component.php b/src/Illuminate/Console/View/Components/Component.php
@@ -81,12 +81,14 @@ protected function compile($view, $data)
     protected function mutate($data, $mutators)
     {
         foreach ($mutators as $mutator) {
+            $mutator = new $mutator;
+
             if (is_iterable($data)) {
                 foreach ($data as $key => $value) {
-                    $data[$key] = app($mutator)->__invoke($value);
+                    $data[$key] = $mutator($value);
                 }
             } else {
-                $data = app($mutator)->__invoke($data);
+                $data = $mutator($data);
             }
         }
 

diff --git a/src/Illuminate/Console/View/Components/Mutators/EnsureRelativePaths.php b/src/Illuminate/Console/View/Components/Mutators/EnsureRelativePaths.php
@@ -12,7 +12,7 @@ class EnsureRelativePaths
      */
     public function __invoke($string)
     {
-        if (app()->has('path.base')) {
+        if (function_exists('app') && app()->has('path.base')) {
             $string = str_replace(base_path().'/', '', $string);
         }