Merge pull request #25 from ASUWebPlatforms/WS2-1340

fix drupal-check errors
ASUWebPlatforms · Jun 8, 2022 · c0c47a1 · c0c47a1
2 parents 8e3108b + ac62865
commit c0c47a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/asu_brand.module b/asu_brand.module
@@ -66,6 +66,8 @@ function asu_brand_entity_base_field_info(\Drupal\Core\Entity\EntityTypeInterfac
  */
 function asu_brand_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
 
+  $link_type = null;
+  $is_button = null;
   // Menu overview tree form. Add column to show special Header configs in tree.
   if ($form_id == "menu_edit_form") {
     $form['links']['links']['#header'][] = t("Header settings");
@@ -130,7 +132,7 @@ function asu_brand_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form
 /**
  * @param array $form
  * @param FormStateInterface $form_state
- * @param $form_id
+ * @param int $form_id
  */
 function asu_brand_form_menu_link_content_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
 

diff --git a/src/Plugin/Block/AsuBrandHeaderBlock.php b/src/Plugin/Block/AsuBrandHeaderBlock.php
@@ -157,7 +157,8 @@ public function blockForm($form, FormStateInterface $form_state) {
     $form = parent::blockForm($form, $form_state);
 
     // Get system menu options.
-    $menu_options = menu_ui_get_menus();
+    $menu_options = array_map(function ($menu) { return $menu->label(); }, \Drupal\system\Entity\Menu::loadMultiple());
+    asort($menu_options);
 
     // Currently unimplemented config items for props:
     // logo TODO for future dev
@@ -458,6 +459,7 @@ function getNavTree($menu_name) {
       // BUILD LEVEL 2 first, if extant, to put under parent.
       $childItems = [];
       $childTrayButtons = [];
+      $childItemCols = [];
       if (!empty($item['below'])) {
         foreach ($item['below'] as $child) {