Commit 912e57c3 authored by Guillaume Wauquier's avatar Guillaume Wauquier
Browse files

Petite simplification du code

parent f817dc2f
......@@ -63,11 +63,10 @@ class DoctrineDAO implements DAO
'driver' => $driver,
'charset'=> 'utf8');
$setup = Setup::createAnnotationMetadataConfiguration($path, $isDevMode,
__DIR__ . '/../../../generated/');
$entityManager = EntityManager::create($dbParams, $setup);
$entityManager2 = EntityManager::create($dbParams, $setup);
$this->em = $entityManager;
$this->roEm = $entityManager2;
__DIR__ . '/../../../generated/');
$this->em = EntityManager::create($dbParams, $setup);
$this->roEm = EntityManager::create($dbParams, $setup);
$this->inTransaction = false;
$this->deletedIds = [];
}
......@@ -185,7 +184,8 @@ class DoctrineDAO implements DAO
public function search($modelName, $conditions = null,
$count = null, $offset = null, $order = null) {
$criteria = $this->getCriteria($conditions, $count, $offset, $order);
$criteria = $this->getCriteria(null, $count, $offset, $order);
return $this->em->getRepository($modelName)->matching($criteria)->getValues();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment