Throw a E_USER_NOTICE on use of deprecated functions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47306 467b73ca-7a2a-4603-9d3b-597d59a354a9

core/Convert.php

@@ -279,27 +279,40 @@ class Convert extends Object {
 	 *
 	 * @param  $val the string you wish to convert
 	 * @return the HTML version of the string
+	 * @deprecated
 	 */
 	static function raw2html($val) {
-		user_error("Convert::raw2html is deprecated.  Used Convert::raw2xml instead", E_USER_WARNING);
+		user_error("Convert::raw2html is deprecated.  Used Convert::raw2xml instead", E_USER_NOTICE);
 		return self::raw2xml($val);
 	}
-
+	
+	/**
+	 * @deprecated
+	 */
 	static function html2plain($val){
-		user_error("html2plain is deprecated.  Use xml2raw instead.", E_USER_WARNING);
+		user_error("html2plain is deprecated.  Use xml2raw instead.", E_USER_NOTICE);
 		return self::html2raw($val);
 	}
-
+	
+	/**
+	 * @deprecated
+	 */
 	static function html2text($val, $preserveLinks = false) {
-		user_error("html2text is deprecated.  Use xml2raw instead.", E_USER_WARNING);
+		user_error("html2text is deprecated.  Use xml2raw instead.", E_USER_NOTICE);
 		return self::html2raw($val);
 	}
-
+	
+	/**
+	 * @deprecated
+	 */
 	static function raw2reserveNL($val){
-		user_error("Convert::raw2reserveNL is deprecated.  Used Convert::raw2xml instead", E_USER_WARNING);
+		user_error("Convert::raw2reserveNL is deprecated.  Used Convert::raw2xml instead", E_USER_NOTICE);
 		return self::raw2xml($val);
 	}
-
+	
+	/**
+	 * @deprecated
+	 */
 	static function raw2attr($val) {
 		user_error("raw2attr is deprecated.  Use raw2att instead.", E_USER_WARNING);
 		return self::raw2att($val);

core/Debug.php

@@ -214,9 +214,10 @@ class Debug {
 
 	/**
 	 * Deprecated.  Send live errors and warnings to the given address.
-	 * Use send_errors_to() instead.
+	 * @deprecated Use send_errors_to() instead.
 	 */
 	static function sendLiveErrorsTo($emailAddress) {
+		user_error('Debug::sendLiveErrorsTo() is deprecated. Use Director::send_errors_to() instead.', E_USER_NOTICE);
 		if(!Director::isDev()) self::send_errors_to($emailAddress, true);
 	}
 	

core/control/Controller.php

@@ -311,10 +311,11 @@ class Controller extends ViewableData {
 	}
 
 	/**
-	 * Deprecated - use Controller::curr() instead
+	 * @deprecated use Controller::curr() instead
 	 * @returns Controller
 	 */
 	public static function currentController() {
+		user_error('Controller::currentController() is deprecated. Use Controller::curr() instead.', E_USER_NOTICE);
 		return self::curr();
 	}
 	

core/control/Director.php

@@ -506,11 +506,28 @@ class Director {
 	}
 
 	/**
-	 * @todo These functions are deprecated, let's use isLive isDev and isTest instead.
+	 * @deprecated use isDev() instead
 	 */
-	function isDevMode() { return self::isDev(); }
+	function isDevMode() {
-	function isTestMode() { return self::isTest(); }
+		user_error('Director::isDevMode() is deprecated. Use Director::isDev() instead.', E_USER_NOTICE);
-	function isLiveMode() { return self::isLive(); }
+		return self::isDev();
+	}
+	
+	/**
+	 * @deprecated use isTest() instead
+	 */
+	function isTestMode() {
+		user_error('Director::isTestMode() is deprecated. Use Director::isTest() instead.', E_USER_NOTICE);
+		return self::isTest();
+	}
+	
+	/**
+	 * @deprecated use isLive() instead
+	 */
+	function isLiveMode() {
+		user_error('Director::isLiveMode() is deprecated. Use Director::isLive() instead.', E_USER_NOTICE);
+		return self::isLive();
+	}
 
 }
 

core/model/DataObjectSet.php

@@ -386,6 +386,7 @@ class DataObjectSet extends ViewableData implements Iterator {
 	* @deprecated Use merge()
     */
 	public function append(DataObjectSet $doset){
+		user_error('DataObjectSet::append() is deprecated. Use DataObjectSet::merge() instead.', E_USER_NOTICE);
 		foreach($doset as $item){
 			$this->push($item);
 		}

core/model/fieldtypes/Datetime.php

@@ -2,6 +2,10 @@
 
 if(!class_exists('Datetime')) {
 	class Datetime extends Date {
+		function __construct($name) {
+			user_error('Datetime is deprecated. Use SSDatetime instead.', E_USER_NOTICE);
+			parent::__construct($name);
+		}
 		
 		function setValue($value) {
 			if($value) $this->value = date('Y-m-d H:i:s', strtotime($value));

forms/FormField.php

@@ -393,9 +393,10 @@ HTML;
 	// ###################
 	
 	/**
-	 * DEPRECATED Please use addExtraClass
+	 * @deprecated please use addExtraClass
 	 */
-	function setExtraClass($extraClass){
+	function setExtraClass($extraClass) {
+		user_error('FormField::setExtraClass() is deprecated. Use FormField::addExtraClass() instead.', E_USER_NOTICE);
 		$this->extraClasses[] = $extraClass;
 	}
 }