move some files to UserBundle

6 files changed, 5 insertions, 55 deletions

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;
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index ddd4f7d9..2390bfe1 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -79,7 +79,7 @@ class Config
     /*
      * @param User     $user
      */
-    public function __construct(Wallabag\UserBundle\Entity\User $user)
+    public function __construct(\Wallabag\UserBundle\Entity\User $user)
     {
         $this->user = $user;
     }
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index f6206a09..4fd74001 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -143,7 +143,7 @@ class Entry
     /*
      * @param User     $user
      */
-    public function __construct(Wallabag\UserBundle\Entity\User $user)
+    public function __construct(\Wallabag\UserBundle\Entity\User $user)
     {
         $this->user = $user;
         $this->tags = new ArrayCollection();
diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php
index 6067360f..5b571823 100644
--- a/src/Wallabag/CoreBundle/Entity/Tag.php
+++ b/src/Wallabag/CoreBundle/Entity/Tag.php
@@ -46,7 +46,7 @@ class Tag
      */
     private $user;
 
-    public function __construct(User $user)
+    public function __construct(\Wallabag\UserBundle\Entity\User $user)
     {
         $this->user = $user;
         $this->entries = new ArrayCollection();
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
index 137c097c..df94fad2 100644
--- a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
@@ -9,8 +9,8 @@ use Symfony\Component\HttpFoundation\Response;
 use FOS\UserBundle\FOSUserEvents;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener;
-use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Entity\Config;
+use Wallabag\UserBundle\Entity\User;
 
 class RegistrationConfirmedListenerTest extends KernelTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
index 756525a9..e5096528 100644
--- a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
+++ b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
@@ -21,7 +21,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
     public function logInAs($username)
     {
         $crawler = $this->client->request('GET', '/login');
-        $form = $crawler->filter('input[type=submit]')->form();
+        $form = $crawler->filter('button[type=submit]')->form();
         $data = array(
             '_username' => $username,
             '_password' => 'mypassword',