wp/wp-includes/class-wp-error.php
changeset 9 177826044cd9
parent 7 cf61fcea0001
child 16 a86126ab1dd4
--- a/wp/wp-includes/class-wp-error.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-includes/class-wp-error.php	Mon Oct 14 18:28:13 2019 +0200
@@ -52,13 +52,15 @@
 	 * @param mixed $data Optional. Error data.
 	 */
 	public function __construct( $code = '', $message = '', $data = '' ) {
-		if ( empty($code) )
+		if ( empty( $code ) ) {
 			return;
+		}
 
-		$this->errors[$code][] = $message;
+		$this->errors[ $code ][] = $message;
 
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+		if ( ! empty( $data ) ) {
+			$this->error_data[ $code ] = $data;
+		}
 	}
 
 	/**
@@ -69,10 +71,11 @@
 	 * @return array List of error codes, if available.
 	 */
 	public function get_error_codes() {
-		if ( empty($this->errors) )
+		if ( ! $this->has_errors() ) {
 			return array();
+		}
 
-		return array_keys($this->errors);
+		return array_keys( $this->errors );
 	}
 
 	/**
@@ -85,8 +88,9 @@
 	public function get_error_code() {
 		$codes = $this->get_error_codes();
 
-		if ( empty($codes) )
+		if ( empty( $codes ) ) {
 			return '';
+		}
 
 		return $codes[0];
 	}
@@ -99,20 +103,22 @@
 	 * @param string|int $code Optional. Retrieve messages matching code, if exists.
 	 * @return array Error strings on success, or empty array on failure (if using code parameter).
 	 */
-	public function get_error_messages($code = '') {
+	public function get_error_messages( $code = '' ) {
 		// Return all messages if no code specified.
-		if ( empty($code) ) {
+		if ( empty( $code ) ) {
 			$all_messages = array();
-			foreach ( (array) $this->errors as $code => $messages )
-				$all_messages = array_merge($all_messages, $messages);
+			foreach ( (array) $this->errors as $code => $messages ) {
+				$all_messages = array_merge( $all_messages, $messages );
+			}
 
 			return $all_messages;
 		}
 
-		if ( isset($this->errors[$code]) )
-			return $this->errors[$code];
-		else
+		if ( isset( $this->errors[ $code ] ) ) {
+			return $this->errors[ $code ];
+		} else {
 			return array();
+		}
 	}
 
 	/**
@@ -126,12 +132,14 @@
 	 * @param string|int $code Optional. Error code to retrieve message.
 	 * @return string
 	 */
-	public function get_error_message($code = '') {
-		if ( empty($code) )
+	public function get_error_message( $code = '' ) {
+		if ( empty( $code ) ) {
 			$code = $this->get_error_code();
-		$messages = $this->get_error_messages($code);
-		if ( empty($messages) )
+		}
+		$messages = $this->get_error_messages( $code );
+		if ( empty( $messages ) ) {
 			return '';
+		}
 		return $messages[0];
 	}
 
@@ -143,12 +151,28 @@
 	 * @param string|int $code Optional. Error code.
 	 * @return mixed Error data, if it exists.
 	 */
-	public function get_error_data($code = '') {
-		if ( empty($code) )
+	public function get_error_data( $code = '' ) {
+		if ( empty( $code ) ) {
 			$code = $this->get_error_code();
+		}
 
-		if ( isset($this->error_data[$code]) )
-			return $this->error_data[$code];
+		if ( isset( $this->error_data[ $code ] ) ) {
+			return $this->error_data[ $code ];
+		}
+	}
+
+	/**
+	 * Verify if the instance contains errors.
+	 *
+	 * @since 5.1.0
+	 *
+	 * @return bool
+	 */
+	public function has_errors() {
+		if ( ! empty( $this->errors ) ) {
+			return true;
+		}
+		return false;
 	}
 
 	/**
@@ -160,10 +184,11 @@
 	 * @param string $message Error message.
 	 * @param mixed $data Optional. Error data.
 	 */
-	public function add($code, $message, $data = '') {
-		$this->errors[$code][] = $message;
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+	public function add( $code, $message, $data = '' ) {
+		$this->errors[ $code ][] = $message;
+		if ( ! empty( $data ) ) {
+			$this->error_data[ $code ] = $data;
+		}
 	}
 
 	/**
@@ -176,11 +201,12 @@
 	 * @param mixed $data Error data.
 	 * @param string|int $code Error code.
 	 */
-	public function add_data($data, $code = '') {
-		if ( empty($code) )
+	public function add_data( $data, $code = '' ) {
+		if ( empty( $code ) ) {
 			$code = $this->get_error_code();
+		}
 
-		$this->error_data[$code] = $data;
+		$this->error_data[ $code ] = $data;
 	}
 
 	/**