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 branch '5.2' into 5

Browse Source
This commit is contained in:
Guy Sartorelli 2024-08-12 13:03:34 +12:00
commit 410ef74e32
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/View/SSViewer_Scope.php
View File

@ -186,6 +186,9 @@ class SSViewer_Scope
public function getObj($name, $arguments = [], $cache = false, $cacheName = null) public function getObj($name, $arguments = [], $cache = false, $cacheName = null)
{ {
$on = $this->getItem(); $on = $this->getItem();
if ($on === null) {
return null;
}
return $on->obj($name, $arguments, $cache, $cacheName); return $on->obj($name, $arguments, $cache, $cacheName);
} }

6
tests/php/View/SSViewerTest.php
View File

@ -364,6 +364,12 @@ SS;
); );
} }
public function testGlobalVariablesReturnNull()
{
$this->assertEquals('<p></p>', $this->render('<p>$SSViewerTest_GlobalReturnsNull</p>'));
$this->assertEquals('<p></p>', $this->render('<p>$SSViewerTest_GlobalReturnsNull.Chained.Properties</p>'));
}
public function testCoreGlobalVariableCalls() public function testCoreGlobalVariableCalls()
{ {
$this->assertEquals( $this->assertEquals(

9
tests/php/View/SSViewerTest/TestGlobalProvider.php
View File

@ -18,8 +18,8 @@ class TestGlobalProvider implements TemplateGlobalProvider, TestOnly
'SSViewerTest_GlobalReferencedByString' => 'get_reference', 'SSViewerTest_GlobalReferencedByString' => 'get_reference',
'SSViewerTest_GlobalReferencedInArray' => ['method' => 'get_reference'], 'SSViewerTest_GlobalReferencedInArray' => ['method' => 'get_reference'],
'SSViewerTest_GlobalThatTakesArguments' => ['method' => 'get_argmix', 'casting' => 'HTMLFragment'] 'SSViewerTest_GlobalThatTakesArguments' => ['method' => 'get_argmix', 'casting' => 'HTMLFragment'],
'SSViewerTest_GlobalReturnsNull' => 'getNull',
]; ];
} }
@ -43,4 +43,9 @@ class TestGlobalProvider implements TemplateGlobalProvider, TestOnly
$args = func_get_args(); $args = func_get_args();
return 'z' . implode(':', $args) . 'z'; return 'z' . implode(':', $args) . 'z';
} }
public static function getNull()
{
return null;
}
} }