tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR: Dump deprecation notices introduced by the config system to 3.1.0 as it breaks heaps of code

Browse Source
This commit is contained in:
Hamish Friedlander 2012-03-09 17:51:08 +13:00
parent d89544f3f6
commit 05cf5a833b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/Object.php
View File

@ -329,7 +329,7 @@ abstract class Object {
* @return mixed * @return mixed
*/ */
public static function get_static($class, $name, $uncached = false) { public static function get_static($class, $name, $uncached = false) {
Deprecation::notice('3.0.0', 'combined_static is deprecated, replaced by Config#get'); Deprecation::notice('3.1.0', 'combined_static is deprecated, replaced by Config#get');
return Config::inst()->get($class, $name, Config::FIRST_SET); return Config::inst()->get($class, $name, Config::FIRST_SET);
} }
@ -341,7 +341,7 @@ abstract class Object {
* @param mixed $value * @param mixed $value
*/ */
public static function set_static($class, $name, $value) { public static function set_static($class, $name, $value) {
Deprecation::notice('3.0.0', 'set_static is deprecated, replaced by Config#set'); Deprecation::notice('3.1.0', 'set_static is deprecated, replaced by Config#set');
Config::inst()->update($class, $name, $value); Config::inst()->update($class, $name, $value);
} }
@ -358,7 +358,7 @@ abstract class Object {
* @return mixed * @return mixed
*/ */
public static function uninherited_static($class, $name, $uncached = false) { public static function uninherited_static($class, $name, $uncached = false) {
Deprecation::notice('3.0.0', 'uninherited_static is deprecated, replaced by Config#get'); Deprecation::notice('3.1.0', 'uninherited_static is deprecated, replaced by Config#get');
return Config::inst()->get($class, $name, Config::UNINHERITED); return Config::inst()->get($class, $name, Config::UNINHERITED);
} }
@ -375,7 +375,7 @@ abstract class Object {
public static function combined_static($class, $name, $ceiling = false) { public static function combined_static($class, $name, $ceiling = false) {
if ($ceiling) throw new Exception('Ceiling argument to combined_static is no longer supported'); if ($ceiling) throw new Exception('Ceiling argument to combined_static is no longer supported');
Deprecation::notice('3.0.0', 'combined_static is deprecated, replaced by Config#get'); Deprecation::notice('3.1.0', 'combined_static is deprecated, replaced by Config#get');
return Config::inst()->get($class, $name); return Config::inst()->get($class, $name);
} }
@ -387,7 +387,7 @@ abstract class Object {
* @param bool $replace replace existing static vars * @param bool $replace replace existing static vars
*/ */
public static function addStaticVars($class, $properties, $replace = false) { public static function addStaticVars($class, $properties, $replace = false) {
Deprecation::notice('3.0.0', 'addStaticVars is deprecated, replaced by Config#set'); Deprecation::notice('3.1.0', 'addStaticVars is deprecated, replaced by Config#set');
foreach($properties as $prop => $value) self::add_static_var($class, $prop, $value, $replace); foreach($properties as $prop => $value) self::add_static_var($class, $prop, $value, $replace);
} }
@ -408,7 +408,7 @@ abstract class Object {
* @param bool $replace completely replace existing static values * @param bool $replace completely replace existing static values
*/ */
public static function add_static_var($class, $name, $value, $replace = false) { public static function add_static_var($class, $name, $value, $replace = false) {
Deprecation::notice('3.0.0', 'add_static_var is deprecated, replaced by Config#set'); Deprecation::notice('3.1.0', 'add_static_var is deprecated, replaced by Config#set');
if ($replace) Config::inst()->remove($class, $name); if ($replace) Config::inst()->remove($class, $name);
Config::inst()->update($class, $name, $value); Config::inst()->update($class, $name, $value);

2
model/DataExtension.php
View File

@ -42,7 +42,7 @@ abstract class DataExtension extends Extension {
$statics = singleton($extensionClass)->$extraStaticsMethod($class, $extensionClass); $statics = singleton($extensionClass)->$extraStaticsMethod($class, $extensionClass);
if ($statics) { if ($statics) {
Deprecation::notice('3.0.0', "$extraStaticsMethod deprecated. Just define statics on your extension, or use add_to_class"); Deprecation::notice('3.1.0', "$extraStaticsMethod deprecated. Just define statics on your extension, or use add_to_class");
// TODO: This currently makes extraStatics the MOST IMPORTANT config layer, not the least // TODO: This currently makes extraStatics the MOST IMPORTANT config layer, not the least
foreach (self::$extendable_statics as $key => $merge) { foreach (self::$extendable_statics as $key => $merge) {