Merge pull request #96 from symfony-cmf/remove_some_deprecated_features

Pattern has been renamed to Path in Sf 2.2

Author: dbu

resources/config/routing/sonata_routing.yml

@@ -10,7 +10,7 @@ sonata_admin:
         id:  .+
 
 admin_dashboard:
-    pattern: /admin/
+    path: /admin/
     defaults:
         _controller: FrameworkBundle:Redirect:redirect
         route: sonata_admin_dashboard

tests/HttpKernel/TestKernelTest.php

@@ -32,7 +32,6 @@ public function setUp()
      */
     public function testBundleSetRequire(array $bundleSets, $count)
     {
-        $this->kernel->init();
         $this->kernel->requireBundleSets($bundleSets);
         $bundles = $this->kernel->registerBundles();
         $this->assertCount($count, $bundles);
@@ -60,7 +59,6 @@ public function testBundleAdd()
      */
     public function testRequireInvalidBundleSet()
     {
-        $this->kernel->init();
         $this->kernel->requireBundleSet('foobar');
     }
 }

tests/Phpunit/DatabaseTestListenerTest.php

@@ -33,7 +33,7 @@ public function testPhpcrTestSuite()
             ->method('getName')
             ->will($this->returnValue('phpcr'));
 
-        $this->assertProcessExecuted(array('doctrine:phpcr:init:dbal', '--drop'));
+        $this->assertProcessExecuted(array('doctrine:phpcr:init:dbal', '--drop', '--force'));
         $this->assertProcessExecuted(array('doctrine:phpcr:repository:init'));
 
         ob_start();