diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PropertyAccess] the property path constructor already implements the type check

Browse Source
This commit is contained in:
Tobias Schultze 2015-02-19 13:40:39 +01:00
parent 4e11c0710b
commit 9cacecbf79
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
View File

@ -40,10 +40,8 @@ class PropertyAccessor implements PropertyAccessorInterface
*/ */
public function getValue($objectOrArray, $propertyPath) public function getValue($objectOrArray, $propertyPath)
{ {
if (is_string($propertyPath)) { if (!$propertyPath instanceof PropertyPathInterface) {
$propertyPath = new PropertyPath($propertyPath); $propertyPath = new PropertyPath($propertyPath);
} elseif (!$propertyPath instanceof PropertyPathInterface) {
throw new UnexpectedTypeException($propertyPath, 'string or Symfony\Component\PropertyAccess\PropertyPathInterface');
} }
$propertyValues = & $this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength()); $propertyValues = & $this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength());
@ -56,10 +54,8 @@ class PropertyAccessor implements PropertyAccessorInterface
*/ */
public function setValue(&$objectOrArray, $propertyPath, $value) public function setValue(&$objectOrArray, $propertyPath, $value)
{ {
if (is_string($propertyPath)) { if (!$propertyPath instanceof PropertyPathInterface) {
$propertyPath = new PropertyPath($propertyPath); $propertyPath = new PropertyPath($propertyPath);
} elseif (!$propertyPath instanceof PropertyPathInterface) {
throw new UnexpectedTypeException($propertyPath, 'string or Symfony\Component\PropertyAccess\PropertyPathInterface');
} }
$propertyValues = & $this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength() - 1); $propertyValues = & $this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength() - 1);