Backported a 2.x fix for modern PHP versions

javiereguiluz · javiereguiluz · commit e0daee67b818 · 2021-02-11T19:33:17.000+01:00
diff --git a/src/Configuration/DefaultConfigPass.php b/src/Configuration/DefaultConfigPass.php
@@ -55,7 +55,7 @@ private function processDefaultMenuItem(array $backendConfig)
     {
         $defaultMenuItem = $this->findDefaultMenuItem($backendConfig['design']['menu']);
 
-        if ('empty' === $defaultMenuItem['type']) {
+        if (is_array($defaultMenuItem) && 'empty' === $defaultMenuItem['type']) {
             throw new \RuntimeException(sprintf('The "menu" configuration sets "%s" as the default item, which is not possible because its type is "empty" and it cannot redirect to a valid URL.', $defaultMenuItem['label']));
         }
 
diff --git a/src/EasyAdminBundle.php b/src/EasyAdminBundle.php
@@ -22,7 +22,7 @@
  */
 class EasyAdminBundle extends Bundle
 {
-    const VERSION = '1.17.24';
+    const VERSION = '1.17.25';
 
     public function build(ContainerBuilder $container)
     {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private function processDefaultMenuItem(array $backendConfig)`
`55`	`55`	`{`
`56`	`56`	`$defaultMenuItem = $this->findDefaultMenuItem($backendConfig['design']['menu']);`
`57`	`57`
`58`		`- if ('empty' === $defaultMenuItem['type']) {`
	`58`	`+ if (is_array($defaultMenuItem) && 'empty' === $defaultMenuItem['type']) {`
`59`	`59`	`throw new \RuntimeException(sprintf('The "menu" configuration sets "%s" as the default item, which is not possible because its type is "empty" and it cannot redirect to a valid URL.', $defaultMenuItem['label']));`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`	`class EasyAdminBundle extends Bundle`
`24`	`24`	`{`
`25`		`- const VERSION = '1.17.24';`
	`25`	`+ const VERSION = '1.17.25';`
`26`	`26`
`27`	`27`	`public function build(ContainerBuilder $container)`
`28`	`28`	`{`