minor #14202 [DoctrineBridge] Removed useless code (webmozart)

webmozart · webmozart · commit 8945bcce772d · 2015-04-03T18:23:44.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [DoctrineBridge] Removed useless code | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This PR removes a useless (duplicate) check introduced in #14050. Commits ------- d851a05 [DoctrineBridge] Removed useless code
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
@@ -58,7 +58,7 @@ public function __construct(ObjectManager $om, ClassMetadata $classMetadata)
         $this->om = $om;
         $this->classMetadata = $classMetadata;
         $this->singleId = 1 === count($ids);
-        $this->intId = $this->singleId && 1 === count($ids) && in_array($idType, array('integer', 'smallint', 'bigint'));
+        $this->intId = $this->singleId && in_array($idType, array('integer', 'smallint', 'bigint'));
         $this->idField = current($ids);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function __construct(ObjectManager $om, ClassMetadata $classMetadata)`
`58`	`58`	`$this->om = $om;`
`59`	`59`	`$this->classMetadata = $classMetadata;`
`60`	`60`	`$this->singleId = 1 === count($ids);`
`61`		`- $this->intId = $this->singleId && 1 === count($ids) && in_array($idType, array('integer', 'smallint', 'bigint'));`
	`61`	`+ $this->intId = $this->singleId && in_array($idType, array('integer', 'smallint', 'bigint'));`
`62`	`62`	`$this->idField = current($ids);`
`63`	`63`	`}`
`64`	`64`