Merge branch '2.3' into 2.7

stof · stof · commit 111df4a5e954 · 2015-12-05T12:06:38.000+01:00
* 2.3:
  [Process] Unset callback after stop to free memory
  Improve error message for undefined DIC aliases
  Fix typo
  CS: remove unneeded parentheses around control statements
diff --git a/Form/ChoiceList/ORMQueryBuilderLoader.php b/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -89,7 +89,7 @@ public function getEntities()
      */
     public function getEntitiesByIds($identifier, array $values)
     {
-        $qb = clone ($this->queryBuilder);
+        $qb = clone $this->queryBuilder;
         $alias = current($qb->getRootAliases());
         $parameter = 'ORMQueryBuilderLoader_getEntitiesByIds_'.$identifier;
         $where = $qb->expr()->in($alias.'.'.$identifier, ':'.$parameter);

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function getEntities()`
`89`	`89`	`*/`
`90`	`90`	`public function getEntitiesByIds($identifier, array $values)`
`91`	`91`	`{`
`92`		`- $qb = clone ($this->queryBuilder);`
	`92`	`+ $qb = clone $this->queryBuilder;`
`93`	`93`	`$alias = current($qb->getRootAliases());`
`94`	`94`	`$parameter = 'ORMQueryBuilderLoader_getEntitiesByIds_'.$identifier;`
`95`	`95`	`$where = $qb->expr()->in($alias.'.'.$identifier, ':'.$parameter);`