pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

move some files to UserBundle

Browse Source
This commit is contained in:
Nicolas Lœuillet
2015-10-03 06:29:55 +02:00
committed by Jeremy Benoist
parent 1210dae105
commit 0a878469d4
15 changed files with 267 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
View File

@ -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;
}
}

2
src/Wallabag/CoreBundle/Entity/Config.php
View File

@ -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;
}

2
src/Wallabag/CoreBundle/Entity/Entry.php
View File

@ -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();

2
src/Wallabag/CoreBundle/Entity/Tag.php
View File

@ -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();

2
src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
View File

@ -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
{

2
src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
View File

@ -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',