mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-23 01:21:03 +00:00
Migrate remaining places
This commit is contained in:
parent
481283bbee
commit
791b674cdc
5 changed files with 9 additions and 9 deletions
|
@ -9,7 +9,7 @@ security:
|
||||||
providers:
|
providers:
|
||||||
administrators:
|
administrators:
|
||||||
entity:
|
entity:
|
||||||
class: WallabagUserBundle:User
|
class: 'Wallabag\UserBundle\Entity\User'
|
||||||
property: username
|
property: username
|
||||||
fos_userbundle:
|
fos_userbundle:
|
||||||
id: fos_user.user_provider.username_email
|
id: fos_user.user_provider.username_email
|
||||||
|
|
|
@ -277,8 +277,8 @@ class InstallCommand extends ContainerAwareCommand
|
||||||
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
|
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
|
||||||
|
|
||||||
// cleanup before insert new stuff
|
// cleanup before insert new stuff
|
||||||
$em->createQuery('DELETE FROM WallabagCoreBundle:InternalSetting')->execute();
|
$em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\InternalSetting')->execute();
|
||||||
$em->createQuery('DELETE FROM WallabagCoreBundle:IgnoreOriginInstanceRule')->execute();
|
$em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule')->execute();
|
||||||
|
|
||||||
foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) {
|
foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) {
|
||||||
$newSetting = new InternalSetting();
|
$newSetting = new InternalSetting();
|
||||||
|
|
|
@ -123,19 +123,19 @@ services:
|
||||||
class: Wallabag\CoreBundle\Repository\EntryRepository
|
class: Wallabag\CoreBundle\Repository\EntryRepository
|
||||||
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
||||||
arguments:
|
arguments:
|
||||||
- WallabagCoreBundle:Entry
|
- 'Wallabag\CoreBundle\Entity\Entry'
|
||||||
|
|
||||||
Wallabag\CoreBundle\Repository\TagRepository:
|
Wallabag\CoreBundle\Repository\TagRepository:
|
||||||
class: Wallabag\CoreBundle\Repository\TagRepository
|
class: Wallabag\CoreBundle\Repository\TagRepository
|
||||||
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
||||||
arguments:
|
arguments:
|
||||||
- WallabagCoreBundle:Tag
|
- 'Wallabag\CoreBundle\Entity\Tag'
|
||||||
|
|
||||||
Wallabag\CoreBundle\Repository\SiteCredentialRepository:
|
Wallabag\CoreBundle\Repository\SiteCredentialRepository:
|
||||||
class: Wallabag\CoreBundle\Repository\SiteCredentialRepository
|
class: Wallabag\CoreBundle\Repository\SiteCredentialRepository
|
||||||
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
||||||
arguments:
|
arguments:
|
||||||
- WallabagCoreBundle:SiteCredential
|
- 'Wallabag\CoreBundle\Entity\SiteCredential'
|
||||||
calls:
|
calls:
|
||||||
- [ setCrypto, [ '@Wallabag\CoreBundle\Helper\CryptoProxy' ] ]
|
- [ setCrypto, [ '@Wallabag\CoreBundle\Helper\CryptoProxy' ] ]
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ services:
|
||||||
class: Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository
|
class: Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository
|
||||||
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
||||||
arguments:
|
arguments:
|
||||||
- WallabagCoreBundle:IgnoreOriginInstanceRule
|
- 'Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule'
|
||||||
|
|
||||||
Wallabag\CoreBundle\Helper\EntriesExport:
|
Wallabag\CoreBundle\Helper\EntriesExport:
|
||||||
class: Wallabag\CoreBundle\Helper\EntriesExport
|
class: Wallabag\CoreBundle\Helper\EntriesExport
|
||||||
|
|
|
@ -27,7 +27,7 @@ services:
|
||||||
class: Wallabag\UserBundle\Repository\UserRepository
|
class: Wallabag\UserBundle\Repository\UserRepository
|
||||||
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
|
||||||
arguments:
|
arguments:
|
||||||
- WallabagUserBundle:User
|
- 'Wallabag\UserBundle\Entity\User'
|
||||||
|
|
||||||
Wallabag\UserBundle\EventListener\CreateConfigListener:
|
Wallabag\UserBundle\EventListener\CreateConfigListener:
|
||||||
class: Wallabag\UserBundle\EventListener\CreateConfigListener
|
class: Wallabag\UserBundle\EventListener\CreateConfigListener
|
||||||
|
|
|
@ -581,7 +581,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
|
||||||
// Remove the created entry to avoid side effects on other tests
|
// Remove the created entry to avoid side effects on other tests
|
||||||
if (isset($content['id'])) {
|
if (isset($content['id'])) {
|
||||||
$em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
|
$em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
|
||||||
$entry = $em->getReference('WallabagCoreBundle:Entry', $content['id']);
|
$entry = $em->getReference(Entry::class, $content['id']);
|
||||||
$em->remove($entry);
|
$em->remove($entry);
|
||||||
$em->flush();
|
$em->flush();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue