diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/AppKernel.php | 3 | ||||
-rw-r--r-- | app/config/routing.yml | 4 | ||||
-rw-r--r-- | app/config/routing_rest.yml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index 601b52c3..9a52f349 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -23,7 +23,8 @@ class AppKernel extends Kernel | |||
23 | new Nelmio\CorsBundle\NelmioCorsBundle(), | 23 | new Nelmio\CorsBundle\NelmioCorsBundle(), |
24 | new Liip\ThemeBundle\LiipThemeBundle(), | 24 | new Liip\ThemeBundle\LiipThemeBundle(), |
25 | new Wallabag\CoreBundle\WallabagCoreBundle(), | 25 | new Wallabag\CoreBundle\WallabagCoreBundle(), |
26 | new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle() | 26 | new Wallabag\ApiBundle\WallabagApiBundle(), |
27 | new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(), | ||
27 | ); | 28 | ); |
28 | 29 | ||
29 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { | 30 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { |
diff --git a/app/config/routing.yml b/app/config/routing.yml index d681b39b..8710e97f 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -1,3 +1,7 @@ | |||
1 | wallabag_api: | ||
2 | resource: "@WallabagApiBundle/Resources/config/routing.yml" | ||
3 | prefix: / | ||
4 | |||
1 | app: | 5 | app: |
2 | resource: @WallabagCoreBundle/Controller/ | 6 | resource: @WallabagCoreBundle/Controller/ |
3 | type: annotation | 7 | type: annotation |
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml index 82d9e6cc..0a64ad78 100644 --- a/app/config/routing_rest.yml +++ b/app/config/routing_rest.yml | |||
@@ -1,3 +1,3 @@ | |||
1 | Rest_Wallabag: | 1 | Rest_Wallabag: |
2 | type : rest | 2 | type : rest |
3 | resource: "@WallabagCoreBundle/Resources/config/routing_rest.yml" \ No newline at end of file | 3 | resource: "@WallabagApiBundle/Resources/config/routing_rest.yml" |