Merge branch '2.2'

* 2.2: (22 commits)
  fixed doc references (closes #7515)
  fixed doc references (closes #7515)
  On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var.
  Doctrine cannot handle bare random non-utf8 strings
  small changes
  [SecurityBundle] Fixed configuration exemple
  idAsIndex should be true with a smallint or bigint id field.
  [PropertyAccess] Remove trailing periods from doc blocks
  Fix param docs for PropertyAccessor read method
  Fixed long multibyte parameter logging in DbalLogger:startQuery
  Keep the file extension in the temporary copy and test that it exists (closes #7482)
  bumped Symfony version to 2.1.10-DEV
  [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
  updated VERSION for 2.1.9
  update CONTRIBUTORS for 2.1.9
  updated CHANGELOG for 2.1.9
  [Security] fixed wrong interface
  Remove already defined arguments
  Add missing use
  [FrameworkBundle] Reuse definition variable in FormPass
  ...

Conflicts:
	src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig

Author: fabpot

DependencyInjection/Compiler/FormPass.php

@@ -28,6 +28,8 @@ public function process(ContainerBuilder $container)
             return;
         }
 
+        $definition = $container->getDefinition('form.extension');
+
         // Builds an array with service IDs as keys and tag aliases as values
         $types = array();
 
@@ -40,7 +42,7 @@ public function process(ContainerBuilder $container)
             $types[$alias] = $serviceId;
         }
 
-        $container->getDefinition('form.extension')->replaceArgument(1, $types);
+        $definition->replaceArgument(1, $types);
 
         $typeExtensions = array();
 
@@ -52,11 +54,11 @@ public function process(ContainerBuilder $container)
             $typeExtensions[$alias][] = $serviceId;
         }
 
-        $container->getDefinition('form.extension')->replaceArgument(2, $typeExtensions);
+        $definition->replaceArgument(2, $typeExtensions);
 
         // Find all services annotated with "form.type_guesser"
         $guessers = array_keys($container->findTaggedServiceIds('form.type_guesser'));
 
-        $container->getDefinition('form.extension')->replaceArgument(3, $guessers);
+        $definition->replaceArgument(3, $guessers);
     }
 }