Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Add support of variables in layout

Browse Source 
Add unit tests associated


git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@1801 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2014-09-10 09:33:01 +00:00
parent 6386af1397
commit 6869b6310a
3 changed files with 84 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/layout.html Normal file
View File

@@ -0,0 +1,7 @@
<html>
<body>
Text
<?php if (isset ($var)) echo $var; ?>
</body>
</html>

56
Tests/outputhtmlTest.php Normal file
View File

@@ -0,0 +1,56 @@
<?php
/** DomFramework - Tests
@package domframework
@author Dominique Fournier <dominique@fournier38.fr> */
/** Test the outputhtml.php file */
class test_outputhtml extends PHPUnit_Framework_TestCase
{
/** Entry null */
public function testlayout1 ()
{
$this->expectOutputString("");
$output = new outputhtml ();
print ($output->out (""));
}
public function testlayout2 ()
{
$this->expectOutputString("data");
$output = new outputhtml ();
print ($output->out ("data"));
}
public function testlayout3 ()
{
$this->expectOutputString("data");
$output = new outputhtml ();
print ($output->out ("data", "title"));
}
public function testlayout4 ()
{
$this->expectOutputString("<html>
<body>
Text
</body>
</html>\n");
$output = new outputhtml ();
print ($output->out ("data", "title", FALSE, FALSE, "Tests/layout.html" ));
}
public function testlayout5 ()
{
$this->expectOutputString("<html>
<body>
Text
VARIABLE
</body>
</html>\n");
$output = new outputhtml ();
$variable = array ("var"=>"VARIABLE");
print ($output->out ("data", "title", FALSE, FALSE, "Tests/layout.html",
null, $variable));
}
}

24
outputhtml.php
View File

@@ -17,8 +17,8 @@ class outputhtml extends output
@param string|null $viewMethod Method in the class in views @param string|null $viewMethod Method in the class in views
@param string|null $layout Layout file in views @param string|null $layout Layout file in views
@param array|null $replacement Replace the {key}=>value @param array|null $replacement Replace the {key}=>value
@param array|null $variable PHP variables send to the view (can be @param array|null $variable PHP variables send to the view and to layout
processed by foreach, if...) */ (can be processed by foreach, if...) */
public function out ($data, $title = FALSE, public function out ($data, $title = FALSE,
$viewClass = FALSE, $viewMethod = FALSE, $viewClass = FALSE, $viewMethod = FALSE,
$layout = FALSE, $replacement = array(), $layout = FALSE, $replacement = array(),
@@ -40,7 +40,9 @@ class outputhtml extends output
if ($layout !== FALSE) if ($layout !== FALSE)
{ {
$layoutPage = file_get_contents ("views/$layout.html"); if (! file_exists ($layout) && file_exists ("views/$layout.html"))
$layout = "views/$layout.html";
$layoutPage = $this->layoutVariables ($layout, $variable);
$resView = str_replace ("{content}", $resView, $layoutPage); $resView = str_replace ("{content}", $resView, $layoutPage);
} }
@@ -53,4 +55,20 @@ class outputhtml extends output
return $resView; return $resView;
} }
/** Get the layout and provide it the variables. The variables will be push in
global to the layout (they can be used like $XX)
@param string the layout file to load
@param array $variables The variables array to push to the layout
@return string the Layout with variables interpreted */
private function layoutVariables ($layout, $variables)
{
if (! file_exists ($layout))
throw new Exception (sprintf (_("Layout File '%s' does not exists"),
$layout), 404);
extract ($variables);
ob_start();
require ($layout);
return ob_get_clean ();
}
} }