oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-26 18:21:02 +00:00
Code Wiki Activity

Move Import controllers to Core

Browse source
This commit is contained in:
Yassine Guedidi 2023-12-31 12:25:57 +01:00
parent ed4b20f27f
commit 6787f598cb
60 changed files with 178 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Wallabag/ImportBundle/Controller/BrowserController.php → src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@ -13,7 +13,7 @@ use Wallabag\ImportBundle\Import\ImportInterface;
abstract class BrowserController extends AbstractController
{
/**
* @Route("/browser", name="import_browser")
* @Route("/import/browser", name="import_browser")
*
* @return Response
*/

4
src/Wallabag/ImportBundle/Controller/ChromeController.php → src/Wallabag/CoreBundle/Controller/Import/ChromeController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -26,7 +26,7 @@ class ChromeController extends BrowserController
}
/**
* @Route("/chrome", name="import_chrome")
* @Route("/import/chrome", name="import_chrome")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/DeliciousController.php → src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -24,7 +24,7 @@ class DeliciousController extends AbstractController
}
/**
* @Route("/delicious", name="import_delicious")
* @Route("/import/delicious", name="import_delicious")
*/
public function indexAction(Request $request, DeliciousImport $delicious, Config $craueConfig, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/ElcuratorController.php → src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -26,7 +26,7 @@ class ElcuratorController extends WallabagController
}
/**
* @Route("/elcurator", name="import_elcurator")
* @Route("/import/elcurator", name="import_elcurator")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/FirefoxController.php → src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -26,7 +26,7 @@ class FirefoxController extends BrowserController
}
/**
* @Route("/firefox", name="import_firefox")
* @Route("/import/firefox", name="import_firefox")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/HtmlController.php → src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@ -13,7 +13,7 @@ use Wallabag\ImportBundle\Import\ImportInterface;
abstract class HtmlController extends AbstractController
{
/**
* @Route("/html", name="import_html")
* @Route("/import/html", name="import_html")
*
* @return Response
*/

4
src/Wallabag/ImportBundle/Controller/ImportController.php → src/Wallabag/CoreBundle/Controller/Import/ImportController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use Predis\Client;
@ -20,7 +20,7 @@ class ImportController extends AbstractController
}
/**
* @Route("/", name="import")
* @Route("/import/", name="import")
*/
public function importAction(ImportChain $importChain)
{

4
src/Wallabag/ImportBundle/Controller/InstapaperController.php → src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -24,7 +24,7 @@ class InstapaperController extends AbstractController
}
/**
* @Route("/instapaper", name="import_instapaper")
* @Route("/import/instapaper", name="import_instapaper")
*/
public function indexAction(Request $request, InstapaperImport $instapaper, Config $craueConfig, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/PinboardController.php → src/Wallabag/CoreBundle/Controller/Import/PinboardController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -24,7 +24,7 @@ class PinboardController extends AbstractController
}
/**
* @Route("/pinboard", name="import_pinboard")
* @Route("/import/pinboard", name="import_pinboard")
*/
public function indexAction(Request $request, PinboardImport $pinboard, Config $craueConfig, TranslatorInterface $translator)
{

8
src/Wallabag/ImportBundle/Controller/PocketController.php → src/Wallabag/CoreBundle/Controller/Import/PocketController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -30,7 +30,7 @@ class PocketController extends AbstractController
}
/**
* @Route("/pocket", name="import_pocket")
* @Route("/import/pocket", name="import_pocket")
*/
public function indexAction(PocketImport $pocketImport)
{
@ -51,7 +51,7 @@ class PocketController extends AbstractController
}
/**
* @Route("/pocket/auth", name="import_pocket_auth")
* @Route("/import/pocket/auth", name="import_pocket_auth")
*/
public function authAction(Request $request, PocketImport $pocketImport)
{
@ -81,7 +81,7 @@ class PocketController extends AbstractController
}
/**
* @Route("/pocket/callback", name="import_pocket_callback")
* @Route("/import/pocket/callback", name="import_pocket_callback")
*/
public function callbackAction(PocketImport $pocketImport, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/PocketHtmlController.php → src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -26,7 +26,7 @@ class PocketHtmlController extends HtmlController
}
/**
* @Route("/pocket_html", name="import_pocket_html")
* @Route("/import/pocket_html", name="import_pocket_html")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/ReadabilityController.php → src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -24,7 +24,7 @@ class ReadabilityController extends AbstractController
}
/**
* @Route("/readability", name="import_readability")
* @Route("/import/readability", name="import_readability")
*/
public function indexAction(Request $request, ReadabilityImport $readability, Config $craueConfig, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/ShaarliController.php → src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -26,7 +26,7 @@ class ShaarliController extends HtmlController
}
/**
* @Route("/shaarli", name="import_shaarli")
* @Route("/import/shaarli", name="import_shaarli")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{

2
src/Wallabag/ImportBundle/Controller/WallabagController.php → src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;

4
src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php → src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -26,7 +26,7 @@ class WallabagV1Controller extends WallabagController
}
/**
* @Route("/wallabag-v1", name="import_wallabag_v1")
* @Route("/import/wallabag-v1", name="import_wallabag_v1")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{

4
src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php → src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -26,7 +26,7 @@ class WallabagV2Controller extends WallabagController
}
/**
* @Route("/wallabag-v2", name="import_wallabag_v2")
* @Route("/import/wallabag-v2", name="import_wallabag_v2")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{

2
src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
View file

@ -3,7 +3,7 @@
{% block title %}{{ 'import.page_title'|trans }}{% endblock %}
{% block messages %}
{{ render(controller('Wallabag\\ImportBundle\\Controller\\ImportController::checkQueueAction')) }}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\Import\\ImportController::checkQueueAction')) }}
{{ parent() }}
{% endblock %}