diff options
author | Christophe Coevoet <stof@notk.org> | 2012-05-24 00:38:08 +0200 |
---|---|---|
committer | Christophe Coevoet <stof@notk.org> | 2012-05-24 00:38:08 +0200 |
commit | 4a122d4b291158b1b42b7a6ed4ff6a6ea495e8b2 (patch) | |
tree | da4ee006984f6c46199617619379a605201fd920 | |
parent | 52589410a8b895010ac9dec2c575c515d13211c5 (diff) |
Fixed the fixtures
-rw-r--r-- | src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php | 5 | ||||
-rw-r--r-- | src/Tolkiendil/AssoBundle/Entity/Member.php | 14 | ||||
-rw-r--r-- | src/Tolkiendil/MainBundle/DataFixtures/ORM/Fixtures.php | 3 |
3 files changed, 18 insertions, 4 deletions
diff --git a/src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php b/src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php index 3f5029b..9297284 100644 --- a/src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php +++ b/src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php @@ -3,6 +3,7 @@ namespace Tolkiendil\GameBundle\DataFixtures\ORM; use Doctrine\Common\DataFixtures\FixtureInterface; +use Doctrine\Common\Persistence\ObjectManager; use Tolkiendil\AssoBundle\Entity\Member; use Tolkiendil\AssoBundle\Entity\Subscription; @@ -11,7 +12,7 @@ use Tolkiendil\AssoBundle\Entity\Subscription; */ class MemberFixtures implements FixtureInterface { - public function load($manager) + public function load(ObjectManager $manager) { for ($i = 0; $i < 3; $i++) { $member = new Member(); @@ -25,7 +26,7 @@ class MemberFixtures implements FixtureInterface $member->setCountry('Middle Earth'); $member->setPhoneNumber('0123456'.$i); $member->setMobileNumber('09876543'.$i); - $member->setMobileNumber($i.'@sauron.mordor'); + $member->setEmail($i.'@sauron.mordor'); $member->setBirthDate(new \DateTime()); $member->setBirthPlace('Valmar'); $member->setMembershipStart(new \DateTime()); diff --git a/src/Tolkiendil/AssoBundle/Entity/Member.php b/src/Tolkiendil/AssoBundle/Entity/Member.php index e73c3a1..29fc8f4 100644 --- a/src/Tolkiendil/AssoBundle/Entity/Member.php +++ b/src/Tolkiendil/AssoBundle/Entity/Member.php @@ -505,7 +505,7 @@ class Member * * @param \Tolkiendil\AssoBundle\Entity\Subscription $subscription */ - public function addSubscriptions(Subscription $subscription) + public function addSubscription(Subscription $subscription) { /*if (!$this->subscriptions->contains($subscription)) { $this->subscriptions->add($subscription); @@ -518,6 +518,18 @@ class Member } /** + * Add subscription + * + * TODO remove this method once SonataAdminBundle has been fixed to avoid requiring it with this crappy name. + * + * @param \Tolkiendil\AssoBundle\Entity\Subscription $subscription + */ + public function addSubscriptions(Subscription $subscription) + { + $this->addSubscription($subscription); + } + + /** * Get subscriptions * * @return \Doctrine\Common\Collections\Collection diff --git a/src/Tolkiendil/MainBundle/DataFixtures/ORM/Fixtures.php b/src/Tolkiendil/MainBundle/DataFixtures/ORM/Fixtures.php index f65ca85..4451d77 100644 --- a/src/Tolkiendil/MainBundle/DataFixtures/ORM/Fixtures.php +++ b/src/Tolkiendil/MainBundle/DataFixtures/ORM/Fixtures.php @@ -3,6 +3,7 @@ namespace Tolkiendil\MainBundle\DataFixtures\ORM; use Doctrine\Common\DataFixtures\FixtureInterface; +use Doctrine\Common\Persistence\ObjectManager; use Tolkiendil\SourceBundle\Entity\Person; use Tolkiendil\SourceBundle\Entity\Book; use Tolkiendil\SourceBundle\Entity\Edition; @@ -14,7 +15,7 @@ use Tolkiendil\PartnerBundle\Entity\Book as ProductBook; */ class Fixtures implements FixtureInterface { - public function load($manager) + public function load(ObjectManager $manager) { $tolkien = new Person(); $tolkien->setFirstName('John Ronald Reuel'); |