8000 [DoctrineBridge] Refactor EntityChoiceList by stof · Pull Request #2921 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DoctrineBridge] Refactor EntityChoiceList #2921

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

Merged
merged 7 commits into from
Dec 19, 2011
Merged

[DoctrineBridge] Refactor EntityChoiceList #2921

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
517eebc
[DoctrineBridge] Refactor entity choice list to be ORM independant us…
beberlei Nov 26, 2011
b919d92
[DoctrineBridge] Optimize fetching of entities to use WHERE IN and fi…
beberlei Nov 26, 2011
3b5c617
[DoctrineBridge] Remove large parts of the EntityChoiceList code that…
beberlei Nov 26, 2011
988c2a5
Adjust check
beberlei Dec 12, 2011
7646a5b
[Doctrine] Dont allow null in ORMQueryBuilderLoader
beberlei Dec 12, 2011
3c81b62
[Doctrine] Cleanup and move loader into its own method
beberlei Dec 12, 2011
200ed54
[DoctrineBridge] Extracted the common type and made the choice list g…
stof Dec 19, 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
Next Next commit
[Doctrine] Dont allow null in ORMQueryBuilderLoader
  • Loading branch information
@beberlei @stof
beberlei authored and stof committed Dec 19, 2011
commit 7646a5bc6da37d4f0ad455d9e550c7e2f284e5fe
14 changes: 7 additions & 7 deletions src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
* @var Doctrine\ORM\QueryBuilder
*/
private $queryBuilder;

/**
* Construct an ORM Query Builder Loader
*
*
* @param QueryBuilder $queryBuilder
* @param EntityManager $manager
* @param string $class
* @param string $class
*/
public function __construct($queryBuilder, $manager = null, $class = null)
{
// If a query builder was passed, it must be a closure or QueryBuilder
// instance
if (!(null === $queryBuilder || $queryBuilder instanceof QueryBuilder || $queryBuilder instanceof \Closure)) {
if (!($queryBuilder instanceof QueryBuilder || $queryBuilder instanceof \Closure)) {
throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder or \Closure');
}

Expand All @@ -53,15 +53,15 @@ public function __construct($queryBuilder, $manager = null, $class = null)
throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');
}
}

$this->queryBuilder = $queryBuilder;
}

/**
* {@inheritDoc}
*/
public function getEntities()
{
return $this->queryBuilder->getQuery()->execute();
}
}
}
0