Adding a new resource for UserRepository - I copy a bunch of logic in
Changes from 2 commit(s):

Adding the User.roles property with getter/setter

------------------------------

TutsHero: Merge branch '_tuts/episode2/save-user-create-the-encodepassword-function' into '_tuts/episode2/roles-add-roles-property' as we walk forward through the steps
Changes from 2 commit(s):

Always making sure the user has ROLE_USER

------------------------------

TutsHero: Merge branch '_tuts/episode2/roles-add-roles-property' into '_tuts/episode2/roles-always-giving-role-user' as we walk forward through the steps
Changes from 2 commit(s):

Adding the admin user

------------------------------

TutsHero: Merge branch '_tuts/episode2/roles-always-giving-role-user' into '_tuts/episode2/roles-add-admin-user' as we walk forward through the steps
Changes from 2 commit(s):

Adding the isActive field

------------------------------

TutsHero: Merge branch '_tuts/episode2/roles-add-admin-user' into '_tuts/episode2/advanceduserinterface-adding-isactive-field' as we walk forward through the steps
Changes from 2 commit(s):

Implementing AdvancedUserInterface with dummy implementations of each message

------------------------------

TutsHero: Merge branch '_tuts/episode2/advanceduserinterface-adding-isactive-field' into '_tuts/episode2/advanceduserinterface-adding-interface-and-methods' as we walk forward through the steps
Changes from 2 commit(s):

Adding real implementations for AdvancedUserInterface methods

Also temporarily disabling the admin user

------------------------------

TutsHero: Merge branch '_tuts/episode2/advanceduserinterface-adding-interface-and-methods' into '_tuts/episode2/advanceduserinterface-real-method-implementations' as we walk forward through the steps
Changes from 2 commit(s):

Removing the setIsActive(false) call

------------------------------

TutsHero: Merge branch '_tuts/episode2/advanceduserinterface-real-method-implementations' into '_tuts/episode2/advanceduserinterface-re-enable-admin' as we walk forward through the steps
Changes from 2 commit(s):

Adding the Serializable interface with stub methods

------------------------------

TutsHero: Merge branch '_tuts/episode2/advanceduserinterface-re-enable-admin' into '_tuts/episode2/serializable-adding-the-interface' as we walk forward through the steps
Changes from 2 commit(s):

Filling in the real serialize/unserialize logic

------------------------------

TutsHero: Merge branch '_tuts/episode2/serializable-adding-the-interface' into '_tuts/episode2/serializable-filling-in-the-real-methods' as we walk forward through the steps
Changes from 3 commit(s):

Adding the User.email property with getter/setter

------------------------------

Giving fixtures users an email

------------------------------

TutsHero: Merge branch '_tuts/episode2/serializable-filling-in-the-real-methods' into '_tuts/episode2/email-adding-user-email-property' as we walk forward through the steps
Changes from 2 commit(s):

Adding the findAll method with a die statement

------------------------------

TutsHero: Merge branch '_tuts/episode2/email-adding-user-email-property' into '_tuts/episode2/repository-findall-dummy-method' as we walk forward through the steps
Changes from 2 commit(s):

Removing the repositoryClass option to see what happens

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-findall-dummy-method' into '_tuts/episode2/repository-remove-repositoryclass-option' as we walk forward through the steps
Changes from 2 commit(s):

Removing my dummy code

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-remove-repositoryclass-option' into '_tuts/episode2/repository-remove-debug-code' as we walk forward through the steps
Changes from 3 commit(s):

Adding the empty UserRepository::findOneByUsernameOrEmail method

------------------------------

Adding the $username argument

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-remove-debug-code' into '_tuts/episode2/repository-empty-userrepo-findonebyusernameoremail-method' as we walk forward through the steps
Changes from 2 commit(s):

Filling in our custom query

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-empty-userrepo-findonebyusernameoremail-method' into '_tuts/episode2/repository-use-query-builder' as we walk forward through the steps
Changes from 3 commit(s):

Filling in our custom query

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-use-query-builder' into '_tuts/episode2/repository-trying-it-in-eventcontroller' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-use-query-builder' into '_tuts/episode2/repository-trying-it-in-eventcontroller' as we walk forward through the steps
Changes from 2 commit(s):

Using user@user.com to test our email query

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-trying-it-in-eventcontroller' into '_tuts/episode2/repository-using-email-in-eventcontroller' as we walk forward through the steps
Changes from 2 commit(s):

Removing our code that was testing our custom repo method

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-using-email-in-eventcontroller' into '_tuts/episode2/repository-remove-userrepo-test-code' as we walk forward through the steps
Changes from 2 commit(s):

Changing the providers configuration to not include the property

------------------------------

TutsHero: Merge branch '_tuts/episode2/repository-remove-userrepo-test-code' into '_tuts/episode2/userprovider-provider-configuration' as we walk forward through the steps