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

Tobion · Tobion · commit 9cacecbf790b · 2015-02-19T13:40:39.000+01:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -40,10 +40,8 @@ public function __construct($magicCall = false)
      */
     public function getValue($objectOrArray, $propertyPath)
     {
-        if (is_string($propertyPath)) {
+        if (!$propertyPath instanceof PropertyPathInterface) {
             $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());
@@ -56,10 +54,8 @@ public function getValue($objectOrArray, $propertyPath)
      */
     public function setValue(&$objectOrArray, $propertyPath, $value)
     {
-        if (is_string($propertyPath)) {
+        if (!$propertyPath instanceof PropertyPathInterface) {
             $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);

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,8 @@ public function __construct($magicCall = false)`
`40`	`40`	`*/`
`41`	`41`	`public function getValue($objectOrArray, $propertyPath)`
`42`	`42`	`{`
`43`		`- if (is_string($propertyPath)) {`
	`43`	`+ if (!$propertyPath instanceof PropertyPathInterface) {`
`44`	`44`	`$propertyPath = new PropertyPath($propertyPath);`
`45`		`- } elseif (!$propertyPath instanceof PropertyPathInterface) {`
`46`		`- throw new UnexpectedTypeException($propertyPath, 'string or Symfony\Component\PropertyAccess\PropertyPathInterface');`
`47`	`45`	`}`
`48`	`46`
`49`	`47`	`$propertyValues = & $this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength());`
`@@ -56,10 +54,8 @@ public function getValue($objectOrArray, $propertyPath)`
`56`	`54`	`*/`
`57`	`55`	`public function setValue(&$objectOrArray, $propertyPath, $value)`
`58`	`56`	`{`
`59`		`- if (is_string($propertyPath)) {`
	`57`	`+ if (!$propertyPath instanceof PropertyPathInterface) {`
`60`	`58`	`$propertyPath = new PropertyPath($propertyPath);`
`61`		`- } elseif (!$propertyPath instanceof PropertyPathInterface) {`
`62`		`- throw new UnexpectedTypeException($propertyPath, 'string or Symfony\Component\PropertyAccess\PropertyPathInterface');`
`63`	`59`	`}`
`64`	`60`
`65`	`61`	`$propertyValues = & $this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength() - 1);`