Merge branch '2.4'

* 2.4:
  [WIP][Finder] Fix wrong implementation on sortable callback comparator
  ommited space
  [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
  Include file path in exception
  [Process] Add validation on Process input

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
	src/Symfony/Component/Process/Tests/ProcessBuilderTest.php

Author: fabpot

Resources/translations/validators.id.xlf

@@ -164,7 +164,7 @@
             </trans-unit>
             <trans-unit id="44">
                 <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Lebar gambar terlalu kecil ({{ width}}px). Ukuran lebar minimum yang diharapkan adalah {{ min_width }}px.</target>
+                <target>Lebar gambar terlalu kecil ({{ width }}px). Ukuran lebar minimum yang diharapkan adalah {{ min_width }}px.</target>
             </trans-unit>
             <trans-unit id="45">
                 <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>

Tests/Mapping/Loader/StaticMethodLoaderTest.php

@@ -17,6 +17,18 @@
 
 class StaticMethodLoaderTest extends \PHPUnit_Framework_TestCase
 {
+    private $errorLevel;
+
+    protected function setUp()
+    {
+        $this->errorLevel = error_reporting();
+    }
+
+    protected function tearDown()
+    {
+        error_reporting($this->errorLevel);
+    }
+
     public function testLoadClassMetadataReturnsTrueIfSuccessful()
     {
         $loader = new StaticMethodLoader('loadMetadata');
@@ -78,6 +90,8 @@ public function testLoadClassMetadataInAbstractClasses()
 
     public function testLoadClassMetadataIgnoresAbstractMethods()
     {
+        error_reporting(E_ALL | E_STRICT);
+
         $loader = new StaticMethodLoader('loadMetadata');
         $caught = false;
         try {