Merge branch '5.x' into feature/attr

composer.json

@@ -165,7 +165,7 @@
         "toflar/psr6-symfony-http-cache-store": "^4.0",
         "twig/extra-bundle": "^3.0",
         "twig/string-extra": "^3.0",
-        "twig/twig": "^3.8",
+        "twig/twig": "^3.10.2",
         "ua-parser/uap-php": "^3.9",
         "webignition/robots-txt-file": "^3.0",
         "wikimedia/less.php": "^1.7"
@@ -202,8 +202,6 @@
         "nikic/php-parser": "4.7.0",
         "terminal42/contao-ce-access": "<3.0",
         "thecodingmachine/safe": "<1.2",
-        "twig/intl-extra": "3.9.0",
-        "twig/twig": "3.9.0 || 3.10.0 || 3.10.1",
         "zendframework/zend-code": "<3.3.1"
     },
     "autoload": {

core-bundle/composer.json

@@ -151,7 +151,7 @@
         "terminal42/service-annotation-bundle": "^1.1",
         "toflar/cronjob-supervisor": "^2.0",
         "twig/string-extra": "^3.0",
-        "twig/twig": "^3.8",
+        "twig/twig": "^3.10.2",
         "ua-parser/uap-php": "^3.9",
         "webignition/robots-txt-file": "^3.0",
         "wikimedia/less.php": "^1.7"
@@ -179,9 +179,7 @@
         "contao/manager-plugin": "<2.0 || >=3.0",
         "doctrine/cache": "<1.10",
         "terminal42/contao-ce-access": "<3.0",
-        "thecodingmachine/safe": "<1.2",
-        "twig/intl-extra": "3.9.0",
-        "twig/twig": "3.9.0 || 3.10.0 || 3.10.1"
+        "thecodingmachine/safe": "<1.2"
     },
     "autoload": {
         "psr-4": {

core-bundle/config/routes.yaml

@@ -11,21 +11,7 @@ contao_backend_redirect:
     path: '%contao.backend.route_prefix%/'
     defaults:
         _scope: backend
+        _store_referrer: false
         _controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
         route: contao_backend
         permanent: true
-
-contao_backend_fallback:
-    path: '%contao.backend.route_prefix%/{parameters}'
-    defaults:
-        _scope: backend
-        _controller: Symfony\Bundle\FrameworkBundle\Controller\TemplateController
-        template: '@ContaoCore\Error\backend.html.twig'
-        context:
-            template: '@ContaoCore\Error\backend.html.twig'
-            language: en
-            statusName: Page Not Found
-            exception: The requested page does not exist.
-        statusCode: 404
-    requirements:
-        parameters: .*

core-bundle/config/services.yaml

@@ -579,8 +579,6 @@ services:
         class: Contao\CoreBundle\Monolog\ContaoTableHandler
         arguments:
             - !service_closure '@database_connection'
-            - debug
-            - false
         tags:
             - { name: monolog.logger, channel: contao }
 

core-bundle/contao/drivers/DC_File.php

@@ -185,7 +185,7 @@ public function edit()
 					}
 				}
 
-				$return .= "\n\n" . '<fieldset class="' . $class . ($legend ? '' : ' nolegend') . '" data-controller="contao--toggle-fieldset" data-contao--toggle-fieldset-id-value="' . $key . '" data-contao--toggle-fieldset-table-value="' . $this->strTable . '" data-contao--toggle-fieldset-collapsed-class="collapsed" data-contao--jump-targets-target="section" data-contao--jump-targets-label-value="' . ($GLOBALS['TL_LANG'][$this->strTable][$key] ?? $key) . '" data-action="contao--jump-targets:scrollto->contao--toggle-fieldset#open">' . $legend;
+				$return .= "\n\n" . '<fieldset class="' . $class . ($legend ? '' : ' nolegend') . '" data-controller="contao--toggle-fieldset" data-contao--toggle-fieldset-id-value="' . $key . '" data-contao--toggle-fieldset-table-value="' . $this->strTable . '" data-contao--toggle-fieldset-collapsed-class="collapsed" data-contao--jump-targets-target="section" data-contao--jump-targets-label-value="' . ($GLOBALS['TL_LANG'][$this->strTable][$key] ?? $key) . '" data-action="contao--jump-targets:scrollto->contao--toggle-fieldset#open">' . $legend . "\n" . '<div class="widget-group">';
 
 				// Build rows of the current box
 				foreach ($v as $vv)
@@ -207,7 +207,7 @@ public function edit()
 					{
 						$thisId = 'sub_' . substr($vv, 1, -1);
 						$blnAjax = $ajaxId == $thisId && Environment::get('isAjaxRequest');
-						$return .= "\n  " . '<div id="' . $thisId . '" class="subpal cf">';
+						$return .= "\n  " . '<div id="' . $thisId . '" class="subpal widget-group">';
 
 						continue;
 					}
@@ -246,7 +246,7 @@ public function edit()
 				}
 
 				$class = 'tl_box';
-				$return .= "\n" . '</fieldset>';
+				$return .= "\n</div>\n</fieldset>";
 			}
 		}
 

core-bundle/contao/drivers/DC_Table.php

@@ -1139,7 +1139,7 @@ protected function copyChildren($table, $insertID, $id, $parentId)
 			$this->loadDataContainer($v);
 			$cctable[$v] = $GLOBALS['TL_DCA'][$v]['config']['ctable'] ?? null;
 
-			if (!($GLOBALS['TL_DCA'][$v]['config']['doNotCopyRecords'] ?? null) && \strlen($v))
+			if (!($GLOBALS['TL_DCA'][$v]['config']['doNotCopyRecords'] ?? null))
 			{
 				// Consider the dynamic parent table (see #4867)
 				if ($GLOBALS['TL_DCA'][$v]['config']['dynamicPtable'] ?? null)
@@ -2060,7 +2060,7 @@ public function edit($intId=null, $ajaxId=null)
 					}
 				}
 
-				$return .= "\n\n" . '<fieldset class="' . $class . ($legend ? '' : ' nolegend') . '" data-controller="contao--toggle-fieldset" data-contao--toggle-fieldset-id-value="' . $key . '" data-contao--toggle-fieldset-table-value="' . $this->strTable . '" data-contao--toggle-fieldset-collapsed-class="collapsed" data-contao--jump-targets-target="section" data-contao--jump-targets-label-value="' . ($GLOBALS['TL_LANG'][$this->strTable][$key] ?? $key) . '" data-action="contao--jump-targets:scrollto->contao--toggle-fieldset#open">' . $legend;
+				$return .= "\n\n" . '<fieldset class="' . $class . ($legend ? '' : ' nolegend') . '" data-controller="contao--toggle-fieldset" data-contao--toggle-fieldset-id-value="' . $key . '" data-contao--toggle-fieldset-table-value="' . $this->strTable . '" data-contao--toggle-fieldset-collapsed-class="collapsed" data-contao--jump-targets-target="section" data-contao--jump-targets-label-value="' . ($GLOBALS['TL_LANG'][$this->strTable][$key] ?? $key) . '" data-action="contao--jump-targets:scrollto->contao--toggle-fieldset#open">' . $legend . "\n" . '<div class="widget-group">';
 				$thisId = '';
 
 				// Build rows of the current box
@@ -2082,7 +2082,7 @@ public function edit($intId=null, $ajaxId=null)
 
 							if (\count($arrAjax) > 1)
 							{
-								$current = "\n" . '<div id="' . $thisId . '" class="subpal cf">' . $arrAjax[$thisId] . '</div>';
+								$current = "\n" . '<div id="' . $thisId . '" class="subpal widget-group">' . $arrAjax[$thisId] . '</div>';
 								unset($arrAjax[$thisId]);
 								end($arrAjax);
 								$thisId = key($arrAjax);
@@ -2100,7 +2100,7 @@ public function edit($intId=null, $ajaxId=null)
 						$thisId = 'sub_' . substr($vv, 1, -1);
 						$arrAjax[$thisId] = '';
 						$blnAjax = ($ajaxId == $thisId && Environment::get('isAjaxRequest')) ? true : $blnAjax;
-						$return .= "\n" . '<div id="' . $thisId . '" class="subpal cf">';
+						$return .= "\n" . '<div id="' . $thisId . '" class="subpal widget-group">';
 
 						continue;
 					}
@@ -2139,7 +2139,7 @@ public function edit($intId=null, $ajaxId=null)
 				}
 
 				$class = 'tl_box';
-				$return .= "\n" . '</fieldset>';
+				$return .= "\n</div>\n</fieldset>";
 			}
 
 			$this->submit();
@@ -2598,7 +2598,7 @@ public function editAll($intId=null, $ajaxId=null)
 							$thisId = 'sub_' . substr($v, 1, -1) . '_' . $id;
 							$arrAjax[$thisId] = '';
 							$blnAjax = ($ajaxId == $thisId && Environment::get('isAjaxRequest')) ? true : $blnAjax;
-							$box .= "\n  " . '<div id="' . $thisId . '" class="subpal cf">';
+							$box .= "\n  " . '<div id="' . $thisId . '" class="subpal widget-group">';
 
 							continue;
 						}

core-bundle/contao/themes/flexible/entrypoints.json

@@ -2,37 +2,37 @@
   "entrypoints": {
     "backend": {
       "css": [
-        "/system/themes/flexible/backend.49ffe8ed.css"
+        "/system/themes/flexible/backend.923b0a1c.css"
       ]
     },
     "confirm": {
       "css": [
-        "/system/themes/flexible/confirm.c2996dd4.css"
+        "/system/themes/flexible/confirm.2e8667ed.css"
       ]
     },
     "conflict": {
       "css": [
-        "/system/themes/flexible/conflict.aa6b9c95.css"
+        "/system/themes/flexible/conflict.cdaccaa5.css"
       ]
     },
     "diff": {
       "css": [
-        "/system/themes/flexible/diff.171af75f.css"
+        "/system/themes/flexible/diff.8f1ee824.css"
       ]
     },
     "help": {
       "css": [
-        "/system/themes/flexible/help.2ee3bcf2.css"
+        "/system/themes/flexible/help.30a878a8.css"
       ]
     },
     "login": {
       "css": [
-        "/system/themes/flexible/login.fb2833be.css"
+        "/system/themes/flexible/login.7961a102.css"
       ]
     },
     "popup": {
       "css": [
-        "/system/themes/flexible/popup.4728c2fc.css"
+        "/system/themes/flexible/popup.c31b3e16.css"
       ]
     },
     "tinymce": {

core-bundle/contao/themes/flexible/manifest.json

@@ -1,20 +1,20 @@
 {
-  "backend.css": "/system/themes/flexible/backend.49ffe8ed.css",
-  "confirm.css": "/system/themes/flexible/confirm.c2996dd4.css",
-  "conflict.css": "/system/themes/flexible/conflict.aa6b9c95.css",
-  "diff.css": "/system/themes/flexible/diff.171af75f.css",
-  "help.css": "/system/themes/flexible/help.2ee3bcf2.css",
-  "login.css": "/system/themes/flexible/login.fb2833be.css",
-  "popup.css": "/system/themes/flexible/popup.4728c2fc.css",
+  "backend.css": "/system/themes/flexible/backend.923b0a1c.css",
+  "confirm.css": "/system/themes/flexible/confirm.2e8667ed.css",
+  "conflict.css": "/system/themes/flexible/conflict.cdaccaa5.css",
+  "diff.css": "/system/themes/flexible/diff.8f1ee824.css",
+  "help.css": "/system/themes/flexible/help.30a878a8.css",
+  "login.css": "/system/themes/flexible/login.7961a102.css",
+  "popup.css": "/system/themes/flexible/popup.c31b3e16.css",
   "tinymce.css": "/system/themes/flexible/tinymce.e5009f94.css",
   "tinymce-dark.css": "/system/themes/flexible/tinymce-dark.596023db.css",
-  "backend.49ffe8ed.css.map": "/system/themes/flexible/backend.49ffe8ed.css.map",
-  "confirm.c2996dd4.css.map": "/system/themes/flexible/confirm.c2996dd4.css.map",
-  "conflict.aa6b9c95.css.map": "/system/themes/flexible/conflict.aa6b9c95.css.map",
-  "diff.171af75f.css.map": "/system/themes/flexible/diff.171af75f.css.map",
-  "help.2ee3bcf2.css.map": "/system/themes/flexible/help.2ee3bcf2.css.map",
-  "login.fb2833be.css.map": "/system/themes/flexible/login.fb2833be.css.map",
-  "popup.4728c2fc.css.map": "/system/themes/flexible/popup.4728c2fc.css.map",
+  "backend.923b0a1c.css.map": "/system/themes/flexible/backend.923b0a1c.css.map",
+  "confirm.2e8667ed.css.map": "/system/themes/flexible/confirm.2e8667ed.css.map",
+  "conflict.cdaccaa5.css.map": "/system/themes/flexible/conflict.cdaccaa5.css.map",
+  "diff.8f1ee824.css.map": "/system/themes/flexible/diff.8f1ee824.css.map",
+  "help.30a878a8.css.map": "/system/themes/flexible/help.30a878a8.css.map",
+  "login.7961a102.css.map": "/system/themes/flexible/login.7961a102.css.map",
+  "popup.c31b3e16.css.map": "/system/themes/flexible/popup.c31b3e16.css.map",
   "tinymce.e5009f94.css.map": "/system/themes/flexible/tinymce.e5009f94.css.map",
   "tinymce-dark.596023db.css.map": "/system/themes/flexible/tinymce-dark.596023db.css.map"
 }