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

Merge branch '2.x' into 3.x

Browse Source 
* 2.x:
  Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
This commit is contained in:
Fabien Potencier
2019-08-02 10:10:24 +02:00
parent 60ab8f18e4 03dbdb9683
commit bc79ad339b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Extension/CoreExtension.php
+2 -2
View File
@@ -1354,7 +1354,7 @@ function twig_get_attribute(Environment $env, Source $source, $object, $item, ar
if (/* Template::METHOD_CALL */ 'method' !== $type) {
$arrayItem = \is_bool($item) || \is_float($item) ? (int) $item : $item;
if (((\is_array($object) || $object instanceof \ArrayObject) && (isset($object[$arrayItem]) || \array_key_exists($arrayItem, $object)))
if (((\is_array($object) || $object instanceof \ArrayObject) && (isset($object[$arrayItem]) || \array_key_exists($arrayItem, (array) $object)))
|| ($object instanceof ArrayAccess && isset($object[$arrayItem]))
) {
if ($isDefinedTest) {
@@ -1425,7 +1425,7 @@ function twig_get_attribute(Environment $env, Source $source, $object, $item, ar
// object property
if (/* Template::METHOD_CALL */ 'method' !== $type) {
if (isset($object->$item) || \array_key_exists((string) $item, $object)) {
if (isset($object->$item) || \array_key_exists((string) $item, (array) $object)) {
if ($isDefinedTest) {
return true;
}