Permalink
Browse files

Always enable MLDemoBundle; demonstrating it is the whole purpose of …

…this project
  • Loading branch information...
lanthaler committed Nov 11, 2013
1 parent 2a362da commit f56733e67481e4e67ec81dd1900d1bfe81178293
Showing with 8 additions and 8 deletions.
  1. +2 −2 app/AppKernel.php
  2. +6 −0 app/config/routing.yml
  3. +0 −6 app/config/routing_dev.yml
@@ -16,11 +16,11 @@ public function registerBundles()
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new ML\HydraBundle\HydraBundle()
new ML\HydraBundle\HydraBundle(),
new ML\DemoBundle\MLDemoBundle()
);
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
$bundles[] = new ML\DemoBundle\MLDemoBundle();
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
@@ -1,3 +1,9 @@
# MLDemoBundle routes (to be removed)
_demo:
resource: "@MLDemoBundle/Controller/"
type: annotation
prefix: /

hydra:
resource: "@HydraBundle/Controller/"
type: annotation
@@ -10,11 +10,5 @@ _configurator:
resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
prefix: /_configurator

# MLDemoBundle routes (to be removed)
_demo:
resource: "@MLDemoBundle/Controller/"
type: annotation
prefix: /

_main:
resource: routing.yml

0 comments on commit f56733e

Please sign in to comment.