From 9ac0827e98c5150489d615c7468d74abeeb3f4e8 Mon Sep 17 00:00:00 2001 From: Aydin Hassan Date: Tue, 22 Jun 2021 22:19:34 +0100 Subject: [PATCH 1/3] Link to website on mac --- src/Factory/MenuFactory.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Factory/MenuFactory.php b/src/Factory/MenuFactory.php index 30605ae5..d55ead2e 100644 --- a/src/Factory/MenuFactory.php +++ b/src/Factory/MenuFactory.php @@ -4,6 +4,8 @@ namespace PhpSchool\PhpWorkshop\Factory; +use PhpSchool\CliMenu\Action\ExitAction; +use PhpSchool\CliMenu\MenuItem\SelectableItem; use PhpSchool\CliMenu\Style\SelectableStyle; use PhpSchool\Terminal\Terminal; use Psr\Container\ContainerInterface; @@ -74,7 +76,7 @@ function (CliMenu $menu) use ($exerciseRenderer, $eventDispatcher, $exercise) { ->addLineBreak() ->addItem('HELP', new MenuCommandInvoker($c->get(HelpCommand::class))) ->addItem('CREDITS', new MenuCommandInvoker($c->get(CreditsCommand::class))) - ->setExitButtonText('EXIT') + ->disableDefaultItems() ->setBackgroundColour($c->get('bgColour')) ->setForegroundColour($c->get('fgColour')) ->setMarginAuto() @@ -110,6 +112,12 @@ function (CliMenu $menu) use ($exerciseRenderer, $eventDispatcher, $exercise) { }) ->addLineBreak(); + $builder->addMenuItem(new SelectableItem('EXIT', new ExitAction)); + + if (PHP_OS_FAMILY === 'Darwin') { + $builder->addLineBreak(); + $builder->addItem('www.phpschool.io', fn () => exec('open https://www.phpschool.io')); + } if (null !== $c->get('workshopTitle')) { $builder->setTitle($c->get('workshopTitle')); From ea11240a0ccfa11eb8802969715849a2189d56a9 Mon Sep 17 00:00:00 2001 From: Aydin Hassan Date: Tue, 22 Jun 2021 22:21:51 +0100 Subject: [PATCH 2/3] Don't use short closure --- src/Factory/MenuFactory.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Factory/MenuFactory.php b/src/Factory/MenuFactory.php index d55ead2e..c9257ad3 100644 --- a/src/Factory/MenuFactory.php +++ b/src/Factory/MenuFactory.php @@ -116,7 +116,9 @@ function (CliMenu $menu) use ($exerciseRenderer, $eventDispatcher, $exercise) { if (PHP_OS_FAMILY === 'Darwin') { $builder->addLineBreak(); - $builder->addItem('www.phpschool.io', fn () => exec('open https://www.phpschool.io')); + $builder->addItem('www.phpschool.io', function () { + exec('open https://www.phpschool.io'); + }); } if (null !== $c->get('workshopTitle')) { From 2f6431ab9e0b8155be67a1f174d9d8ad194cd783 Mon Sep 17 00:00:00 2001 From: Aydin Hassan Date: Tue, 22 Jun 2021 22:22:52 +0100 Subject: [PATCH 3/3] cs --- src/Factory/MenuFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Factory/MenuFactory.php b/src/Factory/MenuFactory.php index c9257ad3..5c73f923 100644 --- a/src/Factory/MenuFactory.php +++ b/src/Factory/MenuFactory.php @@ -112,7 +112,7 @@ function (CliMenu $menu) use ($exerciseRenderer, $eventDispatcher, $exercise) { }) ->addLineBreak(); - $builder->addMenuItem(new SelectableItem('EXIT', new ExitAction)); + $builder->addMenuItem(new SelectableItem('EXIT', new ExitAction())); if (PHP_OS_FAMILY === 'Darwin') { $builder->addLineBreak();