Skip to content

Commit

Permalink
conditionally WebSerBundle, new sonata integration release (#378)
Browse files Browse the repository at this point in the history
Use Symfony 3.3 and separate WebServerBundle, new sonata integration release
  • Loading branch information
ElectricMaxxx authored and dbu committed Aug 2, 2017
1 parent 04b0e98 commit 501b1d8
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 30 deletions.
1 change: 1 addition & 0 deletions app/AppKernel.php
Expand Up @@ -75,6 +75,7 @@ public function registerBundles()
$bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new \Symfony\Bundle\WebServerBundle\WebServerBundle();

// additional bundle for tests
if ('test' === $this->getEnvironment()) {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -18,7 +18,7 @@
},
"require": {
"php": "^5.6|^7.0",
"symfony/symfony": "^3.2",
"symfony/symfony": "^3.3",
"symfony/assetic-bundle": "^2.8",
"symfony/swiftmailer-bundle": "^2.3.10",
"symfony/monolog-bundle": "^3.0.2",
Expand Down
58 changes: 29 additions & 29 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 501b1d8

Please sign in to comment.