From aff120fcec390309e93eae8f195f253623a5ea12 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sun, 1 Mar 2020 18:15:44 +1100
Subject: [PATCH] Remove return types

These can be added back in post-Laravel 6 era (> PHP 7.2)
Also removed the defaults since they are no longer needed, supplied by the new objects

Refs #4929
---
 modules/backend/classes/MainMenuItem.php      |  2 +-
 modules/backend/classes/NavigationManager.php | 42 ++++---------------
 modules/backend/classes/SideMenuItem.php      |  2 +-
 3 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/modules/backend/classes/MainMenuItem.php b/modules/backend/classes/MainMenuItem.php
index 07f42cb62..2f1431ef8 100644
--- a/modules/backend/classes/MainMenuItem.php
+++ b/modules/backend/classes/MainMenuItem.php
@@ -86,7 +86,7 @@ class MainMenuItem
      * @return SideMenuItem
      * @throws SystemException
      */
-    public function getSideMenuItem(string $code): SideMenuItem
+    public function getSideMenuItem(string $code)
     {
         if (!array_key_exists($code, $this->sideMenu)) {
             throw new SystemException('No sidenavigation item available with code ' . $code);
diff --git a/modules/backend/classes/NavigationManager.php b/modules/backend/classes/NavigationManager.php
index 8985f3e09..441684e5c 100644
--- a/modules/backend/classes/NavigationManager.php
+++ b/modules/backend/classes/NavigationManager.php
@@ -34,32 +34,6 @@ class NavigationManager
     protected $contextMainMenuItemCode;
     protected $contextSideMenuItemCode;
 
-    protected static $mainItemDefaults = [
-        'code'        => null,
-        'label'       => null,
-        'icon'        => null,
-        'iconSvg'     => null,
-        'counter'     => null,
-        'counterLabel'=> null,
-        'url'         => null,
-        'permissions' => [],
-        'order'       => 500,
-        'sideMenu'    => []
-    ];
-
-    protected static $sideItemDefaults = [
-        'code'        => null,
-        'label'       => null,
-        'icon'        => null,
-        'url'         => null,
-        'iconSvg'     => null,
-        'counter'     => null,
-        'counterLabel'=> null,
-        'order'       => -1,
-        'attributes'  => [],
-        'permissions' => []
-    ];
-
     /**
      * @var PluginManager
      */
@@ -276,7 +250,7 @@ class NavigationManager
      * @return MainMenuItem
      * @throws SystemException
      */
-    public function getMainMenuItem(string $owner, string $code): MainMenuItem
+    public function getMainMenuItem(string $owner, string $code)
     {
         $itemKey = $this->makeItemKey($owner, $code);
 
@@ -319,7 +293,7 @@ class NavigationManager
      * @param array $definition
      * @return bool
      */
-    public function addSideMenuItem($owner, $code, $sideCode, array $definition): bool
+    public function addSideMenuItem($owner, $code, $sideCode, array $definition)
     {
         $itemKey = $this->makeItemKey($owner, $code);
 
@@ -351,7 +325,7 @@ class NavigationManager
      * @param string $sideCode
      * @return bool
      */
-    public function removeSideMenuItem($owner, $code, $sideCode): bool
+    public function removeSideMenuItem($owner, $code, $sideCode)
     {
         $itemKey = $this->makeItemKey($owner, $code);
         if (!isset($this->items[$itemKey])) {
@@ -406,7 +380,7 @@ class NavigationManager
      * @return SideMenuItem[]
      * @throws SystemException
      */
-    public function listSideMenuItems($owner = null, $code = null): array
+    public function listSideMenuItems($owner = null, $code = null)
     {
         $activeItem = null;
 
@@ -503,7 +477,7 @@ class NavigationManager
      * @param MainMenuItem $item Specifies the item object.
      * @return boolean Returns true if the menu item is active.
      */
-    public function isMainMenuItemActive($item): bool
+    public function isMainMenuItemActive($item)
     {
         return $this->contextOwner === $item->owner && $this->contextMainMenuItemCode === $item->code;
     }
@@ -529,7 +503,7 @@ class NavigationManager
      * @param SideMenuItem $item Specifies the item object.
      * @return boolean Returns true if the side item is active.
      */
-    public function isSideMenuItemActive($item): bool
+    public function isSideMenuItemActive($item)
     {
         if ($this->contextSideMenuItemCode === true) {
             $this->contextSideMenuItemCode = null;
@@ -572,7 +546,7 @@ class NavigationManager
      * @param MainMenuItem[]|SideMenuItem[] $items A collection of menu items
      * @return array The filtered menu items
      */
-    protected function filterItemPermissions($user, array $items): array
+    protected function filterItemPermissions($user, array $items)
     {
         if (!$user) {
             return $items;
@@ -595,7 +569,7 @@ class NavigationManager
      * @param string $code
      * @return string
      */
-    protected function makeItemKey($owner, $code): string
+    protected function makeItemKey($owner, $code)
     {
         return strtoupper($owner).'.'.strtoupper($code);
     }
diff --git a/modules/backend/classes/SideMenuItem.php b/modules/backend/classes/SideMenuItem.php
index 0fb82f870..e0d1a23ad 100644
--- a/modules/backend/classes/SideMenuItem.php
+++ b/modules/backend/classes/SideMenuItem.php
@@ -98,7 +98,7 @@ class SideMenuItem
      * @param array $data
      * @return static
      */
-    public static function createFromArray(array $data): self
+    public static function createFromArray(array $data)
     {
         $instance = new static();
         $instance->code = $data['code'];