Merge branch '5.x' into feature/ajax-form

core-bundle/contao/forms/Form.php

@@ -64,6 +64,11 @@ class Form extends Hybrid
 	 */
 	protected $strTemplate = 'form_wrapper';
 
+	/**
+	 * @var array<string>
+	 */
+	private array $errors = array();
+
 	/**
 	 * Remove name attributes in the back end so the form is not validated
 	 *
@@ -101,6 +106,36 @@ public function generate()
 		return parent::generate();
 	}
 
+	/**
+	 * @return array<string>
+	 */
+	public function getErrors(): array
+	{
+		return $this->errors;
+	}
+
+	public function hasErrors(): bool
+	{
+		return !empty($this->errors);
+	}
+
+	/**
+	 * @param array<string> $errors
+	 */
+	public function setErrors(array $errors): self
+	{
+		$this->errors = $errors;
+
+		return $this;
+	}
+
+	public function addError(string $error): self
+	{
+		$this->errors[] = $error;
+
+		return $this;
+	}
+
 	/**
 	 * Generate the form
 	 */
@@ -267,7 +302,7 @@ protected function compile()
 		}
 
 		// Remove any uploads, if form did not validate (#1185)
-		if ($doNotSubmit && $hasUpload)
+		if (($doNotSubmit || $this->hasErrors()) && $hasUpload)
 		{
 			foreach ($arrFiles as $upload)
 			{
@@ -285,7 +320,7 @@ protected function compile()
 
 		// Add a warning to the page title
 		if (
-			$doNotSubmit
+			($doNotSubmit || $this->hasErrors())
 			&& !Environment::get('isAjaxRequest')
 			&& ($responseContext = System::getContainer()->get('contao.routing.response_context_accessor')->getResponseContext())
 			&& $responseContext->has(HtmlHeadBag::class)
@@ -308,7 +343,8 @@ protected function compile()
 			$strAttributes .= ' class="' . $arrAttributes[1] . '"';
 		}
 
-		$this->Template->hasError = $doNotSubmit;
+		$this->Template->hasError = $doNotSubmit || $this->hasErrors();
+		$this->Template->errors = $this->getErrors();
 		$this->Template->attributes = $strAttributes;
 		$this->Template->enctype = $hasUpload ? 'multipart/form-data' : 'application/x-www-form-urlencoded';
 		$this->Template->maxFileSize = $hasUpload ? $this->objModel->getMaxUploadFileSize() : false;
@@ -596,6 +632,11 @@ protected function processFormData($arrSubmitted, $arrLabels, $arrFields, $arrFi
 			System::getContainer()->get('monolog.logger.contao.forms')->info('Form "' . $this->title . '" has been submitted by a guest.');
 		}
 
+		if ($this->hasErrors())
+		{
+			return;
+		}
+
 		$targetPageData = null;
 
 		// Check whether there is a jumpTo page

core-bundle/contao/templates/forms/form_wrapper.html5

@@ -11,6 +11,7 @@
   <?php else: ?>
     <?php $this->insert('form_inline', $this->arrData) ?>
   <?php endif; ?>
+
 </div>
 <!-- indexer::continue -->