Merge branch '2.5'

* 2.5:
  Update validators.eu.xlf
  fixed CS
  remove unused imports
  [Validator] Added markObjectAsInitialized() and isObjectInitialized() to ExecutionContextInterface
  [Validator] Fixed doc block
  [Routing] simplify the XML schema file
  Unify null comparisons
  [EventDispatcher] don't count empty listeners
  [Process] Fix unit tests in sigchild environment
  [Process] fix signal handling in wait()
  [BrowserKit] refactor code and fix unquoted regex
  Fixed server HTTP_HOST port uri conversion
  [HttpFoundation] moved test file to the right directory
  [Validator] Made sure that context changes don't leak out of (Contextual)ValidatorInterface
  [MonologBridge] fixed Console handler priorities
  Bring code into standard
  [Process] Add test to verify fix for issue #11421
  [Process] Fixes issue #11421
  [DependencyInjection] Pass a Scope instance instead of a scope name.

Author: fabpot

DependencyInjection/Configuration.php

@@ -41,7 +41,7 @@ public function getConfigTreeBuilder()
                 ->end()
                 ->arrayNode('trusted_proxies')
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return !is_array($v) && !is_null($v); })
+                        ->ifTrue(function ($v) { return !is_array($v) && null !== $v; })
                         ->then(function ($v) { return is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); })
                     ->end()
                     ->prototype('scalar')

Resources/views/Form/choice_widget_collapsed.html.php

@@ -1,5 +1,5 @@
 <select
-    <?php if ($required && $empty_value === null && $empty_value_in_choices === false && $multiple === false):
+    <?php if ($required && null === $empty_value && $empty_value_in_choices === false && $multiple === false):
         $required = false;
     endif; ?>
     <?php echo $view['form']->block($form, 'widget_attributes', array(

Test/KernelTestCase.php

@@ -45,14 +45,14 @@ protected static function getPhpUnitXmlDir()
         }
 
         $dir = static::getPhpUnitCliConfigArgument();
-        if ($dir === null &&
+        if (null === $dir &&
             (is_file(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml') ||
             is_file(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml.dist'))) {
             $dir = getcwd();
         }
 
         // Can't continue
-        if ($dir === null) {
+        if (null === $dir) {
             throw new \RuntimeException('Unable to guess the Kernel directory.');
         }
 
@@ -90,7 +90,7 @@ private static function getPhpUnitCliConfigArgument()
     }
 
     /**
-     * Attempts to guess the Kernel location.
+     * Attempts to guess the kernel location.
      *
      * When the Kernel is located, the file is required.
      *
@@ -117,7 +117,7 @@ protected static function getKernelClass()
         $finder->name('*Kernel.php')->depth(0)->in($dir);
         $results = iterator_to_array($finder);
         if (!count($results)) {
-            throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to http://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the KernelTestCase::createKernel() method.');
+            throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to http://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the WebTestCase::createKernel() method.');
         }
 
         $file = current($results);
@@ -141,7 +141,7 @@ protected static function bootKernel(array $options = array())
         static::$kernel->boot();
     }
 
-    /**
+   /**
      * Creates a Kernel.
      *
      * Available options:

Tests/DependencyInjection/Compiler/SerializerPassTest.php

@@ -96,7 +96,7 @@ public function testServicesAreOrderedAccordingToPriority()
           'Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass',
           'findAndSortTaggedServices'
         );
-        $method->setAccessible(TRUE);
+        $method->setAccessible(true);
 
         $actual = $method->invoke($serializerPass, 'tag', $container);