Remove the CoreBundle namespace

tests/Command/CleanDuplicatesCommandTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
 
 class CleanDuplicatesCommandTest extends WallabagCoreTestCase
 {
@@ -93,7 +93,7 @@ class CleanDuplicatesCommandTest extends WallabagCoreTestCase
         $nbEntries = $em->getRepository(Entry::class)->findAllByUrlAndUserId($url, $this->getLoggedInUserId());
         $this->assertCount(1, $nbEntries);
 
-        $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url');
+        $query = $em->createQuery('DELETE FROM Wallabag\Entity\Entry e WHERE e.url = :url');
         $query->setParameter('url', $url);
         $query->execute();
     }

tests/Command/ExportCommandTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class ExportCommandTest extends WallabagCoreTestCase
 {

tests/Command/GenerateUrlHashesCommandTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
 
 class GenerateUrlHashesCommandTest extends WallabagCoreTestCase
 {
@@ -83,7 +83,7 @@ class GenerateUrlHashesCommandTest extends WallabagCoreTestCase
 
         $this->assertSame($entry->getHashedUrl(), hash('sha1', $url));
 
-        $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url');
+        $query = $em->createQuery('DELETE FROM Wallabag\Entity\Entry e WHERE e.url = :url');
         $query->setParameter('url', $url);
         $query->execute();
     }

tests/Command/Import/ImportCommandTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command\Import;
+namespace Tests\Wallabag\Command\Import;
 
 use Doctrine\ORM\NoResultException;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class ImportCommandTest extends WallabagCoreTestCase
 {

tests/Command/Import/RedisWorkerCommandTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command\Import;
+namespace Tests\Wallabag\Command\Import;
 
 use M6Web\Component\RedisMock\RedisMockFactory;
 use Predis\Client;
@@ -8,7 +8,7 @@ use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class RedisWorkerCommandTest extends WallabagCoreTestCase
 {

tests/Command/InstallCommandTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver;
 use Doctrine\DBAL\Connection;
@@ -13,8 +13,8 @@ use Symfony\Component\Console\Command\LazyCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Command\InstallCommand;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Command\InstallCommand;
 
 class InstallCommandTest extends WallabagCoreTestCase
 {

tests/Command/ListUserCommandTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class ListUserCommandTest extends WallabagCoreTestCase
 {

tests/Command/ReloadEntryCommandTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class ReloadEntryCommandTest extends WallabagCoreTestCase
 {

tests/Command/ShowUserCommandTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\User;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\User;
 
 class ShowUserCommandTest extends WallabagCoreTestCase
 {

tests/Command/TagAllCommandTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class TagAllCommandTest extends WallabagCoreTestCase
 {

tests/Command/UpdatePicturesPathCommandTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class UpdatePicturesPathCommandTest extends WallabagCoreTestCase
 {
@@ -51,7 +51,7 @@ class UpdatePicturesPathCommandTest extends WallabagCoreTestCase
         $entry = $em->getRepository(Entry::class)->findOneByUrl($url);
         $this->assertSame($entry->getPreviewPicture(), $client->getContainer()->getParameter('domain_name') . '/mypicture.jpg');
 
-        $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url');
+        $query = $em->createQuery('DELETE FROM Wallabag\Entity\Entry e WHERE e.url = :url');
         $query->setParameter('url', $url);
         $query->execute();
     }

tests/Consumer/AMQPEntryConsumerTest.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Consumer;
+namespace Tests\Wallabag\Consumer;
 
 use Doctrine\ORM\EntityManager;
 use PhpAmqpLib\Message\AMQPMessage;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Consumer\AMQPEntryConsumer;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Import\AbstractImport;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Consumer\AMQPEntryConsumer;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Import\AbstractImport;
+use Wallabag\Repository\UserRepository;
 
 class AMQPEntryConsumerTest extends TestCase
 {

tests/Consumer/RedisEntryConsumerTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Consumer;
+namespace Tests\Wallabag\Consumer;
 
 use Doctrine\ORM\EntityManager;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Consumer\RedisEntryConsumer;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Import\AbstractImport;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Consumer\RedisEntryConsumer;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Import\AbstractImport;
+use Wallabag\Repository\UserRepository;
 
 class RedisEntryConsumerTest extends TestCase
 {

tests/Controller/AnnotationControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Annotation;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Annotation;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
 
 class AnnotationControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Api/ConfigRestControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 class ConfigRestControllerTest extends WallabagApiTestCase
 {

tests/Controller/Api/DeveloperControllerTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Api\Client;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Api\Client;
 
 class DeveloperControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Api/EntryRestControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\DependencyInjection\Container;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
 
 class EntryRestControllerTest extends WallabagApiTestCase
 {

tests/Controller/Api/SearchRestControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 class SearchRestControllerTest extends WallabagApiTestCase
 {

tests/Controller/Api/TagRestControllerTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
 
 class TagRestControllerTest extends WallabagApiTestCase
 {

tests/Controller/Api/TaggingRuleRestControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 class TaggingRuleRestControllerTest extends WallabagApiTestCase
 {

tests/Controller/Api/UserRestControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 

tests/Controller/Api/WallabagApiTestCase.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Model\UserInterface;
 use FOS\UserBundle\Model\UserManager;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 abstract class WallabagApiTestCase extends WebTestCase
 {

tests/Controller/Api/WallabagRestControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Api;
+namespace Tests\Wallabag\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 

tests/Controller/ConfigControllerTest.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Annotation;
-use Wallabag\CoreBundle\Entity\Config as ConfigEntity;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\TaggingRule;
-use Wallabag\CoreBundle\Entity\User;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Annotation;
+use Wallabag\Entity\Config as ConfigEntity;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\IgnoreOriginUserRule;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\TaggingRule;
+use Wallabag\Entity\User;
 
 class ConfigControllerTest extends WallabagCoreTestCase
 {

tests/Controller/EntryControllerTest.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Annotation;
-use Wallabag\CoreBundle\Entity\Config as ConfigEntity;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\SiteCredential;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\CryptoProxy;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Annotation;
+use Wallabag\Entity\Config as ConfigEntity;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\SiteCredential;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\CryptoProxy;
 
 class EntryControllerTest extends WallabagCoreTestCase
 {

tests/Controller/ExportControllerTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class ExportControllerTest extends WallabagCoreTestCase
 {

tests/Controller/FeedControllerTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
 
 class FeedControllerTest extends WallabagCoreTestCase
 {

tests/Controller/IgnoreOriginInstanceRuleControllerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class IgnoreOriginInstanceRuleControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/ChromeControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class ChromeControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/DeliciousControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class DeliciousControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/ElcuratorControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class ElcuratorControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/FirefoxControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class FirefoxControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/ImportControllerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class ImportControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/InstapaperControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class InstapaperControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/PinboardControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class PinboardControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/PocketControllerTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Import\PocketImport;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Import\PocketImport;
 
 class PocketControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/PocketHtmlControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class PocketHtmlControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/ReadabilityControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class ReadabilityControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/ShaarliControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class ShaarliControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/WallabagV1ControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class WallabagV1ControllerTest extends WallabagCoreTestCase
 {

tests/Controller/Import/WallabagV2ControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller\Import;
+namespace Tests\Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class WallabagV2ControllerTest extends WallabagCoreTestCase
 {

tests/Controller/SecurityControllerTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\User;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\User;
 
 class SecurityControllerTest extends WallabagCoreTestCase
 {

tests/Controller/SettingsControllerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 /**
  * The controller `SettingsController` does not exist.

tests/Controller/SiteCredentialControllerTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\SiteCredential;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\SiteCredential;
 
 class SiteCredentialControllerTest extends WallabagCoreTestCase
 {

tests/Controller/StaticControllerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class StaticControllerTest extends WallabagCoreTestCase
 {

tests/Controller/TagControllerTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\User;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\User;
 
 /**
  * @group Tag

tests/Controller/UserControllerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\Controller;
 
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Tests\Wallabag\WallabagCoreTestCase;
 
 class UserControllerTest extends WallabagCoreTestCase
 {

tests/Entity/EntryTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Entity;
+namespace Tests\Wallabag\Entity;
 
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\Entry;
 
 class EntryTest extends WallabagCoreTestCase
 {

tests/Event/Listener/AuthenticationFailureListenerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Event\Listener;
+namespace Tests\Wallabag\Event\Listener;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
@@ -12,7 +12,7 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\AuthenticationEvents;
 use Symfony\Component\Security\Core\Event\AuthenticationFailureEvent;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Wallabag\CoreBundle\Event\Listener\AuthenticationFailureListener;
+use Wallabag\Event\Listener\AuthenticationFailureListener;
 
 class AuthenticationFailureListenerTest extends TestCase
 {

tests/Event/Listener/CreateConfigListenerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Event\Listener;
+namespace Tests\Wallabag\Event\Listener;
 
 use Doctrine\ORM\EntityManager;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
@@ -10,9 +10,9 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Event\Listener\CreateConfigListener;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\User;
+use Wallabag\Event\Listener\CreateConfigListener;
 
 class CreateConfigListenerTest extends TestCase
 {

tests/Event/Listener/LocaleListenerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Event\Listener;
+namespace Tests\Wallabag\Event\Listener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -10,7 +10,7 @@ use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Wallabag\CoreBundle\Event\Listener\LocaleListener;
+use Wallabag\Event\Listener\LocaleListener;
 
 class LocaleListenerTest extends TestCase
 {

tests/Event/Listener/UserLocaleListenerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Event\Listener;
+namespace Tests\Wallabag\Event\Listener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
@@ -8,9 +8,9 @@ use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Event\Listener\UserLocaleListener;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\User;
+use Wallabag\Event\Listener\UserLocaleListener;
 
 class UserLocaleListenerTest extends TestCase
 {

tests/Event/Subscriber/TablePrefixSubscriberTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Event\Subscriber;
+namespace Tests\Wallabag\Event\Subscriber;
 
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
@@ -10,8 +10,8 @@ use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber;
+use Wallabag\Entity\User;
+use Wallabag\Event\Subscriber\TablePrefixSubscriber;
 
 class TablePrefixSubscriberTest extends TestCase
 {
@@ -93,7 +93,7 @@ class TablePrefixSubscriberTest extends TestCase
 
         $subscriber = new TablePrefixSubscriber('yo_');
 
-        $metaClass = new ClassMetadata('Wallabag\CoreBundle\Entity\Entry');
+        $metaClass = new ClassMetadata('Wallabag\Entity\Entry');
         $metaClass->setPrimaryTable(['name' => 'entry']);
         $metaClass->mapManyToMany([
             'fieldName' => 'tags',

tests/Form/DataTransformer/StringToListTransformerTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Form\DataTransformer;
+namespace Tests\Wallabag\Form\DataTransformer;
 
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer;
+use Wallabag\Form\DataTransformer\StringToListTransformer;
 
 class StringToListTransformerTest extends TestCase
 {

tests/Guzzle/AuthenticatorSubscriberTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Guzzle;
+namespace Tests\Wallabag\Guzzle;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Event\BeforeEvent;
@@ -12,10 +12,10 @@ use GuzzleHttp\Subscriber\Mock;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\Guzzle\AuthenticatorSubscriber;
-use Wallabag\CoreBundle\SiteConfig\ArraySiteConfigBuilder;
-use Wallabag\CoreBundle\SiteConfig\Authenticator\Authenticator;
-use Wallabag\CoreBundle\SiteConfig\Authenticator\Factory;
+use Wallabag\Guzzle\AuthenticatorSubscriber;
+use Wallabag\SiteConfig\ArraySiteConfigBuilder;
+use Wallabag\SiteConfig\Authenticator\Authenticator;
+use Wallabag\SiteConfig\Authenticator\Factory;
 
 class AuthenticatorSubscriberTest extends TestCase
 {

tests/Guzzle/FixupMondeDiplomatiqueUriSubscriberTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Guzzle;
+namespace Tests\Wallabag\Guzzle;
 
 use GuzzleHttp\Event\CompleteEvent;
 use GuzzleHttp\Message\Response;
 use GuzzleHttp\Stream\Stream;
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\Guzzle\FixupMondeDiplomatiqueUriSubscriber;
+use Wallabag\Guzzle\FixupMondeDiplomatiqueUriSubscriber;
 
 class FixupMondeDiplomatiqueUriSubscriberTest extends TestCase
 {

tests/Helper/ContentProxyTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Helper;
+namespace Tests\Wallabag\Helper;
 
 use Graby\Graby;
 use Monolog\Handler\TestHandler;
@@ -10,11 +10,11 @@ use Psr\Log\NullLogger;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Validator\RecursiveValidator;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor;
-use Wallabag\CoreBundle\Helper\RuleBasedTagger;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\RuleBasedIgnoreOriginProcessor;
+use Wallabag\Helper\RuleBasedTagger;
 
 class ContentProxyTest extends TestCase
 {

tests/Helper/CryptoProxyTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Helper;
+namespace Tests\Wallabag\Helper;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
-use Wallabag\CoreBundle\Helper\CryptoProxy;
+use Wallabag\Helper\CryptoProxy;
 
 class CryptoProxyTest extends TestCase
 {

tests/Helper/DownloadImagesTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Helper;
+namespace Tests\Wallabag\Helper;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
-use Wallabag\CoreBundle\Helper\DownloadImages;
+use Wallabag\Helper\DownloadImages;
 
 class DownloadImagesTest extends TestCase
 {

tests/Helper/RedirectTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Helper;
+namespace Tests\Wallabag\Helper;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Router;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\Redirect;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\User;
+use Wallabag\Helper\Redirect;
 
 class RedirectTest extends TestCase
 {

tests/Helper/RuleBasedIgnoreOriginProcessorTest.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Helper;
+namespace Tests\Wallabag\Helper;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use RulerZ\RulerZ;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
-use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor;
-use Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\IgnoreOriginInstanceRule;
+use Wallabag\Entity\IgnoreOriginUserRule;
+use Wallabag\Entity\User;
+use Wallabag\Helper\RuleBasedIgnoreOriginProcessor;
+use Wallabag\Repository\IgnoreOriginInstanceRuleRepository;
 
 class RuleBasedIgnoreOriginProcessorTest extends TestCase
 {

tests/Helper/RuleBasedTaggerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Helper;
+namespace Tests\Wallabag\Helper;
 
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
@@ -8,14 +8,14 @@ use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use RulerZ\RulerZ;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\TaggingRule;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\RuleBasedTagger;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\TaggingRule;
+use Wallabag\Entity\User;
+use Wallabag\Helper\RuleBasedTagger;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\TagRepository;
 
 class RuleBasedTaggerTest extends TestCase
 {

tests/Helper/TagsAssignerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Helper;
+namespace Tests\Wallabag\Helper;
 
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\User;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Repository\TagRepository;
 
 class TagsAssignerTest extends TestCase
 {

tests/Import/ChromeImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
@@ -10,13 +10,13 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\ChromeImport;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\ChromeImport;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class ChromeImportTest extends TestCase
 {

tests/Import/FirefoxImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
@@ -10,13 +10,13 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\FirefoxImport;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\FirefoxImport;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class FirefoxImportTest extends TestCase
 {

tests/Import/ImportChainTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\Import\ImportChain;
-use Wallabag\CoreBundle\Import\ImportInterface;
+use Wallabag\Import\ImportChain;
+use Wallabag\Import\ImportInterface;
 
 class ImportChainTest extends TestCase
 {

tests/Import/ImportCompilerPassTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Wallabag\CoreBundle\Import\ImportChain;
-use Wallabag\CoreBundle\Import\ImportCompilerPass;
+use Wallabag\Import\ImportChain;
+use Wallabag\Import\ImportCompilerPass;
 
 class ImportCompilerPassTest extends TestCase
 {

tests/Import/InstapaperImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;
@@ -11,13 +11,13 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\InstapaperImport;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\InstapaperImport;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class InstapaperImportTest extends TestCase
 {

tests/Import/PocketHtmlImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
@@ -10,13 +10,13 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\PocketHtmlImport;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\PocketHtmlImport;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class PocketHtmlImportTest extends TestCase
 {

tests/Import/PocketImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;
@@ -13,14 +13,14 @@ use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\PocketImport;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\PocketImport;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class PocketImportTest extends TestCase
 {

tests/Import/ReadabilityImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
@@ -10,13 +10,13 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\ReadabilityImport;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\ReadabilityImport;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class ReadabilityImportTest extends TestCase
 {

tests/Import/ShaarliImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
@@ -10,13 +10,13 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\ShaarliImport;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\ShaarliImport;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class ShaarliImportTest extends TestCase
 {

tests/Import/WallabagV1ImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;
@@ -11,13 +11,13 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\WallabagV1Import;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\WallabagV1Import;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class WallabagV1ImportTest extends TestCase
 {

tests/Import/WallabagV2ImportTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Import;
+namespace Tests\Wallabag\Import;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;
@@ -11,13 +11,13 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Simpleue\Queue\RedisQueue;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Import\WallabagV2Import;
-use Wallabag\CoreBundle\Redis\Producer;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Import\WallabagV2Import;
+use Wallabag\Redis\Producer;
+use Wallabag\Repository\EntryRepository;
 
 class WallabagV2ImportTest extends TestCase
 {

tests/Mailer/AuthCodeMailerTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Mailer;
+namespace Tests\Wallabag\Mailer;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Address;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Mailer\AuthCodeMailer;
+use Wallabag\Entity\User;
+use Wallabag\Mailer\AuthCodeMailer;
 
 class AuthCodeMailerTest extends TestCase
 {

tests/ParamConverter/UsernameFeedTokenConverterTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\ParamConverter;
+namespace Tests\Wallabag\ParamConverter;
 
 use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\Persistence\Mapping\ClassMetadata;
@@ -9,9 +9,9 @@ use PHPUnit\Framework\TestCase;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Entity\User;
+use Wallabag\ParamConverter\UsernameFeedTokenConverter;
+use Wallabag\Repository\UserRepository;
 
 class UsernameFeedTokenConverterTest extends TestCase
 {

tests/SiteConfig/ArraySiteConfigBuilderTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\SiteConfig;
+namespace Tests\Wallabag\SiteConfig;
 
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\SiteConfig\ArraySiteConfigBuilder;
-use Wallabag\CoreBundle\SiteConfig\SiteConfig;
+use Wallabag\SiteConfig\ArraySiteConfigBuilder;
+use Wallabag\SiteConfig\SiteConfig;
 
 class ArraySiteConfigBuilderTest extends TestCase
 {

tests/SiteConfig/Authenticator/LoginFormAuthenticatorTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\SiteConfig\Authenticator;
+namespace Tests\Wallabag\SiteConfig\Authenticator;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\Response;
 use GuzzleHttp\Stream\Stream;
 use GuzzleHttp\Subscriber\Mock;
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\SiteConfig\Authenticator\LoginFormAuthenticator;
-use Wallabag\CoreBundle\SiteConfig\SiteConfig;
+use Wallabag\SiteConfig\Authenticator\LoginFormAuthenticator;
+use Wallabag\SiteConfig\SiteConfig;
 
 class LoginFormAuthenticatorTest extends TestCase
 {

tests/SiteConfig/GrabySiteConfigBuilderTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\SiteConfig;
+namespace Tests\Wallabag\SiteConfig;
 
 use Graby\SiteConfig\ConfigBuilder;
 use Graby\SiteConfig\SiteConfig as GrabySiteConfig;
@@ -8,10 +8,10 @@ use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Repository\SiteCredentialRepository;
-use Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder;
+use Tests\Wallabag\WallabagCoreTestCase;
+use Wallabag\Entity\User;
+use Wallabag\Repository\SiteCredentialRepository;
+use Wallabag\SiteConfig\GrabySiteConfigBuilder;
 
 class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
 {

tests/SiteConfig/SiteConfigTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\SiteConfig;
+namespace Tests\Wallabag\SiteConfig;
 
 use PHPUnit\Framework\TestCase;
-use Wallabag\CoreBundle\SiteConfig\SiteConfig;
+use Wallabag\SiteConfig\SiteConfig;
 
 class SiteConfigTest extends TestCase
 {

tests/Tools/UtilsTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Tools;
+namespace Tests\Wallabag\Tools;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
-use Wallabag\CoreBundle\Tools\Utils;
+use Wallabag\Tools\Utils;
 
 class UtilsTest extends TestCase
 {

tests/Twig/WallabagExtensionTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\Twig;
+namespace Tests\Wallabag\Twig;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
-use Wallabag\CoreBundle\Twig\WallabagExtension;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\TagRepository;
+use Wallabag\Twig\WallabagExtension;
 
 class WallabagExtensionTest extends TestCase
 {

tests/WallabagCoreTestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle;
+namespace Tests\Wallabag;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -9,7 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 abstract class WallabagCoreTestCase extends WebTestCase
 {