ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor the view class method order and comments.

Browse Source
This commit is contained in:
Taylor Otwell
2011-08-08 13:35:01 -05:00
parent 6590b54f44
commit d1d4ac1056
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
system/view.php
View File

@@ -136,34 +136,13 @@ class View {
{
$composer = static::$composers[$this->module][$this->view];
if ( ! is_null($composer = $this->find_composer_handler($composer)))
if ( ! is_null($composer = $this->find_composer_function($composer)))
{
call_user_func($composer, $this);
}
}
}
/**
* Find the composer handler / function in a composer definition.
*
* If the composer value itself is callable, it will be returned, otherwise the
* first callable value in the composer array will be returned.
*
* @param mixed $composer
* @return Closure
*/
private function find_composer_handler($composer)
{
if (is_string($composer)) return;
if (is_callable($composer)) return $composer;
foreach ($composer as $value)
{
if (is_callable($value)) return $value;
}
}
/**
* Load the view composers for a given module.
*
@@ -179,6 +158,28 @@ class View {
static::$composers[$module] = (file_exists($composers)) ? require $composers : array();
}
/**
* Find the composer function in a composer definition.
*
* If the composer value itself is callable, it will be returned, otherwise the
* first callable value in the composer array will be returned. If the composer
* value is a string, it is simply a view name being defined.
*
* @param mixed $composer
* @return Closure
*/
private function find_composer_function($composer)
{
if (is_string($composer)) return;
if (is_callable($composer)) return $composer;
foreach ($composer as $value)
{
if (is_callable($value)) return $value;
}
}
/**
* Get the parsed content of the view.
*