Direct record of view directories with no care of assets

pug-php · Jul 13, 2017 · a8f9c1e · a8f9c1e
1 parent d73a7b1
commit a8f9c1e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Jade/JadeSymfonyBundle/Command/AssetsPublishCommand.php b/src/Jade/JadeSymfonyBundle/Command/AssetsPublishCommand.php
@@ -21,8 +21,7 @@ protected function cacheTemplates(Jade $pug)
         $success = 0;
         $errors = 0;
         $directories = [];
-        foreach ($pug->getOption('assetDirectory') as $assetDirectory) {
-            $viewDirectory = $assetDirectory . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'views';
+        foreach ($pug->getOption('viewDirectories') as $viewDirectory) {
             if (is_dir($viewDirectory)) {
                 $directories[] = $viewDirectory;
                 $data = $pug->cacheDirectory($viewDirectory);

diff --git a/src/Jade/JadeSymfonyEngine.php b/src/Jade/JadeSymfonyEngine.php
@@ -37,11 +37,13 @@ public function __construct($kernel)
         $appDir = $kernel->getRootDir();
         $rootDir = dirname($appDir);
         $assetsDirectories = [$appDir . '/Resources/assets'];
+        $viewDirectories = [$appDir . '/Resources/views'];
         $srcDir = $rootDir . '/src';
         $webDir = $rootDir . '/web';
-        $baseDir = $this->crawlDirectories($srcDir, $appDir, $assetsDirectories);
+        $baseDir = $this->crawlDirectories($srcDir, $appDir, $assetsDirectories, $viewDirectories);
         $this->jade = new Jade([
             'assetDirectory'  => $assetsDirectories,
+            'viewDirectories' => $viewDirectories,
             'baseDir'         => $baseDir,
             'cache'           => substr($environment, 0, 3) === 'dev' ? false : $cache,
             'environment'     => $environment,
@@ -62,15 +64,19 @@ public function __construct($kernel)
         $this->jade->share('app', $app);
     }
 
-    protected function crawlDirectories($srcDir, $appDir, &$assetsDirectories)
+    protected function crawlDirectories($srcDir, $appDir, &$assetsDirectories, &$viewDirectories)
     {
         $baseDir = null;
         foreach (scandir($srcDir) as $directory) {
             if ($directory === '.' || $directory === '..' || is_file($srcDir . '/' . $directory)) {
                 continue;
             }
-            if (is_null($baseDir) && is_dir($srcDir . '/' . $directory . '/Resources/views')) {
-                $baseDir = $srcDir . '/' . $directory . '/Resources/views';
+            $viewDirectory = $srcDir . '/' . $directory . '/Resources/views';
+            if (is_dir($viewDirectory)) {
+                if (is_null($baseDir)) {
+                    $baseDir = $viewDirectory;
+                }
+                $viewDirectories[] = $srcDir . '/' . $directory . '/Resources/views';
             }
             $assetsDirectories[] = $srcDir . '/' . $directory . '/Resources/assets';
         }