update PropelBundle

This version integrates the former Symfony Propel1 Bridge. It also removes support for the Symfony Security Acl Component. The new PropelAclBundle has been created to integrate the Acl component. Changelogs summary: - symfony/propel1-bridge removed (installed version was 2.7.x-dev) - propel/propel-bundle updated from 1.5.x-dev to 1.5.x-dev See changes: propelorm/PropelBundle@24c5104...dbbc9e5
propelorm · Jan 23, 2016 · 4bdf9a8 · 4bdf9a8
1 parent 542fe42
commit 4bdf9a8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 69 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -13,7 +13,7 @@ public function registerBundles()
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
-            new Propel\PropelBundle\PropelBundle(),
+            new Propel\Bundle\PropelBundle\PropelBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new AppBundle\AppBundle(),
         );

diff --git a/composer.json b/composer.json
@@ -11,7 +11,6 @@
         "php": ">=5.3.9",
         "symfony/symfony": "^2.8.2",
         "propel/propel-bundle": "1.5.x@dev",
-        "symfony/propel1-bridge": "2.7.x@dev",
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
         "sensio/distribution-bundle": "~5.0",

diff --git a/composer.lock b/composer.lock