Skip to content

Auto-add the path to views of the current controller to twig loader #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stas-demydiuk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Auto-add the path to views of the current controller to twig loader #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99a6431
Auto-add the path to views of the current controller to twig loader
stas-demydiuk Sep 3, 2013
c1430df
Auto-add the path of the current file to twig loader
stas-demydiuk Sep 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions ETwigViewRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ class ETwigViewRenderer extends CApplicationComponent implements IViewRenderer
* @var string Twig template files extension
*/
public $fileExtension = '.twig';
/**
* @var bool Auto-add current controller and file path to twig loader
*/
public $autoAddPath = true;
/**
* @var array Twig environment options
* @see http://twig.sensiolabs.org/doc/api.html#environment-options
Expand Down Expand Up @@ -82,6 +86,7 @@ function init()
}

$this->_paths[] = $app->getBasePath();
$this->_paths[] = $app->getBasePath() . DIRECTORY_SEPARATOR . 'views';

$loader = new Twig_Loader_Filesystem($this->_paths);

Expand Down Expand Up @@ -138,6 +143,16 @@ function init()
*/
public function renderFile($context, $sourceFile, $data, $return)
{
// add controller view path
if ($this->autoAddPath && $context instanceof CController) {
$this->_addPath($context->getViewPath());
}

// add current file path
if ($this->autoAddPath && file_exists($sourceFile)) {
$this->_addPath(dirname($sourceFile));
}

// current controller properties will be accessible as {{ this.property }}
$data['this'] = $context;

Expand Down Expand Up @@ -251,6 +266,14 @@ private function _addCustom($classType, $elements)
}
}
}

private function _addPath($path)
{
if (!in_array($path, $this->_paths) && file_exists($path)) {
$this->_twig->getLoader()->addPath($path);
$this->_paths[] = $path;
}
}
}

/**
Expand Down