From fcb1fba5c2fdb12c9f4041bd334aaced6f302d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 29 Sep 2015 14:31:52 +0200
Subject: * public registration * remove WSSE implementation * add oAuth2
 implementation

---
 src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php')

diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
index 4ef53329..811451da 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
@@ -18,8 +18,9 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface
         $userAdmin->setName('Big boss');
         $userAdmin->setEmail('bigboss@wallabag.org');
         $userAdmin->setUsername('admin');
-        $userAdmin->setPassword('mypassword');
+        $userAdmin->setPlainPassword('mypassword');
         $userAdmin->setEnabled(true);
+        $userAdmin->addRole('ROLE_SUPER_ADMIN');
 
         $manager->persist($userAdmin);
 
@@ -29,7 +30,7 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface
         $bobUser->setName('Bobby');
         $bobUser->setEmail('bobby@wallabag.org');
         $bobUser->setUsername('bob');
-        $bobUser->setPassword('mypassword');
+        $bobUser->setPlainPassword('mypassword');
         $bobUser->setEnabled(true);
 
         $manager->persist($bobUser);
-- 
cgit v1.2.3


From 1210dae10589515d6f3824c75639342c5e1d52dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 2 Oct 2015 14:51:41 +0200
Subject: remove old implementation for login/register/recover

---
 src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php')

diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
index 811451da..d48855da 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures\ORM;
+namespace Wallabag\UserBundle\DataFixtures\ORM;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\UserBundle\Entity\User;
 
 class LoadUserData extends AbstractFixture implements OrderedFixtureInterface
 {
-- 
cgit v1.2.3


From 0a878469d4038c36c84d1dd707265d880fa342e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Sat, 3 Oct 2015 06:29:55 +0200
Subject: move some files to UserBundle

---
 .../CoreBundle/DataFixtures/ORM/LoadUserData.php   | 50 ----------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php

(limited to 'src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php')

diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
deleted file mode 100644
index d48855da..00000000
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Wallabag\UserBundle\DataFixtures\ORM;
-
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
-use Wallabag\UserBundle\Entity\User;
-
-class LoadUserData extends AbstractFixture implements OrderedFixtureInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load(ObjectManager $manager)
-    {
-        $userAdmin = new User();
-        $userAdmin->setName('Big boss');
-        $userAdmin->setEmail('bigboss@wallabag.org');
-        $userAdmin->setUsername('admin');
-        $userAdmin->setPlainPassword('mypassword');
-        $userAdmin->setEnabled(true);
-        $userAdmin->addRole('ROLE_SUPER_ADMIN');
-
-        $manager->persist($userAdmin);
-
-        $this->addReference('admin-user', $userAdmin);
-
-        $bobUser = new User();
-        $bobUser->setName('Bobby');
-        $bobUser->setEmail('bobby@wallabag.org');
-        $bobUser->setUsername('bob');
-        $bobUser->setPlainPassword('mypassword');
-        $bobUser->setEnabled(true);
-
-        $manager->persist($bobUser);
-
-        $this->addReference('bob-user', $bobUser);
-
-        $manager->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getOrder()
-    {
-        return 10;
-    }
-}
-- 
cgit v1.2.3