Merge branch '2.5' into 2.6

* 2.5:
  [Debug] fix error message on double exception
  Fix initialized() with aliased services
  Rename Symfony2 to Symfony
  compare version using PHP_VERSION_ID
  backport #12489
  remove an unneeded check

Author: fabpot

Tests/Validator/LegacyValidator2Dot5ApiTest.php

@@ -21,7 +21,7 @@ class LegacyValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
 {
     protected function setUp()
     {
-        if (version_compare(PHP_VERSION, '5.3.9', '<')) {
+        if (PHP_VERSION_ID < 50309) {
             $this->markTestSkipped('Not supported prior to PHP 5.3.9');
         }
 

Tests/Validator/LegacyValidatorLegacyApiTest.php

@@ -21,7 +21,7 @@ class LegacyValidatorLegacyApiTest extends AbstractLegacyApiTest
 {
     protected function setUp()
     {
-        if (version_compare(PHP_VERSION, '5.3.9', '<')) {
+        if (PHP_VERSION_ID < 50309) {
             $this->markTestSkipped('Not supported prior to PHP 5.3.9');
         }
 

Tests/ValidatorBuilderTest.php

@@ -112,7 +112,7 @@ public function testSetTranslationDomain()
 
     public function testDefaultApiVersion()
     {
-        if (version_compare(PHP_VERSION, '5.3.9', '<')) {
+        if (PHP_VERSION_ID < 50309) {
             // Old implementation on PHP < 5.3.9
             $this->assertInstanceOf('Symfony\Component\Validator\Validator', $this->builder->getValidator());
         } else {
@@ -135,7 +135,7 @@ public function testSetApiVersion25()
 
     public function testSetApiVersion24And25()
     {
-        if (version_compare(PHP_VERSION, '5.3.9', '<')) {
+        if (PHP_VERSION_ID < 50309) {
             $this->markTestSkipped('Not supported prior to PHP 5.3.9');
         }
 

ValidatorBuilder.php

@@ -325,7 +325,7 @@ public function setApiVersion($apiVersion)
             ));
         }
 
-        if (version_compare(PHP_VERSION, '5.3.9', '<') && $apiVersion === Validation::API_VERSION_2_5_BC) {
+        if (PHP_VERSION_ID < 50309 && $apiVersion === Validation::API_VERSION_2_5_BC) {
             throw new InvalidArgumentException(sprintf(
                 'The Validator API that is compatible with both Symfony 2.4 '.
                 'and Symfony 2.5 can only be used on PHP 5.3.9 and higher. '.
@@ -385,7 +385,7 @@ public function getValidator()
         $apiVersion = $this->apiVersion;
 
         if (null === $apiVersion) {
-            $apiVersion = version_compare(PHP_VERSION, '5.3.9', '<')
+            $apiVersion = PHP_VERSION_ID < 50309
                 ? Validation::API_VERSION_2_4
                 : Validation::API_VERSION_2_5_BC;
         }