blah

Author: AydinHassan

app/config.php

@@ -39,6 +39,7 @@
 use PhpSchool\PhpWorkshop\ExerciseRenderer;
 use PhpSchool\PhpWorkshop\ExerciseRepository;
 use PhpSchool\PhpWorkshop\ExerciseRunner\Context\ExecutionContextFactory;
+use PhpSchool\PhpWorkshop\ExerciseRunner\EnvironmentManager;
 use PhpSchool\PhpWorkshop\ExerciseRunner\Factory\CgiRunnerFactory;
 use PhpSchool\PhpWorkshop\ExerciseRunner\Factory\CliRunnerFactory;
 use PhpSchool\PhpWorkshop\ExerciseRunner\Factory\CustomVerifyingRunnerFactory;
@@ -188,11 +189,23 @@
     EventDispatcher::class => factory(EventDispatcherFactory::class),
     EventDispatcherFactory::class => create(),
 
+    EnvironmentManager::class => function (ContainerInterface $c) {
+        return new EnvironmentManager($c->get(Filesystem::class));
+    },
+
     //Exercise Runners
     RunnerManager::class => function (ContainerInterface $c) {
         $manager = new RunnerManager();
-        $manager->addFactory(new CliRunnerFactory($c->get(EventDispatcher::class), $c->get(ProcessFactory::class)));
-        $manager->addFactory(new CgiRunnerFactory($c->get(EventDispatcher::class), $c->get(ProcessFactory::class)));
+        $manager->addFactory(new CliRunnerFactory(
+            $c->get(EventDispatcher::class),
+            $c->get(ProcessFactory::class),
+            $c->get(EnvironmentManager::class)
+        ));
+        $manager->addFactory(new CgiRunnerFactory(
+            $c->get(EventDispatcher::class),
+            $c->get(ProcessFactory::class),
+            $c->get(EnvironmentManager::class)
+        ));
         $manager->addFactory(new CustomVerifyingRunnerFactory());
         return $manager;
     },

src/ExerciseDispatcher.php

@@ -11,15 +11,15 @@
 use PhpSchool\PhpWorkshop\Event\EventDispatcher;
 use PhpSchool\PhpWorkshop\Event\ExerciseRunnerEvent;
 use PhpSchool\PhpWorkshop\Exception\CheckNotApplicableException;
+use PhpSchool\PhpWorkshop\Exception\CouldNotRunException;
 use PhpSchool\PhpWorkshop\Exception\ExerciseNotConfiguredException;
 use PhpSchool\PhpWorkshop\Exception\InvalidArgumentException;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
-use PhpSchool\PhpWorkshop\ExerciseRunner\Context\ExecutionContextFactory;
+use PhpSchool\PhpWorkshop\ExerciseRunner\Context\ExecutionContext;
 use PhpSchool\PhpWorkshop\ExerciseRunner\RunnerManager;
 use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\Result\FailureInterface;
-use PhpSchool\PhpWorkshop\Exception\CouldNotRunException;
 
 /**
  * This class is used to verify/run a student's solution to an exercise. It routes to the correct
@@ -49,7 +49,6 @@ public function __construct(
         private ResultAggregator $results,
         private EventDispatcher $eventDispatcher,
         private CheckRepository $checkRepository,
-        private ExecutionContextFactory $executionContextFactory,
     ) {
     }
 
@@ -108,7 +107,7 @@ public function requireCheck(string $requiredCheck): void
      */
     public function verify(ExerciseInterface $exercise, Input $input): ResultAggregator
     {
-        $context = $this->executionContextFactory->fromInputAndExercise($input, $exercise);
+        $context = ExecutionContext::fromInputAndExercise($input, $exercise);
         $runner = $this->runnerManager->getRunner($exercise);
 
         $exercise->defineListeners($this->eventDispatcher);
@@ -161,7 +160,7 @@ public function verify(ExerciseInterface $exercise, Input $input): ResultAggrega
      */
     public function run(ExerciseInterface $exercise, Input $input, OutputInterface $output): bool
     {
-        $context = $this->executionContextFactory->fromInputAndExercise($input, $exercise);
+        $context = ExecutionContext::fromInputAndExercise($input, $exercise);
 
         $exercise->defineListeners($this->eventDispatcher);
 

src/ExerciseRunner/CgiRunner.php

@@ -65,7 +65,8 @@ class CgiRunner implements ExerciseRunnerInterface
     public function __construct(
         private CgiExercise $exercise,
         private EventDispatcher $eventDispatcher,
-        private ProcessFactory $processFactory
+        private ProcessFactory $processFactory,
+        private EnvironmentManager $environmentManager,
     ) {
     }
 
@@ -109,6 +110,10 @@ public function verify(ExecutionContext $context): ResultInterface
         $scenario = $this->exercise->defineTestScenario();
 
         $this->eventDispatcher->dispatch(new CgiExerciseRunnerEvent('cgi.verify.start', $context, $scenario));
+
+        $this->environmentManager->prepareStudent($context, $scenario);
+        $this->environmentManager->prepareSolution($context, $scenario);
+
         $result = new CgiResult(
             array_map(
                 function (RequestInterface $request) use ($context, $scenario) {
@@ -117,6 +122,9 @@ function (RequestInterface $request) use ($context, $scenario) {
                 $scenario->getExecutions()
             )
         );
+
+        $this->environmentManager->cleanup($context, $scenario);
+
         $this->eventDispatcher->dispatch(new CgiExerciseRunnerEvent('cgi.verify.finish', $context, $scenario));
         return $result;
     }
@@ -296,6 +304,9 @@ public function run(ExecutionContext $context, OutputInterface $output): bool
         $scenario = $this->exercise->defineTestScenario();
 
         $this->eventDispatcher->dispatch(new CgiExerciseRunnerEvent('cgi.run.start', $context, $scenario));
+
+        $this->environmentManager->prepareStudent($context, $scenario);
+
         $success = true;
         foreach ($scenario->getExecutions() as $i => $request) {
             /** @var CgiExecuteEvent $event */
@@ -333,6 +344,9 @@ public function run(ExecutionContext $context, OutputInterface $output): bool
                 new CgiExecuteEvent('cgi.run.student-execute.post', $context, $scenario, $request)
             );
         }
+
+        $this->environmentManager->cleanup($context, $scenario);
+
         $this->eventDispatcher->dispatch(new CgiExerciseRunnerEvent('cgi.run.finish', $context, $scenario));
         return $success;
     }

src/ExerciseRunner/CliRunner.php

@@ -63,7 +63,8 @@ class CliRunner implements ExerciseRunnerInterface
     public function __construct(
         private CliExercise $exercise,
         private EventDispatcher $eventDispatcher,
-        private ProcessFactory $processFactory
+        private ProcessFactory $processFactory,
+        private EnvironmentManager $environmentManager,
     ) {
     }
 
@@ -106,6 +107,10 @@ public function verify(ExecutionContext $context): ResultInterface
         $scenario = $this->exercise->defineTestScenario();
 
         $this->eventDispatcher->dispatch(new CliExerciseRunnerEvent('cli.verify.start', $context, $scenario));
+
+        $this->environmentManager->prepareStudent($context, $scenario);
+        $this->environmentManager->prepareSolution($context, $scenario);
+
         $result = new CliResult(
             array_map(
                 function (Collection $args) use ($context, $scenario) {
@@ -114,6 +119,9 @@ function (Collection $args) use ($context, $scenario) {
                 $scenario->getExecutions()
             )
         );
+
+        $this->environmentManager->cleanup($context, $scenario);
+
         $this->eventDispatcher->dispatch(new CliExerciseRunnerEvent('cli.verify.finish', $context, $scenario));
         return $result;
     }
@@ -123,7 +131,6 @@ function (Collection $args) use ($context, $scenario) {
      */
     private function doVerify(ExecutionContext $context, CliScenario $scenario, Collection $args): CliResultInterface
     {
-
         try {
             /** @var CliExecuteEvent $event */
             $event = $this->eventDispatcher->dispatch(
@@ -203,6 +210,9 @@ public function run(ExecutionContext $context, OutputInterface $output): bool
         $scenario = $this->exercise->defineTestScenario();
 
         $this->eventDispatcher->dispatch(new CliExerciseRunnerEvent('cli.run.start', $context, $scenario));
+
+        $this->environmentManager->prepareStudent($context, $scenario);
+
         $success = true;
         foreach ($scenario->getExecutions() as $i => $args) {
             /** @var CliExecuteEvent $event */
@@ -238,6 +248,8 @@ public function run(ExecutionContext $context, OutputInterface $output): bool
             );
         }
 
+        $this->environmentManager->cleanup($context, $scenario);
+
         $this->eventDispatcher->dispatch(new CliExerciseRunnerEvent('cli.run.finish', $context, $scenario));
         return $success;
     }

src/ExerciseRunner/Context/ExecutionContext.php

@@ -17,6 +17,18 @@ public function __construct(
     ) {
     }
 
+    public static function fromInputAndExercise(Input $input, ExerciseInterface $exercise): ExecutionContext
+    {
+        $program = $input->hasArgument('program') ? dirname($input->getRequiredArgument('program')) : (string) getcwd();
+
+        return new self(
+            $program,
+            System::randomTempDir(),
+            $exercise,
+            $input
+        );
+    }
+
     public function getExercise(): ExerciseInterface
     {
         return $this->exercise;