Implement #75 Add reverted extensions blade.pug and jade.pug

BKWLD · Dec 31, 2019 · ba497f3 · ba497f3
1 parent 8854d79
commit ba497f3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -239,11 +239,28 @@ public function registerPugCompiler($subExtension = '')
             return new CompilerEngine($this->app['Bkwld\LaravelPug\Pug' . ucfirst(ltrim($subExtension, '.')) . 'Compiler']);
         });
 
-        // Add extensions
-        $this->app['view']->addExtension('pug' . $subExtension, 'pug' . $subExtension);
-        $this->app['view']->addExtension('pug' . $subExtension . '.php', 'pug' . $subExtension);
-        $this->app['view']->addExtension('jade' . $subExtension, 'pug' . $subExtension);
-        $this->app['view']->addExtension('jade' . $subExtension . '.php', 'pug' . $subExtension);
+        $mainExtension = 'pug' . $subExtension;
+        $extensions = array(
+            // Pug extensions
+            $mainExtension,
+            $mainExtension . '.php',
+            // Legacy jade extensions
+            'jade' . $subExtension,
+            'jade' . $subExtension . '.php',
+        );
+
+        if ($subExtension !== '') {
+            $subExtensionPrefix = substr($subExtension, 1) . '.';
+
+            $extensions[] = $subExtensionPrefix . 'pug';
+            $extensions[] = $subExtensionPrefix . 'pug.php';
+            $extensions[] = $subExtensionPrefix . 'jade';
+            $extensions[] = $subExtensionPrefix . 'jade.php';
+        }
+
+        foreach ($extensions as $extension) {
+            $this->app['view']->addExtension($extension, $mainExtension);
+        }
     }
 
     /**
@@ -257,7 +274,7 @@ public function registerPugBladeCompiler()
     }
 
     /**
-     * Get the configuration, which is keyed differently in L5 vs l4.
+     * Get the configuration, which is keyed differently in L5 vs L4.
      *
      * @return array
      */

diff --git a/tests/BladeDirectivesTest.php b/tests/BladeDirectivesTest.php
@@ -185,6 +185,10 @@ public function testCustomDirective()
 
         self::assertSame(
             [
+                'blade.jade.php' => 'pug.blade',
+                'blade.jade' => 'pug.blade',
+                'blade.pug.php' => 'pug.blade',
+                'blade.pug' => 'pug.blade',
                 'jade.blade.php' => 'pug.blade',
                 'jade.blade' => 'pug.blade',
                 'pug.blade.php' => 'pug.blade',

diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -344,7 +344,7 @@ public function testBoot()
         $this->provider->boot();
 
         self::assertArraySubset(
-            ['pug', 'pug.php', 'jade', 'jade.php', 'pug.blade', 'pug.blade.php', 'jade.blade', 'jade.blade.php'],
+            ['pug', 'pug.php', 'jade', 'jade.php', 'pug.blade', 'pug.blade.php', 'jade.blade', 'jade.blade.php', 'blade.pug', 'blade.pug.php', 'blade.jade', 'blade.jade.php'],
             array_keys($view->getExtensions())
         );
         self::assertSame('bkwld/laravel-pug', $this->provider->getCurrentPackage());