feature #16687 [Form] Deprecated TimezoneType::getTimezones() (webmozart)

fabpot · fabpot · commit 6dacdc4ebd4a · 2015-11-27T10:01:47.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Form] Deprecated TimezoneType::getTimezones() | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This method is useless as of #16681. It needs to be deprecated before we can remove it since it is public. Commits ------- 41df3fc [Form] Deprecated TimezoneType::getTimezones()
diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md
@@ -251,6 +251,9 @@ Form
        <tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\TextType" />
    </service>
    ```
+   
+ * The `TimezoneType::getTimezones()` method was deprecated and will be removed
+   in Symfony 3.0. You should not use this method.
 
 Translator
 ----------
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -311,6 +311,9 @@ UPGRADE FROM 2.x to 3.0
 
  * The `Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList` class has been removed in
    favor of `Symfony\Component\Form\ChoiceList\ArrayChoiceList`.
+   
+ * The `TimezoneType::getTimezones()` method was removed. You should not use 
+   this method.
 
 ### FrameworkBundle
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -75,9 +75,13 @@ public function getBlockPrefix()
      * overhead.
      *
      * @return array The timezone choices
+     *
+     * @deprecated Deprecated since version 2.8
      */
     public static function getTimezones()
     {
+        @trigger_error('The TimezoneType::getTimezones() method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+
         if (null === static::$timezones) {
             static::$timezones = array();
 

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,13 @@ public function getBlockPrefix()`
`75`	`75`	`* overhead.`
`76`	`76`	`*`
`77`	`77`	`* @return array The timezone choices`
	`78`	`+ *`
	`79`	`+ * @deprecated Deprecated since version 2.8`
`78`	`80`	`*/`
`79`	`81`	`public static function getTimezones()`
`80`	`82`	`{`
	`83`	`+ @trigger_error('The TimezoneType::getTimezones() method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`84`	`+`
`81`	`85`	`if (null === static::$timezones) {`
`82`	`86`	`static::$timezones = array();`
`83`	`87`