Merge branch 'release2.12.0'

RicLeP · RicLeP · commit 664f9d3e5692 · 2022-05-04T11:32:06.000+01:00
diff --git a/src/Traits/HasChildClasses.php b/src/Traits/HasChildClasses.php
@@ -22,7 +22,9 @@ public function getChildClassName($type, $name) {
 			if (class_exists($namespace . Str::pluralStudly($type) . '\\' . Str::studly($name))) {
 				return $namespace . Str::pluralStudly($type) . '\\' . Str::studly($name);
 			}
+		}
 
+		foreach (Arr::wrap(config('storyblok.component_class_namespace')) as $namespace) {
 			if (class_exists($namespace . Str::studly($type))) {
 				return $namespace . Str::studly($type);
 			}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ public function getChildClassName($type, $name) {`
`22`	`22`	`if (class_exists($namespace . Str::pluralStudly($type) . '\\' . Str::studly($name))) {`
`23`	`23`	`return $namespace . Str::pluralStudly($type) . '\\' . Str::studly($name);`
`24`	`24`	`}`
	`25`	`+ }`
`25`	`26`
	`27`	`+ foreach (Arr::wrap(config('storyblok.component_class_namespace')) as $namespace) {`
`26`	`28`	`if (class_exists($namespace . Str::studly($type))) {`
`27`	`29`	`return $namespace . Str::studly($type);`
`28`	`30`	`}`