Handle custom extensions when caching views

Author: timacdonald

src/Illuminate/Foundation/Console/ViewCacheCommand.php

@@ -77,11 +77,17 @@ protected function compileViews(Collection $views)
      */
     protected function bladeFilesIn(array $paths)
     {
+        $extensions = collect($this->laravel['view']->getExtensions())
+            ->filter(fn ($value) => $value === 'blade')
+            ->keys()
+            ->map(fn ($extension) => "*.{$extension}")
+            ->all();
+
         return collect(
             Finder::create()
                 ->in($paths)
                 ->exclude('vendor')
-                ->name('*.blade.php')
+                ->name($extensions)
                 ->files()
         );
     }

tests/Integration/View/BladeTest.php

@@ -3,9 +3,12 @@
 namespace Illuminate\Tests\Integration\View;
 
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
 use Illuminate\View\Component;
 use Orchestra\Testbench\TestCase;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
 
 class BladeTest extends TestCase
 {
@@ -166,6 +169,21 @@ public function test_bound_name_attribute_can_be_used_if_using_short_slot_names_
 </div>', trim($content));
     }
 
+     public function testViewCacheCommandHandlesConfiguredBladeExtensions()
+     {
+         $this->artisan('view:clear');
+
+         View::addExtension('sh', 'blade');
+         $this->artisan('view:cache');
+
+         $compiledFiles = Finder::create()->in(Config::get('view.compiled'))->files();
+         $found = collect($compiledFiles)
+             ->contains(fn (SplFileInfo $file) => str_contains($file->getContents(), 'echo "<?php echo e($scriptMessage); ?>" > output.log'));
+         $this->assertTrue($found);
+
+         $this->artisan('view:clear');
+     }
+
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('view.paths', [__DIR__.'/templates']);

tests/Integration/View/templates/different-extension.sh

@@ -0,0 +1 @@
+echo "{{ $scriptMessage }}" > output.log