Merge branch '2.8' into 3.0

* 2.8:
  [Form] fix Catchable Fatal Error if choices is not an array
  [Process] Fix a transient test
  [Process] Fix potential race condition leading to transient tests
  [DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException
  [Routing] removed unused variable in PhpMatcherDumperTest class.
  [travis] use github token to fetch deps from ZIP files
  [DependencyInjection] fixes typo in triggered deprecation notice.
  [Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class.
  [Form] Fixed regression on Collection type
  add missing symfony/polyfill-php55 dependency

Conflicts:
	src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
	src/Symfony/Component/HttpFoundation/composer.json

Author: nicolas-grekas

PropertyInfo/DoctrineExtractor.php

@@ -14,6 +14,7 @@
 use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
 use Doctrine\Common\Persistence\Mapping\MappingException;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\MappingException as OrmMappingException;
 use Symfony\Component\PropertyInfo\PropertyListExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\PropertyInfo\Type;
@@ -44,6 +45,8 @@ public function getProperties($class, array $context = array())
             $metadata = $this->classMetadataFactory->getMetadataFor($class);
         } catch (MappingException $exception) {
             return;
+        } catch (OrmMappingException $exception) {
+            return;
         }
 
         return array_merge($metadata->getFieldNames(), $metadata->getAssociationNames());
@@ -58,6 +61,8 @@ public function getTypes($class, $property, array $context = array())
             $metadata = $this->classMetadataFactory->getMetadataFor($class);
         } catch (MappingException $exception) {
             return;
+        } catch (OrmMappingException $exception) {
+            return;
         }
 
         if ($metadata->hasAssociation($property)) {

Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -81,4 +81,14 @@ public function typesProvider()
             array('notMapped', null),
         );
     }
+
+    public function testGetPropertiesCatchException()
+    {
+        $this->assertNull($this->extractor->getProperties('Not\Exist'));
+    }
+
+    public function testGetTypesCatchException()
+    {
+        $this->assertNull($this->extractor->getTypes('Not\Exist', 'baz'));
+    }
 }