Merge pull request #31 from pug-php/keep-extend

Fix #30 Keep extends as first statement

Author: kylekatarnls

src/Jade/JadeSymfonyEngine.php

@@ -101,9 +101,11 @@ public function __construct($kernel)
         $app->setDebug($kernel->isDebug());
         $app->setEnvironment($environment);
         $app->setRequestStack($container->get('request_stack'));
+        // @codeCoverageIgnoreStart
         if ($container->has('security.token_storage')) {
             $app->setTokenStorage($container->get('security.token_storage'));
         }
+        // @codeCoverageIgnoreEnd
         $this->share('app', $app);
     }
 
@@ -155,6 +157,22 @@ protected function getFileFromName($name)
         return $directory . DIRECTORY_SEPARATOR . $name;
     }
 
+    protected function getPugCodeLayoutStructure($pugCode)
+    {
+        $parts = preg_split('/^extend(?=s?\s)/m', $pugCode, 2);
+
+        if (count($parts) === 1) {
+            return ['', $parts[0]];
+        }
+
+        $parts[1] .= "\n";
+        $parts[1] = explode("\n", $parts[1], 2);
+        $parts[0] .= 'extend' . $parts[1][0] . "\n";
+        $parts[1] = substr($parts[1][1], 0, -1);
+
+        return $parts;
+    }
+
     /**
      * Share variables (local templates parameters) with all future templates rendered.
      *
@@ -182,18 +200,18 @@ public function share($variables, $value = null)
      */
     public function preRender($pugCode)
     {
-        $preCode = '';
+        $parts = $this->getPugCodeLayoutStructure($pugCode);
         $className = get_class($this);
         foreach ($this->replacements as $name => $callable) {
-            $preCode .= ":php\n" .
+            $parts[0] .= ":php\n" .
                 "    if (!function_exists('$name')) {\n" .
                 "        function $name() {\n" .
                 "            return call_user_func_array($className::getGlobalHelper('$name'), func_get_args());\n" .
                 "        }\n" .
                 "    }\n";
         }
 
-        return $preCode . $pugCode;
+        return implode('', $parts);
     }
 
     /**
@@ -302,9 +320,11 @@ public function exists($name)
      */
     public function supports($name)
     {
+        // @codeCoverageIgnoreStart
         $extensions = method_exists($this->jade, 'getExtensions')
             ? $this->jade->getExtensions()
             : $this->jade->getOption('extensions');
+        // @codeCoverageIgnoreEnd
         foreach ($extensions as $extension) {
             if (substr($name, -strlen($extension)) === $extension) {
                 return true;

src/Jade/Symfony/Traits/Options.php

@@ -21,11 +21,13 @@ trait Options
      */
     public function getOptionDefault($name, $default = null)
     {
+        // @codeCoverageIgnoreStart
         try {
             return $this->getOption($name, $default);
         } catch (\InvalidArgumentException $exception) {
             return $default;
         }
+        // @codeCoverageIgnoreEnd
     }
 
     /**

tests/Pug/PugSymfonyBundle/Command/AssetsPublishCommandTest.php

@@ -52,7 +52,7 @@ public function testCommand()
         file_put_contents($customHelperFile, $customHelper);
         file_put_contents($stylePhpFile, $stylePhp);
 
-        $this->assertContains('9 templates cached', $output, 'All templates can be cached except filter.pug as the upper filter does not exists.');
+        $this->assertContains('11 templates cached', $output, 'All templates can be cached except filter.pug as the upper filter does not exists.');
         $this->assertContains('1 templates failed to be cached', $output, 'filter.pug fails as the upper filter does not exists.');
         $this->assertRegExp('/(Unknown\sfilter\supper|upper:\sFilter\sdoes\s?n[\'o]t\sexists)/', $output, 'filter.pug fails as the upper filter does not exists.');
         $this->assertContains('filter.pug', $output, 'filter.pug fails as the upper filter does not exists.');

tests/Pug/PugSymfonyEngineTest.php

@@ -217,6 +217,25 @@ public function testPreRender()
         $pugSymfony = new PugSymfonyEngine($kernel);
 
         self::assertSame('<p>/foo</p>', $pugSymfony->renderString('p=asset("foo")'));
+
+        $kernel = new TestKernel(function (Container $container) {
+            $container->setParameter('pug', [
+                'expressionLanguage' => 'js',
+            ]);
+        });
+        $kernel->boot();
+        $pugSymfony = new PugSymfonyEngine($kernel);
+
+        self::assertSame('<p>/foo</p>', $pugSymfony->renderString('p=asset("foo")'));
+
+        self::assertSame(implode('', [
+            '<html>',
+            '<head><title>My Site</title></head>',
+            '<body><h1>Welcome Bob</h1><p>42</p><footer><p></p>Some footer text</footer></body>',
+            '</html>',
+        ]), $pugSymfony->render('layout/welcome.pug', [
+            'name' => 'Bob',
+        ]));
     }
 
     /**
@@ -810,6 +829,32 @@ public function testInstallSymfony4()
         self::assertContains('Engine service added in config/packages/framework.yaml', $io->getLastOutput());
         clearstatcache();
         self::assertFileExists($installedFile);
+
+        $fs->remove($installedFile);
+        file_put_contents($dir . '/config/services.yaml', str_replace(
+            ['services', 'pug'],
+            ['x', 'x'],
+            file_get_contents($dir . '/config/services.yaml')
+        ));
+        file_put_contents($dir . '/config/packages/framework.yaml', str_replace(
+            ['pug', 'twig', 'framework'],
+            ['x', 'x', 'x'],
+            file_get_contents($dir . '/config/packages/framework.yaml')
+        ));
+        file_put_contents($dir . '/config/bundles.php', preg_replace(
+            '/\[\s*\n\s*/',
+            '[',
+            file_get_contents($dir . '/config/bundles.php')
+        ));
+        $io->reset();
+
+        self::assertTrue(PugSymfonyEngine::install(new Event('install', $composer, $io), $dir));
+        self::assertSame([
+            'framework entry not found in config/packages/framework.yaml.',
+            'services entry not found in config/services.yaml.',
+            'Sorry, config/bundles.php has a format we can\'t handle automatically.',
+        ], $io->getLastOutput());
+        $fs->remove($installedFile);
     }
 
     public function testOptionDefaultingOnException()

tests/project/app/Resources/views/layout/layout.pug

@@ -0,0 +1,8 @@
+html
+    head
+        title My Site
+    body
+        block content
+        footer
+            p
+            | Some footer text

tests/project/app/Resources/views/layout/welcome.pug

@@ -0,0 +1,6 @@
+extend layout
+
+block content
+    h1 Welcome #{name}
+
+    p=random(42, 42)