[2.3] Cleanup deprecations

Author: nicolas-grekas

Tests/Functional/app/AppKernel.php

@@ -74,10 +74,6 @@ public function registerBundles()
         return include $filename;
     }
 
-    public function init()
-    {
-    }
-
     public function getRootDir()
     {
         return __DIR__;

Tests/Templating/Helper/FormHelperDivLayoutTest.php

@@ -77,7 +77,11 @@ protected function renderForm(FormView $view, array $vars = array())
 
     protected function renderEnctype(FormView $view)
     {
-        return (string) $this->engine->get('form')->enctype($view);
+        if (!method_exists($form = $this->engine->get('form'), 'enctype')) {
+            $this->markTestSkipped(sprintf("Deprecated method %s->enctype() is not implemented.", get_class($form)));
+        }
+
+        return (string) $form->enctype($view);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())

Tests/Templating/Helper/FormHelperTableLayoutTest.php

@@ -78,7 +78,11 @@ protected function renderForm(FormView $view, array $vars = array())
 
     protected function renderEnctype(FormView $view)
     {
-        return (string) $this->engine->get('form')->enctype($view);
+        if (!method_exists($form = $this->engine->get('form'), 'enctype')) {
+            $this->markTestSkipped(sprintf("Deprecated method %s->enctype() is not implemented.", get_class($form)));
+        }
+
+        return (string) $form->enctype($view);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())

composer.json

@@ -35,7 +35,7 @@
         "symfony/css-selector": "~2.0,>=2.0.5",
         "symfony/dom-crawler": "~2.0,>=2.0.5",
         "symfony/finder": "~2.0,>=2.0.5",
-        "symfony/locale": "~2.0,>=2.0.5",
+        "symfony/intl": "~2.3",
         "symfony/security": "~2.3",
         "symfony/form": "~2.3.0,>=2.3.5",
         "symfony/class-loader": "~2.1",