diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/AppKernel.php | 3 | ||||
-rw-r--r-- | app/config/routing.yml | 13 | ||||
-rw-r--r-- | app/config/routing_rest.yml | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index e8160135..515c79ec 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -20,8 +20,7 @@ class AppKernel extends Kernel | |||
20 | new FOS\RestBundle\FOSRestBundle(), | 20 | new FOS\RestBundle\FOSRestBundle(), |
21 | new JMS\SerializerBundle\JMSSerializerBundle(), | 21 | new JMS\SerializerBundle\JMSSerializerBundle(), |
22 | new Nelmio\ApiDocBundle\NelmioApiDocBundle(), | 22 | new Nelmio\ApiDocBundle\NelmioApiDocBundle(), |
23 | new Wallabag\CoreBundle\WallabagCoreBundle(), | 23 | new Wallabag\CoreBundle\WallabagCoreBundle() |
24 | new Wallabag\ApiBundle\WallabagApiBundle(), | ||
25 | ); | 24 | ); |
26 | 25 | ||
27 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { | 26 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { |
diff --git a/app/config/routing.yml b/app/config/routing.yml index 60fcb6f4..8e04a0c8 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -10,7 +10,12 @@ 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 | ||
13 | wallabag_api: | 13 | #wallabag_api: |
14 | resource: "@WallabagApiBundle/Controller/" | 14 | # resource: "@WallabagApiBundle/Controller/" |
15 | type: annotation | 15 | # type: annotation |
16 | prefix: /api \ No newline at end of file | 16 | # prefix: /api |
17 | |||
18 | rest : | ||
19 | type : rest | ||
20 | resource : "routing_rest.yml" | ||
21 | prefix : /api \ No newline at end of file | ||
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml new file mode 100644 index 00000000..82d9e6cc --- /dev/null +++ b/app/config/routing_rest.yml | |||
@@ -0,0 +1,3 @@ | |||
1 | Rest_Wallabag: | ||
2 | type : rest | ||
3 | resource: "@WallabagCoreBundle/Resources/config/routing_rest.yml" \ No newline at end of file | ||