Merge pull request #155 from php-school/simplify-builder

Refactor menu building process

Author: AydinHassan

UPGRADE.md

@@ -8,8 +8,7 @@ or backwards compatibility (BC) breakages occur.
 ### BC breaks
 
 * Class `PhpSchool\CliMenu\CliMenuBuilder` has been moved, use 
-  `PhpSchool\CliMenu\Builder\CliMenuBuilder` instead. The old class has been aliased for now, but will be removed in 
-  `3.1`.
+  `PhpSchool\CliMenu\Builder\CliMenuBuilder` instead. Please migrate to the new namespace.
 * Removed `PhpSchool\CliMenu\Terminal` namespace, the code has been migrated to the `php-school/terminal` package and is 
   largely modified.
 * Method `addSubMenu` in '\PhpSchool\CliMenu\Builder\CliMenuBuilder' has an additional required parameter

composer.json

@@ -27,8 +27,7 @@
     "autoload" : {
         "psr-4" : {
             "PhpSchool\\CliMenu\\": "src"
-        },
-        "files": ["src/deprecated.php"]
+        }
     },
     "autoload-dev": {
         "psr-4": { "PhpSchool\\CliMenuTest\\": "test/" }

examples/split-item.php

@@ -1,5 +1,6 @@
 <?php
 
+use PhpSchool\CliMenu\Builder\SplitItemBuilder;
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;
 
@@ -11,25 +12,26 @@
 
 $menu = (new CliMenuBuilder)
     ->setWidth(150)
-    ->addSplitItem()
-        ->addSubMenu('sub-menu-1', 'Sub Menu on a split item')
-            ->setTitle('Behold the awesomeness')
-            ->addItem('This is awesome', function() { print 'Yes!'; })
-            ->addSplitItem()
-                ->addItem('Split Item 1', function() { print 'Item 1!'; })
-                ->addItem('Split Item 2', function() { print 'Item 2!'; })
-                ->addItem('Split Item 3', function() { print 'Item 3!'; })
-                ->addSubMenu('sub-menu-nested-1', 'Split Item Nested Sub Menu')
-                    ->addItem('One', function() { print 'One!'; })
-                    ->addItem('Two', function() { print 'Two!'; })
-                    ->addItem('Three', function() { print 'Three!'; })
-                    ->end()
-                ->end()
-            ->end()
+    ->addSplitItem(function (SplitItemBuilder $b) use ($itemCallable) {
+        $b->addSubMenu('Sub Menu on a split item', function (CliMenuBuilder $b) {
+            $b->setTitle('Behold the awesomeness')
+                ->addItem('This is awesome', function() { print 'Yes!'; })
+                ->addSplitItem(function (SplitItemBuilder $b) {
+                    $b->addItem('Split Item 1', function() { print 'Item 1!'; })
+                        ->addItem('Split Item 2', function() { print 'Item 2!'; })
+                        ->addItem('Split Item 3', function() { print 'Item 3!'; })
+                        ->addSubMenu('Split Item Nested Sub Menu', function (CliMenuBuilder $b) {
+                            $b->addItem('One', function() { print 'One!'; })
+                                ->addItem('Two', function() { print 'Two!'; })
+                                ->addItem('Three', function() { print 'Three!'; });
+                        });
+                });
+        })
         ->addItem('Item 2', $itemCallable)
         ->addStaticItem('Item 3 - Static')
-        ->addItem('Item 4', $itemCallable)
-        ->end()
+        ->addItem('Item 4', $itemCallable);
+    })
     ->build();
+   
 
 $menu->open();

examples/submenu.php

@@ -14,13 +14,13 @@
     ->addItem('First Item', $itemCallable)
     ->addItem('Second Item', $itemCallable)
     ->addLineBreak('-')
-    ->addSubMenu('sub-menu-1', 'Options')
-        ->setTitle('CLI Menu > Options')
-        ->addItem('First option', function (CliMenu $menu) {
-            echo sprintf('Executing option: %s', $menu->getSelectedItem()->getText());
-        })
-        ->addLineBreak('-')
-        ->end()
+    ->addSubMenu('Options', function (CliMenuBuilder $b) {
+        $b->setTitle('CLI Menu > Options')
+            ->addItem('First option', function (CliMenu $menu) {
+                echo sprintf('Executing option: %s', $menu->getSelectedItem()->getText());
+            })
+            ->addLineBreak('-');
+    })
     ->setWidth(70)
     ->setBackgroundColour('yellow')
     ->build();