Merge pull request schmittjoh#97 from xanido/master

schmittjoh · schmittjoh · commit fbf0968b5929 · 2013-05-28T00:01:52.000-07:00
Fix discriminator map search in ClassMetadata
diff --git a/src/JMS/Serializer/Metadata/ClassMetadata.php b/src/JMS/Serializer/Metadata/ClassMetadata.php
@@ -157,7 +157,7 @@ public function merge(MergeableInterface $object)
         }
 
         if ($this->discriminatorMap && ! $this->reflection->isAbstract()) {
-            if (false == $typeValue = array_search($this->name, $this->discriminatorMap, true)) {
+            if (false === $typeValue = array_search($this->name, $this->discriminatorMap, true)) {
                 throw new \LogicException(sprintf(
                     'The sub-class "%s" is not listed in the discriminator of the base class "%s".',
                     $this->name,

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function merge(MergeableInterface $object)`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`if ($this->discriminatorMap && ! $this->reflection->isAbstract()) {`
`160`		`- if (false == $typeValue = array_search($this->name, $this->discriminatorMap, true)) {`
	`160`	`+ if (false === $typeValue = array_search($this->name, $this->discriminatorMap, true)) {`
`161`	`161`	`throw new \LogicException(sprintf(`
`162`	`162`	`'The sub-class "%s" is not listed in the discriminator of the base class "%s".',`
`163`	`163`	`$this->name,`