Merge branch '2.7' into 2.8

* 2.7:
  Fix getMock usage

Author: nicolas-grekas

src/Symfony/Component/Form/Tests/FormRegistryTest.php

@@ -159,6 +159,9 @@ public function testGetTypeWithTypeExtensions()
         $this->assertSame($resolvedType, $this->registry->getType(get_class($type)));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetTypeWithTypeExtensions()
     {
         $type = new LegacyFooType();
@@ -201,6 +204,9 @@ public function testGetTypeConnectsParent()
         $this->assertSame($resolvedType, $this->registry->getType(get_class($type)));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetTypeConnectsParent()
     {
         $parentType = new LegacyFooType();
@@ -286,6 +292,9 @@ public function testDoesNotHaveTypeIfNoFormType()
         $this->assertFalse($this->registry->hasType('stdClass'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyHasTypeAfterLoadingFromExtension()
     {
         $type = new LegacyFooType();

src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php

@@ -150,7 +150,7 @@ public function testReadMetadataFromCache()
 
     public function testMetadataCacheWithRuntimeConstraint()
     {
-        $cache = $this->getMock('Symfony\Component\Validator\Mapping\Cache\CacheInterface');
+        $cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
         $factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);
 
         $cache