diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/AppKernel.php | 2 | ||||
-rw-r--r-- | app/config/routing.yml | 2 | ||||
-rw-r--r-- | app/config/routing_dev.yml | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index b0a66dad..f0383038 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -16,13 +16,11 @@ class AppKernel extends Kernel | |||
16 | new Symfony\Bundle\AsseticBundle\AsseticBundle(), | 16 | new Symfony\Bundle\AsseticBundle\AsseticBundle(), |
17 | new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), | 17 | new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), |
18 | new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), | 18 | new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), |
19 | new AppBundle\AppBundle(), | ||
20 | new Wallabag\CoreBundle\WallabagCoreBundle(), | 19 | new Wallabag\CoreBundle\WallabagCoreBundle(), |
21 | ); | 20 | ); |
22 | 21 | ||
23 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { | 22 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { |
24 | $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); | 23 | $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); |
25 | $bundles[] = new Acme\DemoBundle\AcmeDemoBundle(); | ||
26 | $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); | 24 | $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); |
27 | $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); | 25 | $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); |
28 | $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); | 26 | $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); |
diff --git a/app/config/routing.yml b/app/config/routing.yml index b3c5291a..95c224ab 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -4,4 +4,4 @@ app: | |||
4 | 4 | ||
5 | homepage: | 5 | homepage: |
6 | pattern: / | 6 | pattern: / |
7 | defaults: { _controller: CoreBundle:Entry:showUnread } \ No newline at end of file | 7 | defaults: { _controller: WallabagCoreBundle:Entry:showUnread } \ No newline at end of file |
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 99130058..1a236e28 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml | |||
@@ -15,8 +15,4 @@ _errors: | |||
15 | prefix: /_error | 15 | prefix: /_error |
16 | 16 | ||
17 | _main: | 17 | _main: |
18 | resource: routing.yml | 18 | resource: routing.yml \ No newline at end of file |
19 | |||
20 | # AcmeDemoBundle routes (to be removed) | ||
21 | _acme_demo: | ||
22 | resource: "@AcmeDemoBundle/Resources/config/routing.yml" \ No newline at end of file | ||