aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php2
-rw-r--r--app/config/routing.yml8
-rw-r--r--app/config/routing_rest.yml4
3 files changed, 6 insertions, 8 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index e2db75a7..e8160135 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -2,6 +2,7 @@
2 2
3use Symfony\Component\HttpKernel\Kernel; 3use Symfony\Component\HttpKernel\Kernel;
4use Symfony\Component\Config\Loader\LoaderInterface; 4use Symfony\Component\Config\Loader\LoaderInterface;
5use Wallabag\ApiBundle\WallabagApiBundle;
5 6
6class AppKernel extends Kernel 7class AppKernel extends Kernel
7{ 8{
@@ -20,6 +21,7 @@ class AppKernel extends Kernel
20 new JMS\SerializerBundle\JMSSerializerBundle(), 21 new JMS\SerializerBundle\JMSSerializerBundle(),
21 new Nelmio\ApiDocBundle\NelmioApiDocBundle(), 22 new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
22 new Wallabag\CoreBundle\WallabagCoreBundle(), 23 new Wallabag\CoreBundle\WallabagCoreBundle(),
24 new Wallabag\ApiBundle\WallabagApiBundle(),
23 ); 25 );
24 26
25 if (in_array($this->getEnvironment(), array('dev', 'test'))) { 27 if (in_array($this->getEnvironment(), array('dev', 'test'))) {
diff --git a/app/config/routing.yml b/app/config/routing.yml
index a57311dc..60fcb6f4 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -10,7 +10,7 @@ doc-api:
10 resource: "@NelmioApiDocBundle/Resources/config/routing.yml" 10 resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
11 prefix: /api/doc 11 prefix: /api/doc
12 12
13rest : 13wallabag_api:
14 type : rest 14 resource: "@WallabagApiBundle/Controller/"
15 resource : "routing_rest.yml" 15 type: annotation
16 prefix : /api \ No newline at end of file 16 prefix: /api \ No newline at end of file
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml
deleted file mode 100644
index ecddbd36..00000000
--- a/app/config/routing_rest.yml
+++ /dev/null
@@ -1,4 +0,0 @@
1app_api :
2 type: rest
3 resource: "WallabagCoreBundle:Api"
4 name_prefix: api_ \ No newline at end of file