Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[2.2] [Form] Added form type "entity_identifier" (#1946) #1951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

[2.2] [Form] Added form type "entity_identifier" (#1946) #1951

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05a064a
[Form] Added the entity_id type (#1946)
Gregwar Aug 12, 2011
662691a
[Form] Fixing coding standard problems (see PR #1951)
Gregwar Aug 15, 2011
4a62fc3
[Form] Changes the way the identifier is retrieved
Aug 16, 2011
6f11075
[Form] Added support of "property" on the "entity_id" type
Gregwar Aug 16, 2011
0802d83
Added a RuntimeException when no class is provided
Gregwar Aug 21, 2011
295bd6d
[Form] Using FormException instead of RuntimeException for entity_id
Gregwar Aug 21, 2011
38713e2
[Form] Renamed field type name "entity_id" to "entity_identifier"
Gregwar Aug 23, 2011
fc400f5
[Form] OneEntityToIdTransformer, fixing problems with QueryBuilder type
Gregwar Oct 17, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[Form] OneEntityToIdTransformer, fixing problems with QueryBuilder type
  • Loading branch information
@Gregwar
Gregwar committed Oct 17, 2011
commit fc400f54c7e50b80b245cf88e4d707fd92cba2ac
8 changes: 3 additions & 5 deletions 8 src/Symfony/Bridge/Doctrine/Form/DataTransformer/OneEntityToIdTransformer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class OneEntityToIdTransformer implements DataTransformerInterface
public function __construct(EntityManager $em, $class, $property, $queryBuilder)
{
if (null !== $queryBuilder && ! $queryBuilder instanceof \Closure) {
throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder or \Closure');
throw new UnexpectedTypeException($queryBuilder, '\Closure');
}

if (null === $class) {
Expand Down Expand Up @@ -84,10 +84,8 @@ public function reverseTransform($data)
$repository = $em->getRepository($this->class);

if ($qb = $this->queryBuilder) {
// If a closure was passed, call id with the repository and the id
if ($qb instanceof \Closure) {
$qb = $qb($repository, $data);
}
// Call the closure with the repository and the id
$qb = $qb($repository, $data);

try {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use getOneOrNullResult?

$result = $qb->getQuery()->getSingleResult();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this does not make sense in the case where a QueryBuilder is passed directly as it does not receive the data at all

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah sorry, looking at the constructor, the queryBuilder property is always a closure (the naming is bad then) which means that the previous check is useless and that a check is missing to be sure you receive a query builder

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.