Ensure only available workshops can be opened

Author: mikeymike

app/config.php

@@ -59,7 +59,7 @@
 return [
     'appName' => basename($_SERVER['argv'][0]),
     WorkshopType::class => WorkshopType::STANDARD(),
-    ExerciseDispatcher::class => factory(function (ContainerInterface $c) {
+    ExerciseDispatcher::class => function (ContainerInterface $c) {
         $dispatcher = new ExerciseDispatcher(
             $c->get(RunnerFactory::class),
             $c->get(ResultAggregator::class),
@@ -72,7 +72,7 @@
         $dispatcher->requireCheck(PhpLintCheck::class);
         $dispatcher->requireCheck(CodeParseCheck::class);
         return $dispatcher;
-    }),
+    },
     ResultAggregator::class => object(ResultAggregator::class),
     CheckRepository::class => function (ContainerInterface $c) {
         return new CheckRepository([

src/Factory/MenuFactory.php

@@ -13,6 +13,7 @@
 use PhpSchool\PhpWorkshop\ExerciseRenderer;
 use PhpSchool\PhpWorkshop\ExerciseRepository;
 use PhpSchool\PhpWorkshop\MenuItem\ResetProgress;
+use PhpSchool\PhpWorkshop\UserState;
 use PhpSchool\PhpWorkshop\UserStateSerializer;
 use PhpSchool\PhpWorkshop\WorkshopType;
 
@@ -48,14 +49,11 @@ public function __invoke(ContainerInterface $c)
             ->addStaticItem('---------')
             ->addItems(
                 array_map(function (ExerciseInterface $exercise) use ($exerciseRenderer, $userState, $workshopType) {
-                    $isCurrent  = $exercise->getName() === $userState->getCurrentExercise();
-                    $isComplete = in_array($exercise->getName(), $userState->getCompletedExercises());
-
                     return [
                         $exercise->getName(),
                         $exerciseRenderer,
                         $userState->completedExercise($exercise->getName()),
-                        $workshopType == WorkshopType::TUTORIAL() && !$isCurrent && !$isComplete
+                        $this->isExerciseDisabled($exercise, $userState, $workshopType)
                     ];
                 }, $exerciseRepository->findAll())
             )
@@ -99,4 +97,28 @@ public function __invoke(ContainerInterface $c)
 
         return $builder->build();
     }
+
+    /**
+     * @param ExerciseInterface $exercise
+     * @param UserState         $userState
+     * @param WorkshopType      $type
+     * @return bool
+     */
+    private function isExerciseDisabled(ExerciseInterface $exercise, UserState $userState, WorkshopType $type)
+    {
+        static $previous = null;
+
+        if (null === $previous || !$type->isTutorialMode()) {
+            $previous = $exercise;
+            return false;
+        }
+
+        if (in_array($previous->getName(), $userState->getCompletedExercises())) {
+            $previous = $exercise;
+            return false;
+        }
+
+        $previous = $exercise;
+        return true;
+    }
 }

src/WorkshopType.php

@@ -13,4 +13,12 @@ class WorkshopType extends Enum
 {
     const STANDARD = 1;
     const TUTORIAL = 2;
+
+    /**
+     * @return bool
+     */
+    public function isTutorialMode()
+    {
+        return $this->getValue() === static::TUTORIAL;
+    }
 }