Refactor && Typo && Use plain objects as function parameters instead of ids

This commit is contained in:
Nicolas Le Goff
2014-02-06 12:42:47 +01:00
parent c98fe4c23d
commit 2ec4ffdbcc
39 changed files with 909 additions and 692 deletions

View File

@@ -96,10 +96,9 @@ class RegenerateSqliteDb extends Command
$this->insertOneAggregateToken($this->container['EM'], $DI);
$this->insertLazaretFiles($this->container['EM'], $DI);
$this->insertAuthFailures($this->container['EM'], $DI);
$this->insertOneRegistration($this->container['EM'],$DI['user_alt1'], $DI['coll']);
$this->insertOneRegistration($this->container['EM'],$DI['user_alt2'], $DI['coll'], '-3 months');
$this->insertOneRegistration($this->container['EM'],$DI['user_alt2'], $DI['coll']);
$this->insertOneRegistration($DI, $this->container['EM'], $DI['user_alt1'], $DI['coll'], 'now', 'registration_1');
$this->insertOneRegistration($DI, $this->container['EM'], $DI['user_alt2'], $DI['coll'], '-3 months', 'registration_2');
$this->insertOneRegistration($DI, $this->container['EM'], $DI['user_notAdmin'], $DI['coll'], 'now', 'registration_3');
$fixtures['user']['test_phpunit'] = $DI['user']->getId();
$fixtures['user']['test_phpunit_not_admin'] = $DI['user_notAdmin']->getId();
@@ -127,6 +126,10 @@ class RegenerateSqliteDb extends Command
$fixtures['record']['record_6'] = $DI['record_6']->get_record_id();
$fixtures['record']['record_7'] = $DI['record_7']->get_record_id();
$fixtures['registrations']['registration_1'] = $DI['registration_1']->getId();
$fixtures['registrations']['registration_2'] = $DI['registration_2']->getId();
$fixtures['registrations']['registration_3'] = $DI['registration_3']->getId();
$fixtures['lazaret']['lazaret_1'] = $DI['lazaret_1']->getId();
$fixtures['user']['user_1'] = $DI['user_1']->getId();
@@ -644,16 +647,18 @@ class RegenerateSqliteDb extends Command
$em->persist($entry);
}
private function insertOneRegistration(EntityManager $em, \User_Adapter $user, \collection $collection, $when = 'now')
private function insertOneRegistration(\Pimple $DI, EntityManager $em, User $user, \collection $collection, $when, $name)
{
$em->getEventManager()->removeEventSubscriber(new TimestampableListener());
$registration = new Registration();
$registration->setBaseId($collection->get_base_id());
$registration->setUser($user->get_id());
$registration->setCollection($collection);
$registration->setUser($user);
$registration->setUpdated(new \DateTime($when));
$registration->setCreated(new \DateTime($when));
$em->persist($registration);
$em->flush();
$em->getEventManager()->addEventSubscriber(new TimestampableListener());
$DI[$name] = $registration;
}
}