tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7322 from open-sausages/pulls/4.0/allow-external-includes

Browse Source 
ENHANCEMENT Allow <% include %> to fallback outside of the Includes folder
This commit is contained in:
Chris Joe 2017-08-29 16:48:58 +12:00 committed by GitHub
commit b2c4b7123e
7 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/View/SSTemplateParser.peg
View File

@ -891,7 +891,7 @@ class SSTemplateParser extends Parser implements TemplateParser
$template = $res['template'];
$arguments = $res['arguments'];
$res['php'] = '$val .= \\SilverStripe\\View\\SSViewer::execute_template(["type" => "Includes", '.$template.'], $scope->getItem(), array(' .
$res['php'] = '$val .= \\SilverStripe\\View\\SSViewer::execute_template([["type" => "Includes", '.$template.'], '.$template.'], $scope->getItem(), array(' .
implode(',', $arguments)."), \$scope);\n";
if ($this->includeDebuggingComments) { // Add include filename comments on dev sites

2
src/View/SSTemplateParser.php
View File

@ -3499,7 +3499,7 @@ class SSTemplateParser extends Parser implements TemplateParser
$template = $res['template'];
$arguments = $res['arguments'];
$res['php'] = '$val .= \\SilverStripe\\View\\SSViewer::execute_template(["type" => "Includes", '.$template.'], $scope->getItem(), array(' .
$res['php'] = '$val .= \\SilverStripe\\View\\SSViewer::execute_template([["type" => "Includes", '.$template.'], '.$template.'], $scope->getItem(), array(' .
implode(',', $arguments)."), \$scope);\n";
if ($this->includeDebuggingComments) { // Add include filename comments on dev sites

31
tests/php/View/SSViewerTest.php
View File

@ -1055,6 +1055,12 @@ after'
'Backslashes work for namespace references in includes'
);
$this->assertEquals(
"tests:( NamespaceInclude\n )",
$this->render('tests:( <% include Namespace\\NamespaceInclude %> )', $data),
'Escaped backslashes work for namespace references in includes'
);
$this->assertEquals(
"tests:( NamespaceInclude\n )",
$this->render('tests:( <% include Namespace/NamespaceInclude %> )', $data),
@ -1062,6 +1068,31 @@ after'
);
}
/**
* Test search for includes fallback to non-includes folder
*/
public function testIncludeFallbacks()
{
$data = new ArrayData([]);
$this->assertEquals(
"tests:( Namespace/Includes/IncludedTwice.ss\n )",
$this->render('tests:( <% include Namespace\\IncludedTwice %> )', $data),
'Prefer Includes in the Includes folder'
);
$this->assertEquals(
"tests:( Namespace/Includes/IncludedOnceSub.ss\n )",
$this->render('tests:( <% include Namespace\\IncludedOnceSub %> )', $data),
'Includes in only Includes folder can be found'
);
$this->assertEquals(
"tests:( Namespace/IncludedOnceBase.ss\n )",
$this->render('tests:( <% include Namespace\\IncludedOnceBase %> )', $data),
'Includes outside of Includes folder can be found'
);
}
public function testRecursiveInclude()
{

1
tests/php/View/SSViewerTest/templates/Namespace/IncludedOnceBase.ss Normal file
View File

@ -0,0 +1 @@
Namespace/IncludedOnceBase.ss

1
tests/php/View/SSViewerTest/templates/Namespace/IncludedTwice.ss Normal file
View File

@ -0,0 +1 @@
Namespace/IncludedTwice.ss

1
tests/php/View/SSViewerTest/templates/Namespace/Includes/IncludedOnceSub.ss Normal file
View File

@ -0,0 +1 @@
Namespace/Includes/IncludedOnceSub.ss

1
tests/php/View/SSViewerTest/templates/Namespace/Includes/IncludedTwice.ss Normal file
View File

@ -0,0 +1 @@
Namespace/Includes/IncludedTwice.ss