Merge branch '4.4' into 4.9

# Conflicts: # core-bundle/src/Resources/contao/library/Contao/System.php
contao · Jul 26, 2020 · 87cc286 · 87cc286
2 parents 2026082 + ba9ea6c
commit 87cc286
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/core-bundle/src/Resources/contao/library/Contao/System.php b/core-bundle/src/Resources/contao/library/Contao/System.php
@@ -187,6 +187,10 @@ protected function import($strClass, $strKey=null, $blnForce=false)
 			{
 				throw new ServiceNotFoundException($strClass, null, null, array(), sprintf('The "%s" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.', $strClass));
 			}
+			elseif (!class_exists($strClass))
+			{
+				throw new \RuntimeException('System::import() failed because class "' . $strClass . '" is not a valid class name or does not exist.');
+			}
 			elseif (\in_array('getInstance', get_class_methods($strClass)))
 			{
 				static::$arrStaticObjects[$strKey] = static::$arrSingletons[$strKey] = $this->arrObjects[$strKey] = \call_user_func(array($strClass, 'getInstance'));
@@ -239,6 +243,10 @@ public static function importStatic($strClass, $strKey=null, $blnForce=false)
 			{
 				throw new ServiceNotFoundException($strClass, null, null, array(), sprintf('The "%s" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.', $strClass));
 			}
+			elseif (!class_exists($strClass))
+			{
+				throw new \RuntimeException('System::importStatic() failed because class "' . $strClass . '" is not a valid class name or does not exist.');
+			}
 			elseif (\in_array('getInstance', get_class_methods($strClass)))
 			{
 				static::$arrStaticObjects[$strKey] = static::$arrSingletons[$strKey] = \call_user_func(array($strClass, 'getInstance'));

diff --git a/faq-bundle/src/Resources/contao/dca/tl_user.php b/faq-bundle/src/Resources/contao/dca/tl_user.php
@@ -16,7 +16,7 @@
 	->applyToPalette('custom', 'tl_user')
 ;
 
-// Add fields to tl_user_group
+// Add fields to tl_user
 $GLOBALS['TL_DCA']['tl_user']['fields']['faqs'] = array
 (
 	'exclude'                 => true,

diff --git a/news-bundle/src/Resources/contao/dca/tl_user.php b/news-bundle/src/Resources/contao/dca/tl_user.php
@@ -16,7 +16,7 @@
 	->applyToPalette('custom', 'tl_user')
 ;
 
-// Add fields to tl_user_group
+// Add fields to tl_user
 $GLOBALS['TL_DCA']['tl_user']['fields']['news'] = array
 (
 	'exclude'                 => true,

diff --git a/newsletter-bundle/src/Resources/contao/dca/tl_user.php b/newsletter-bundle/src/Resources/contao/dca/tl_user.php
@@ -16,7 +16,7 @@
 	->applyToPalette('custom', 'tl_user')
 ;
 
-// Add fields to tl_user_group
+// Add fields to tl_user
 $GLOBALS['TL_DCA']['tl_user']['fields']['newsletters'] = array
 (
 	'exclude'                 => true,