Ignore config file exceptions in install tool

madeyourday · Apr 14, 2021 · 2f8d2c2 · 2f8d2c2
1 parent 447fa19
commit 2f8d2c2
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/CustomElements.php b/src/CustomElements.php
@@ -1393,6 +1393,7 @@ function ($count) {
 			}
 		}
 
+		$saveToCache = true;
 		$elements = array();
 
 		foreach ($templates as $template => $label) {
@@ -1422,7 +1423,19 @@ function ($count) {
 				}
 			}
 
-			$config = include $configPath;
+			try {
+				$config = include $configPath;
+			}
+			catch (\Throwable $exception) {
+				$request = System::getContainer()->get('request_stack')->getCurrentRequest();
+
+				if ($request && $request->get('_route') === 'contao_install') {
+					$saveToCache = false;
+					continue;
+				}
+
+				throw $exception;
+			}
 
 			$element = array(
 				'config' => $config,
@@ -1521,6 +1534,10 @@ function ($count) {
 
 		}
 
+		if (!$saveToCache) {
+			return;
+		}
+
 		$file = new \File($filePaths['path'], true);
 		$file->write(implode("\n", $contents));
 		$file->close();