Reorganise methods

Author: AydinHassan

src/MenuItem/CheckboxItem.php

@@ -37,7 +37,7 @@ class CheckboxItem implements MenuItemInterface, ToggableItemInterface
     private $checked = false;
 
     /**
-     * @var CheckboxStyle;
+     * @var CheckboxStyle
      */
     private $style;
 

src/MenuItem/MenuMenuItem.php

@@ -33,7 +33,7 @@ class MenuMenuItem implements MenuItemInterface
     private $disabled;
 
     /**
-     * @var SelectableStyle;
+     * @var SelectableStyle
      */
     private $style;
 

src/MenuItem/RadioItem.php

@@ -37,7 +37,7 @@ class RadioItem implements MenuItemInterface, ToggableItemInterface
     private $checked = false;
 
     /**
-     * @var RadioStyle;
+     * @var RadioStyle
      */
     private $style;
 

src/MenuItem/SelectableItem.php

@@ -11,19 +11,28 @@
  */
 class SelectableItem implements MenuItemInterface
 {
+    /**
+     * @var string
+     */
+    private $text;
+
     /**
      * @var callable
      */
     private $selectAction;
 
-    private $text = '';
-
-    private $showItemExtra = false;
+    /**
+     * @var bool
+     */
+    private $showItemExtra;
 
-    private $disabled = false;
+    /**
+     * @var bool
+     */
+    private $disabled;
 
     /**
-     * @var SelectableStyle;
+     * @var SelectableStyle
      */
     private $style;
 
@@ -33,10 +42,10 @@ public function __construct(
         bool $showItemExtra = false,
         bool $disabled = false
     ) {
-        $this->text          = $text;
-        $this->selectAction  = $selectAction;
+        $this->text = $text;
+        $this->selectAction = $selectAction;
         $this->showItemExtra = $showItemExtra;
-        $this->disabled      = $disabled;
+        $this->disabled = $disabled;
 
         $this->style = new SelectableStyle();
     }
@@ -79,26 +88,6 @@ public function getRows(MenuStyle $style, bool $selected = false) : array
         }, $rows, array_keys($rows));
     }
 
-    /**
-     * Execute the items callable if required
-     */
-    public function getSelectAction() : ?callable
-    {
-        return $this->selectAction;
-    }
-
-    public function getStyle() : SelectableStyle
-    {
-        return $this->style;
-    }
-
-    public function setStyle(SelectableStyle $style) : self
-    {
-        $this->style = $style;
-
-        return $this;
-    }
-
     /**
      * Return the raw string of text
      */
@@ -115,6 +104,14 @@ public function setText(string $text) : void
         $this->text = $text;
     }
 
+    /**
+     * Execute the items callable if required
+     */
+    public function getSelectAction() : ?callable
+    {
+        return $this->selectAction;
+    }
+
     /**
      * Can the item be selected
      */
@@ -123,6 +120,9 @@ public function canSelect() : bool
         return !$this->disabled;
     }
 
+    /**
+     * Whether or not we are showing item extra
+     */
     public function showsItemExtra() : bool
     {
         return $this->showItemExtra;
@@ -143,4 +143,16 @@ public function hideItemExtra() : void
     {
         $this->showItemExtra = false;
     }
+
+    public function getStyle() : SelectableStyle
+    {
+        return $this->style;
+    }
+
+    public function setStyle(SelectableStyle $style) : self
+    {
+        $this->style = $style;
+
+        return $this;
+    }
 }