added automatic registration of the Locale component when intl is not enabled

composer.json

@@ -25,6 +25,7 @@
     "require-dev": {
         "symfony/security": "2.1.*",
         "symfony/config": "2.1.*",
+        "symfony/locale": "2.1.*",
         "symfony/form": "2.1.*",
         "monolog/monolog": ">=1.0.0,<1.2-dev",
         "symfony/browser-kit": "2.1.*",

composer.lock

 {
-    "hash": "0fe59be3a3e94c9b77fc20e18faaea0e",
+    "hash": "3ec54c6c3e37fe1b74143cc1c9631567",
     "packages": [
         {
             "package": "pimple/pimple",
@@ -67,7 +67,13 @@
         {
             "package": "doctrine/common",
             "version": "dev-master",
-            "source-reference": "80838882abc04270fb9bc5812da4ab64e2ee3f88"
+            "alias-pretty-version": "2.3.x-dev",
+            "alias-version": "2.3.9999999.9999999-dev"
+        },
+        {
+            "package": "doctrine/common",
+            "version": "dev-master",
+            "source-reference": "f0b548aa55bb7dac36d79061270a085dd38635b4"
         },
         {
             "package": "doctrine/dbal",
@@ -87,13 +93,7 @@
         {
             "package": "swiftmailer/swiftmailer",
             "version": "dev-master",
-            "alias-pretty-version": "4.1.x-dev",
-            "alias-version": "4.1.9999999.9999999-dev"
-        },
-        {
-            "package": "swiftmailer/swiftmailer",
-            "version": "dev-master",
-            "source-reference": "42223cb8ca2009dc6361bf4569ca52ec0fae51c2"
+            "source-reference": "0509c682d482940949ea7f7128c582d9d8b628e2"
         },
         {
             "package": "symfony/browser-kit",
@@ -159,7 +159,7 @@
         {
             "package": "symfony/form",
             "version": "dev-master",
-            "source-reference": "810e9ddffab12d0c90dc5bd7c430aa04cdb053a1"
+            "source-reference": "803a9ce43732bb27341920019dd880323171f5ad"
         },
         {
             "package": "symfony/locale",
@@ -214,7 +214,13 @@
         {
             "package": "symfony/security",
             "version": "dev-master",
-            "source-reference": "81db3fb8af37dd884580433a647df23d6de5347e"
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/security",
+            "version": "dev-master",
+            "source-reference": "e13a63c0cbbd938589e2ecdf6af0402651cbb673"
         },
         {
             "package": "symfony/translation",
@@ -258,7 +264,7 @@
         {
             "package": "twig/twig",
             "version": "dev-master",
-            "source-reference": "120c44d68f07ced5b1e08f582f94016f4f2685d6"
+            "source-reference": "4679ad51c5390648b7ea4c8f0ecd2c0c344145ba"
         }
     ],
     "aliases": [

doc/providers/form.rst

@@ -65,15 +65,10 @@ it, you can install the Symfony Locale Component as a replacement::
         "symfony/locale": "2.1.*"
     }
 
-Then, enable it in your code::
-
-    $path = __DIR__.'/vendor/symfony/locale/Symfony/Component/Locale/Resources/stubs';
+.. note::
 
-    require_once $path.'/functions.php';
-    require_once $path.'/Collator.php';
-    require_once $path.'/IntlDateFormatter.php';
-    require_once $path.'/Locale.php';
-    require_once $path.'/NumberFormatter.php';
+    If you want to benefit from the internationalization of your form, you
+    must install the PHP intl extension.
 
 Usage
 -----

src/Silex/Provider/FormServiceProvider.php

@@ -29,6 +29,21 @@ class FormServiceProvider implements ServiceProviderInterface
 {
     public function register(Application $app)
     {
+        if (!class_exists('Locale') && !class_exists('Symfony\Component\Locale\Stub\StubLocale')) {
+            throw new \RuntimeException('You must either install the PHP intl extension or the Symfony Locale Component to use the Form extension.');
+        }
+
+        if (!class_exists('Locale')) {
+            $r = new \ReflectionClass('Symfony\Component\Locale\Stub\StubLocale');
+            $path = dirname(dirname($r->getFilename())).'/Resources/stubs';
+
+            require_once $path.'/functions.php';
+            require_once $path.'/Collator.php';
+            require_once $path.'/IntlDateFormatter.php';
+            require_once $path.'/Locale.php';
+            require_once $path.'/NumberFormatter.php';
+        }
+
         $app['form.secret'] = md5(__DIR__);
 
         $app['form.factory'] = $app->share(function () use ($app) {