TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow usage of namespace alias in the code section a a CMS page, with 

unit test. Fixes #2006
This commit is contained in:
Jérémy Gaulin 2016-05-21 16:20:51 +02:00
parent 3779324ded
commit e3812036da
5 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cms/classes/CodeParser.php
View File

@ -91,7 +91,7 @@ class CodeParser
$body = preg_replace('/^\s*function/m', 'public function', $body);
$codeNamespaces = [];
$pattern = '/(use\s+[a-z0-9_\\\\]+;\n?)/mi';
$pattern = '/(use\s+[a-z0-9_\\\\]+(\s+as\s+[a-z0-9_]+)?;\n?)/mi';
preg_match_all($pattern, $body, $namespaces);
$body = preg_replace($pattern, '', $body);

9
tests/fixtures/cms/reference/namespaces-aliases.php.stub vendored Normal file
View File

@ -0,0 +1,9 @@
<?php
use Cms\Classes\Theme as MyTheme;
use Cms\Classes\Router as MyRouter;
class {className} extends \Cms\Classes\PageCode
{
public function onStart() {
$this['pageStartVar'] = 3;
}
}

13
tests/fixtures/themes/test/pages/code-namespaces-aliases.htm vendored Normal file
View File

@ -0,0 +1,13 @@
url = "/code-namespaces"
==
<?php
use Cms\Classes\Theme as MyTheme;
use Cms\Classes\Router as MyRouter;
function onStart() {
$this['pageStartVar'] = 3;
}
?>
==
<p>Page</p>

1
tests/unit/cms/classes/CmsObjectQueryTest.php
View File

@ -65,6 +65,7 @@ class CmsObjectQueryTest extends TestCase
"blog-archive",
"blog-post",
"code-namespaces",
"code-namespaces-aliases",
"component-custom-render",
"component-partial",
"component-partial-nesting",

29
tests/unit/cms/classes/CodeParserTest.php
View File

@ -260,6 +260,35 @@ class CodeParserTest extends TestCase
$this->assertEquals($referenceContents, $this->getContents($info['filePath']));
}
public function testNamespacesAliases()
{
$theme = Theme::load('test');
$page = Page::load($theme, 'code-namespaces-aliases.htm');
$this->assertNotEmpty($page);
$parser = new CodeParser($page);
$info = $parser->parse();
$this->assertInternalType('array', $info);
$this->assertArrayHasKey('filePath', $info);
$this->assertArrayHasKey('className', $info);
$this->assertArrayHasKey('source', $info);
$this->assertFileExists($info['filePath']);
$controller = new Controller($theme);
$obj = $parser->source($page, null, $controller);
$this->assertInstanceOf('\Cms\Classes\PageCode', $obj);
$referenceFilePath = base_path().'/tests/fixtures/cms/reference/namespaces-aliases.php.stub';
$this->assertFileExists($referenceFilePath);
$referenceContents = $this->getContents($referenceFilePath);
$referenceContents = str_replace('{className}', $info['className'], $referenceContents);
$this->assertEquals($referenceContents, $this->getContents($info['filePath']));
}
//
// Helpers
//