Move Api controllers to Core

app/config/routing.yml

@@ -3,11 +3,6 @@ wallabag_import:
     type: annotation
     prefix: /import
 
-wallabag_api:
-    resource: "@WallabagApiBundle/Controller/"
-    type: annotation
-    prefix: /
-
 app:
     resource: "@WallabagCoreBundle/Controller/"
     type: annotation

app/config/services.yml

@@ -42,10 +42,6 @@ services:
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
-    Wallabag\ApiBundle\Controller\:
-        resource: '../../src/Wallabag/ApiBundle/Controller/'
-        tags: ['controller.service_arguments']
-
     Wallabag\CoreBundle\Controller\:
         resource: '../../src/Wallabag/CoreBundle/Controller/'
         tags: ['controller.service_arguments']

src/Wallabag/CoreBundle/Controller/AnnotationController.php

@@ -33,7 +33,7 @@ class AnnotationController extends AbstractFOSRestController
     /**
      * Retrieve annotations for an entry.
      *
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
+     * @see Api\WallabagRestController
      *
      * @Route("/annotations/{entry}.{_format}", methods={"GET"}, name="annotations_get_annotations", defaults={"_format": "json"})
      *
@@ -54,7 +54,7 @@ class AnnotationController extends AbstractFOSRestController
     /**
      * Creates a new annotation.
      *
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
+     * @see Api\WallabagRestController
      *
      * @Route("/annotations/{entry}.{_format}", methods={"POST"}, name="annotations_post_annotation", defaults={"_format": "json"})
      *
@@ -88,7 +88,7 @@ class AnnotationController extends AbstractFOSRestController
     /**
      * Updates an annotation.
      *
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
+     * @see Api\WallabagRestController
      *
      * @Route("/annotations/{annotation}.{_format}", methods={"PUT"}, name="annotations_put_annotation", defaults={"_format": "json"})
      *
@@ -125,7 +125,7 @@ class AnnotationController extends AbstractFOSRestController
     /**
      * Removes an annotation.
      *
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
+     * @see Api\WallabagRestController
      *
      * @Route("/annotations/{annotation}.{_format}", methods={"DELETE"}, name="annotations_delete_annotation", defaults={"_format": "json"})
      *

src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Nelmio\ApiDocBundle\Annotation\Operation;
 use OpenApi\Annotations as OA;

src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerInterface;

src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;

src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Hateoas\Configuration\Route as HateoasRoute;
 use Hateoas\Representation\Factory\PagerfantaFactory;

src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Hateoas\Configuration\Route as HateoasRoute;
 use Hateoas\Representation\Factory\PagerfantaFactory;

src/Wallabag/CoreBundle/Controller/Api/TagRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Nelmio\ApiDocBundle\Annotation\Operation;
 use OpenApi\Annotations as OA;

src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerBuilder;

src/Wallabag/CoreBundle/Controller/Api/UserRestController.php

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

src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php

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

tests/Wallabag/CoreBundle/Controller/Api/ConfigRestControllerTest.php

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

tests/Wallabag/CoreBundle/Controller/Api/DeveloperControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;

tests/Wallabag/CoreBundle/Controller/Api/EntryRestControllerTest.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\DependencyInjection\Container;
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Entity\User;

tests/Wallabag/CoreBundle/Controller/Api/SearchRestControllerTest.php

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

tests/Wallabag/CoreBundle/Controller/Api/TagRestControllerTest.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 

tests/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestControllerTest.php

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

tests/Wallabag/CoreBundle/Controller/Api/UserRestControllerTest.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 
 class UserRestControllerTest extends WallabagApiTestCase
 {

tests/Wallabag/CoreBundle/Controller/Api/WallabagApiTestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Model\UserInterface;

tests/Wallabag/CoreBundle/Controller/Api/WallabagRestControllerTest.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 
 class WallabagRestControllerTest extends WallabagApiTestCase
 {