From 2e124156496db68a90862c2a0c60c4b4e5a2a040 Mon Sep 17 00:00:00 2001
From: Evgeniy Sokolov <ewgraf@gmail.com>
Date: Fri, 19 Jun 2015 22:10:10 +0200
Subject: [PATCH] Fix OptionsResolverInterface tests

---
 .../Form/Tests/AbstractExtensionTest.php      | 11 ----
 .../Tests/Fixtures/CustomOptionsResolver.php  | 65 -------------------
 .../Component/Form/Tests/SimpleFormTest.php   | 11 ----
 3 files changed, 87 deletions(-)
 delete mode 100644 src/Symfony/Component/Form/Tests/Fixtures/CustomOptionsResolver.php

diff --git a/src/Symfony/Component/Form/Tests/AbstractExtensionTest.php b/src/Symfony/Component/Form/Tests/AbstractExtensionTest.php
index b1534db3ab..c16cb22121 100644
--- a/src/Symfony/Component/Form/Tests/AbstractExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractExtensionTest.php
@@ -28,17 +28,6 @@ class AbstractExtensionTest extends \PHPUnit_Framework_TestCase
         $loader = new ConcreteExtension();
         $this->assertInstanceOf('Symfony\Component\Form\Tests\Fixtures\FooType', $loader->getType('foo'));
     }
-
-    /**
-     * @expectedException        \InvalidArgumentException
-     * @expectedExceptionMessage Custom resolver "Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver" must extend "Symfony\Component\OptionsResolver\OptionsResolver".
-     */
-    public function testCustomOptionsResolver()
-    {
-        $extension = new Fixtures\FooTypeBarExtension();
-        $resolver = new Fixtures\CustomOptionsResolver();
-        $extension->setDefaultOptions($resolver);
-    }
 }
 
 class ConcreteExtension extends AbstractExtension
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/CustomOptionsResolver.php b/src/Symfony/Component/Form/Tests/Fixtures/CustomOptionsResolver.php
deleted file mode 100644
index 3505b0c283..0000000000
--- a/src/Symfony/Component/Form/Tests/Fixtures/CustomOptionsResolver.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\Tests\Fixtures;
-
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-
-class CustomOptionsResolver implements OptionsResolverInterface
-{
-    public function setDefaults(array $defaultValues)
-    {
-    }
-
-    public function replaceDefaults(array $defaultValues)
-    {
-    }
-
-    public function setOptional(array $optionNames)
-    {
-    }
-
-    public function setRequired($optionNames)
-    {
-    }
-
-    public function setAllowedValues($allowedValues)
-    {
-    }
-
-    public function addAllowedValues($allowedValues)
-    {
-    }
-
-    public function setAllowedTypes($allowedTypes)
-    {
-    }
-
-    public function addAllowedTypes($allowedTypes)
-    {
-    }
-
-    public function setNormalizers(array $normalizers)
-    {
-    }
-
-    public function isKnown($option)
-    {
-    }
-
-    public function isRequired($option)
-    {
-    }
-
-    public function resolve(array $options = array())
-    {
-    }
-}
diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
index b0912bd826..34ef0d7435 100644
--- a/src/Symfony/Component/Form/Tests/SimpleFormTest.php
+++ b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -1052,17 +1052,6 @@ class SimpleFormTest extends AbstractFormTest
         $child->initialize();
     }
 
-    /**
-     * @expectedException        \InvalidArgumentException
-     * @expectedExceptionMessage Custom resolver "Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver" must extend "Symfony\Component\OptionsResolver\OptionsResolver".
-     */
-    public function testCustomOptionsResolver()
-    {
-        $fooType = new Fixtures\FooType();
-        $resolver = new Fixtures\CustomOptionsResolver();
-        $fooType->setDefaultOptions($resolver);
-    }
-
     protected function createForm()
     {
         return $this->getBuilder()->getForm();