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

Alias Config entity to ConfigEntity to not conflict with Craue Config

Browse Source
This commit is contained in:
Yassine Guedidi
2022-08-28 23:54:12 +02:00
parent 70d7c2af5f
commit 156158673f
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
View File

@ -5,7 +5,7 @@ namespace Tests\Wallabag\CoreBundle\Controller;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
use Wallabag\AnnotationBundle\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\Config as ConfigEntity;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
use Wallabag\CoreBundle\Entity\Tag;
@ -832,7 +832,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
$em->persist($user);
$config = new Config($user);
$config = new ConfigEntity($user);
$config->setTheme('material');
$config->setItemsPerPage(30);

6
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View File

@ -4,7 +4,7 @@ namespace Tests\Wallabag\CoreBundle\Controller;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
use Wallabag\AnnotationBundle\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\Config as ConfigEntity;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\SiteCredential;
use Wallabag\CoreBundle\Entity\Tag;
@ -1268,7 +1268,7 @@ class EntryControllerTest extends WallabagCoreTestCase
// Redirect to homepage
$config = $this->getLoggedInUser()->getConfig();
$config->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
$config->setActionMarkAsRead(ConfigEntity::REDIRECT_TO_HOMEPAGE);
$this->getEntityManager()->persist($config);
$entry = new Entry($this->getLoggedInUser());
@ -1291,7 +1291,7 @@ class EntryControllerTest extends WallabagCoreTestCase
// Redirect to current page
$config = $this->getLoggedInUser()->getConfig();
$config->setActionMarkAsRead(Config::REDIRECT_TO_CURRENT_PAGE);
$config->setActionMarkAsRead(ConfigEntity::REDIRECT_TO_CURRENT_PAGE);
$this->getEntityManager()->persist($config);
$entry = new Entry($this->getLoggedInUser());