showAllActionErrors.patch

Martin Kutschker, 2010-06-03 12:52

Download (1.4 kB)

 
Classes/MVC/Controller/ActionController.php (working copy)
364 364
		foreach ($this->argumentsMappingResults->getWarnings() as $warning) {
365 365
			$message .= 'Warning: ' . $warning->getMessage() . PHP_EOL;
366 366
		}
367
		return $message;
367
		return nl2br($message);
368 368
	}
369 369

  
370 370
	/**
Classes/Validation/PropertyError.php (working copy)
92 92
	public function getPropertyName() {
93 93
		return $this->propertyName;
94 94
	}
95

  
96
	/**
97
	 * Returns the error message (incl. nested errors)
98
	 * @return string The error message
99
	 * @api
100
	 */
101
	public function getMessage() {
102
		$messages = array($this->message);
103
		foreach ($this->getErrors() as $error) {
104
			$messages[] = $error->getMessage();
105
		}
106
		return implode('; ', $messages);
107
	}
108

  
109
	/**
110
	 * Converts this error into a string
111
	 *
112
	 * @return string
113
	 * @api
114
	 */
115
	public function __toString() {
116
		$codes = array('#' . $this->code);
117
		foreach ($this->getErrors() as $error) {
118
			$codes[] = '#' . $error->getCode();
119
		}
120

  
121
		return $this->message . ' (' . implode(', ', $codes) . ')';
122
	}
95 123
}
96 124

  
97 125
?>