symfony · T-Philipp · Aug 14, 2014 · Aug 8, 2014 · Aug 18, 2014 · Aug 15, 2014
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor/
 composer.lock
+phpunit.xml
diff --git a/AbstractExtension.php b/AbstractExtension.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form;
 
-use Symfony\Component\Form\Exception\FormException;
+use Symfony\Component\Form\Exception\InvalidArgumentException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
@@ -20,26 +20,30 @@
 abstract class AbstractExtension implements FormExtensionInterface
 {
     /**
-     * The types provided by this extension
-     * @var array An array of FormTypeInterface
+     * The types provided by this extension.
+     *
+     * @var FormTypeInterface[] An array of FormTypeInterface
      */
     private $types;
 
     /**
-     * The type extensions provided by this extension
-     * @var array An array of FormTypeExtensionInterface
+     * The type extensions provided by this extension.
+     *
+     * @var FormTypeExtensionInterface[] An array of FormTypeExtensionInterface
      */
     private $typeExtensions;
 
     /**
-     * The type guesser provided by this extension
+     * The type guesser provided by this extension.
+     *
      * @var FormTypeGuesserInterface
      */
     private $typeGuesser;
 
     /**
-     * Whether the type guesser has been loaded
-     * @var Boolean
+     * Whether the type guesser has been loaded.
+     *
+     * @var bool
      */
     private $typeGuesserLoaded = false;
 
@@ -53,7 +57,7 @@ public function getType($name)
         }
 
         if (!isset($this->types[$name])) {
-            throw new FormException(sprintf('The type "%s" can not be loaded by this extension', $name));
+            throw new InvalidArgumentException(sprintf('The type "%s" can not be loaded by this extension', $name));
         }
 
         return $this->types[$name];
@@ -112,7 +116,7 @@ public function getTypeGuesser()
     /**
      * Registers the types.
      *
-     * @return array An array of FormTypeInterface instances
+     * @return FormTypeInterface[] An array of FormTypeInterface instances
      */
     protected function loadTypes()
     {
@@ -122,7 +126,7 @@ protected function loadTypes()
     /**
      * Registers the type extensions.
      *
-     * @return array An array of FormTypeExtensionInterface instances
+     * @return FormTypeExtensionInterface[] An array of FormTypeExtensionInterface instances
      */
     protected function loadTypeExtensions()
     {
@@ -136,7 +140,6 @@ protected function loadTypeExtensions()
      */
     protected function loadTypeGuesser()
     {
-        return null;
     }
 
     /**

diff --git a/AbstractRendererEngine.php b/AbstractRendererEngine.php
@@ -67,8 +67,7 @@ public function setTheme(FormView $view, $themes)
         // Unset instead of resetting to an empty array, in order to allow
         // implementations (like TwigRendererEngine) to check whether $cacheKey
         // is set at all.
-        unset($this->resources[$cacheKey]);
-        unset($this->resourceHierarchyLevels[$cacheKey]);
+        unset($this->resources[$cacheKey], $this->resourceHierarchyLevels[$cacheKey]);
     }
 
     /**
@@ -131,7 +130,7 @@ public function getResourceHierarchyLevel(FormView $view, array $blockNameHierar
      * @param FormView $view      The form view for finding the applying themes.
      * @param string   $blockName The name of the block to load.
      *
-     * @return Boolean True if the resource could be loaded, false otherwise.
+     * @return bool True if the resource could be loaded, false otherwise.
      */
     abstract protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName);
 
@@ -146,10 +145,10 @@ abstract protected function loadResourceForBlockName($cacheKey, FormView $view,
      *                                     themes.
      * @param array    $blockNameHierarchy The block hierarchy, with the most
      *                                     specific block name at the end.
-     * @param integer  $hierarchyLevel     The level in the block hierarchy that
+     * @param int      $hierarchyLevel     The level in the block hierarchy that
      *                                     should be loaded.
      *
-     * @return Boolean True if the resource could be loaded, false otherwise.
+     * @return bool True if the resource could be loaded, false otherwise.
      */
     private function loadResourceForBlockNameHierarchy($cacheKey, FormView $view, array $blockNameHierarchy, $hierarchyLevel)
     {

diff --git a/AbstractType.php b/AbstractType.php
@@ -18,13 +18,6 @@
  */
 abstract class AbstractType implements FormTypeInterface
 {
-    /**
-     * @var array
-     *
-     * @deprecated Deprecated since version 2.1, to be removed in 2.3.
-     */
-    private $extensions = array();
-
     /**
      * {@inheritdoc}
      */
@@ -51,38 +44,6 @@ public function finishView(FormView $view, FormInterface $form, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults($this->getDefaultOptions(array()));
-        $resolver->addAllowedValues($this->getAllowedOptionValues(array()));
-    }
-
-    /**
-     * Returns the default options for this type.
-     *
-     * @param array $options Unsupported as of Symfony 2.1.
-     *
-     * @return array The default options
-     *
-     * @deprecated Deprecated since version 2.1, to be removed in 2.3.
-     *             Use {@link setDefaultOptions()} instead.
-     */
-    public function getDefaultOptions(array $options)
-    {
-        return array();
-    }
-
-    /**
-     * Returns the allowed option values for each option (if any).
-     *
-     * @param array $options Unsupported as of Symfony 2.1.
-     *
-     * @return array The allowed option values
-     *
-     * @deprecated Deprecated since version 2.1, to be removed in 2.3.
-     *             Use {@link setDefaultOptions()} instead.
-     */
-    public function getAllowedOptionValues(array $options)
-    {
-        return array();
     }
 
     /**
@@ -92,31 +53,4 @@ public function getParent()
     {
         return 'form';
     }
-
-    /**
-     * Sets the extensions for this type.
-     *
-     * @param array $extensions An array of FormTypeExtensionInterface
-     *
-     * @throws Exception\UnexpectedTypeException if any extension does not implement FormTypeExtensionInterface
-     *
-     * @deprecated Deprecated since version 2.1, to be removed in 2.3.
-     */
-    public function setExtensions(array $extensions)
-    {
-        $this->extensions = $extensions;
-    }
-
-    /**
-     * Returns the extensions associated with this type.
-     *
-     * @return array An array of FormTypeExtensionInterface
-     *
-     * @deprecated Deprecated since version 2.1, to be removed in 2.3. Use
-     *             {@link ResolvedFormTypeInterface::getTypeExtensions()} instead.
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
 }
diff --git a/AbstractTypeExtension.php b/AbstractTypeExtension.php
@@ -44,33 +44,5 @@ public function finishView(FormView $view, FormInterface $form, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults($this->getDefaultOptions());
-        $resolver->addAllowedValues($this->getAllowedOptionValues());
-    }
-
-    /**
-     * Overrides the default options form the extended type.
-     *
-     * @return array
-     *
-     * @deprecated Deprecated since version 2.1, to be removed in 2.3.
-     *             Use {@link setDefaultOptions()} instead.
-     */
-    public function getDefaultOptions()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the allowed option values for each option (if any).
-     *
-     * @return array The allowed option values
-     *
-     * @deprecated Deprecated since version 2.1, to be removed in 2.3.
-     *             Use {@link setDefaultOptions()} instead.
-     */
-    public function getAllowedOptionValues()
-    {
-        return array();
     }
 }