geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-10 09:26:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug #2749 Fixed ArrayObject access with a null value (yceruto)

Browse Source 
This PR was merged into the 1.x branch.

Discussion
----------

Fixed ArrayObject access with a null value

fixes https://github.com/twigphp/Twig/issues/2744

Commits
-------

80e65b4c fixed ArrayObject access with a null value
This commit is contained in:
Fabien Potencier
2019-01-13 12:00:33 +01:00
parent 9d36daf19e 80e65b4c73
commit c2e67488a9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Template.php
+1 -3
View File
@@ -508,9 +508,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
if (self::METHOD_CALL !== $type) {
$arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
if ((is_array($object) && (isset($object[$arrayItem]) || array_key_exists($arrayItem, $object)))
|| ($object instanceof ArrayAccess && isset($object[$arrayItem]))
) {
if ((is_array($object) || $object instanceof ArrayAccess) && (isset($object[$arrayItem]) || array_key_exists($arrayItem, $object))) {
if ($isDefinedTest) {
return true;
}
test/Twig/Tests/TemplateTest.php
+2
View File
@@ -315,6 +315,7 @@ class Twig_Tests_TemplateTest extends \PHPUnit\Framework\TestCase
];
$objectArray = new Twig_TemplateArrayAccessObject();
$arrayObject = new ArrayObject($array);
$stdObject = (object) $array;
$magicPropertyObject = new Twig_TemplateMagicPropertyObject();
$propertyObject = new Twig_TemplatePropertyObject();
@@ -346,6 +347,7 @@ class Twig_Tests_TemplateTest extends \PHPUnit\Framework\TestCase
// array(object, type of fetch)
[$array, $arrayType],
[$objectArray, $arrayType],
[$arrayObject, $anyType],
[$stdObject, $anyType],
[$magicPropertyObject, $anyType],
[$methodObject, $methodType],