php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-14 22:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #9915: yii\helpers\ArrayHelper::getValue() was erroring instead of returning null for non-existing object properties

Browse Source
This commit is contained in:
Vadim
2015-10-14 12:36:33 +03:00
committed by Alexander Makarov
parent c128d008d3
commit c00b97a12c
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -24,6 +24,7 @@ Yii Framework 2 Change Log
- Bug #9874: Fixed outputting exception stacktrace in non-debug mode when `Response::FORMAT_RAW` is used (nainoon) - Bug #9874: Fixed outputting exception stacktrace in non-debug mode when `Response::FORMAT_RAW` is used (nainoon)
- Bug #9883: Passing a single `yii\db\Expression` to `Query::select()` or `::addSelect()` was not handled correctly in all cases (cebe) - Bug #9883: Passing a single `yii\db\Expression` to `Query::select()` or `::addSelect()` was not handled correctly in all cases (cebe)
- Bug #9911: Fixed `yii\helpers\BaseStringHelper::explode()` code so it does not remove items eq to 0 with skip_empty attribute (silverfire, kidol) - Bug #9911: Fixed `yii\helpers\BaseStringHelper::explode()` code so it does not remove items eq to 0 with skip_empty attribute (silverfire, kidol)
- Bug #9915: `yii\helpers\ArrayHelper::getValue()` was erroring instead of returning `null` for non-existing object properties (totaldev, samdark)
- Bug: Fixed generation of canonical URLs for `ViewAction` pages (samdark) - Bug: Fixed generation of canonical URLs for `ViewAction` pages (samdark)
- Enh #7581: Added ability to specify range using anonymous function in `RangeValidator` (RomeroMsk) - Enh #7581: Added ability to specify range using anonymous function in `RangeValidator` (RomeroMsk)
- Enh #8613: `yii\widgets\FragmentCache` will not store empty content anymore which fixes some problems related to `yii\filters\PageCache` (kidol) - Enh #8613: `yii\widgets\FragmentCache` will not store empty content anymore which fixes some problems related to `yii\filters\PageCache` (kidol)

2
framework/helpers/BaseArrayHelper.php
View File

@ -198,7 +198,7 @@ class BaseArrayHelper
$key = substr($key, $pos + 1); $key = substr($key, $pos + 1);
} }
if (is_object($array)) { if (is_object($array) && isset($array->$key)) {
return $array->$key; return $array->$key;
} elseif (is_array($array)) { } elseif (is_array($array)) {
return array_key_exists($key, $array) ? $array[$key] : $default; return array_key_exists($key, $array) ? $array[$key] : $default;

7
tests/framework/helpers/ArrayHelperTest.php
View File

@ -385,6 +385,13 @@ class ArrayHelperTest extends TestCase
$this->assertEquals($expected, ArrayHelper::getValue($array, $key, $default)); $this->assertEquals($expected, ArrayHelper::getValue($array, $key, $default));
} }
public function testGetValueObjects()
{
$object = new Post1();
$this->assertEquals(23, ArrayHelper::getValue($object, 'id'));
$this->assertEquals(null, ArrayHelper::getValue($object, 'nonExisting'));
}
public function testIsAssociative() public function testIsAssociative()
{ {
$this->assertFalse(ArrayHelper::isAssociative('test')); $this->assertFalse(ArrayHelper::isAssociative('test'));