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 remote-tracking branch 'upstream/master' into deprecation_fixes

Browse Source
This commit is contained in:
Sean Harvey 2012-03-09 15:47:20 +13:00
commit 53bf61c968
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/install/install.php5
View File

@ -670,7 +670,9 @@ class InstallRequirements {
}
function getTempFolder() {
if(file_exists($this->getBaseDir() . 'silverstripe-cache')) {
if (defined('TEMP_FOLDER')) {
$sysTmp = TEMP_FOLDER;
} elseif(file_exists($this->getBaseDir() . 'silverstripe-cache')) {
$sysTmp = $this->getBaseDir();
} elseif(function_exists('sys_get_temp_dir')) {
$sysTmp = sys_get_temp_dir();

19
tests/parsers/ShortcodeParserTest.php
View File

@ -20,12 +20,12 @@ class ShortcodeParserTest extends SapphireTest {
public function testNotRegisteredShortcode() {
$this->assertEquals('[not_shortcode]', $this->parser->parse('[not_shortcode]'));
$this->assertEquals('[not_shortcode /]', $this->parser->parse('[not_shortcode /]'));
$this->assertEquals('[not_shortcode foo="bar"]', $this->parser->parse('[not_shortcode foo="bar"]'));
$this->assertEquals('[not_shortcode,foo="bar"]', $this->parser->parse('[not_shortcode,foo="bar"]'));
$this->assertEquals('[not_shortcode]a[/not_shortcode]', $this->parser->parse('[not_shortcode]a[/not_shortcode]'));
}
public function testSimpleTag() {
$tests = array('[test_shortcode]', '[test_shortcode ]', '[test_shortcode/]', '[test_shortcode /]');
$tests = array('[test_shortcode]', '[test_shortcode ]', '[test_shortcode,]', '[test_shortcode/]', '[test_shortcode /]');
foreach($tests as $test) {
$this->parser->parse($test);
@ -38,9 +38,9 @@ class ShortcodeParserTest extends SapphireTest {
public function testOneArgument() {
$tests = array (
'[test_shortcode foo="bar"]',
"[test_shortcode foo='bar']",
'[test_shortcode foo = "bar" /]'
'[test_shortcode,foo="bar"]',
"[test_shortcode,foo='bar']",
'[test_shortcode,foo = "bar" /]'
);
foreach($tests as $test) {
@ -53,7 +53,7 @@ class ShortcodeParserTest extends SapphireTest {
}
public function testMultipleArguments() {
$this->parser->parse('[test_shortcode foo = "bar" bar=\'foo\' baz="buz"]');
$this->parser->parse('[test_shortcode,foo = "bar",bar=\'foo\',baz="buz"]');
$this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', 'baz' => 'buz'), $this->arguments);
$this->assertEquals('', $this->contents);
@ -69,7 +69,7 @@ class ShortcodeParserTest extends SapphireTest {
}
public function testEnclosingWithArguments() {
$this->parser->parse('[test_shortcode foo = "bar" bar=\'foo\' baz="buz"]foo[/test_shortcode]');
$this->parser->parse('[test_shortcode,foo = "bar",bar=\'foo\',baz="buz"]foo[/test_shortcode]');
$this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', 'baz' => 'buz'), $this->arguments);
$this->assertEquals('foo', $this->contents);
@ -86,6 +86,11 @@ class ShortcodeParserTest extends SapphireTest {
$this->assertEquals(array('foo' => 'bar', 'baz' => 'buz'), $this->arguments);
}
public function testSpacesForDelimiter() {
$this->assertEquals('', $this->parser->parse('[test_shortcode foo=bar baz = buz]'));
$this->assertEquals(array('foo' => 'bar', 'baz' => 'buz'), $this->arguments);
}
public function testSelfClosingTag() {
$this->assertEquals (
'morecontent',