Fix merge

symfony · Oct 27, 2015 · aa2673b · aa2673b
1 parent 765e06c
commit aa2673b
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/src/Symfony/Component/Form/Tests/FormRegistryTest.php b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
@@ -245,30 +245,6 @@ public function testGetTypeConnectsParentIfGetParentReturnsInstance()
         $this->assertSame($resolvedType, $this->registry->getType('foo_sub_type_parent_instance'));
     }
 
-    /**
-     * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
-     */
-    public function testGetTypeThrowsExceptionIfParentNotFound()
-    {
-        $type = new FooSubType();
-
-        $this->extension1->addType($type);
-
-        $this->registry->getType($type);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
-     */
-    public function testLegacyGetTypeThrowsExceptionIfParentNotFound()
-    {
-        $type = new LegacyFooSubType();
-
-        $this->extension1->addType($type);
-
-        $this->registry->getType($type);
-    }
-
     /**
      * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
      */