wut

Author: AydinHassan

src/ExerciseRunner/CgiRunner.php

@@ -157,7 +157,7 @@ private function doVerify(ExecutionContext $context, CgiScenario $scenario, Requ
                 $context,
                 $scenario,
                 $context->getStudentExecutionDirectory(),
-                $context->getEntryPoint(),
+                basename($context->getEntryPoint()),
                 $event->getRequest(),
                 'student',
             );
@@ -227,6 +227,7 @@ private function executePhpFile(
 
         //if no status line, pre-pend 200 OK
         $output = $process->getOutput();
+        $error = $process->getErrorOutput();
         if (!preg_match('/^HTTP\/([1-9]\d*\.\d) ([1-5]\d{2})(\s+(.+))?\\r\\n/', $output)) {
             $output = "HTTP/1.0 200 OK\r\n" . $output;
         }

src/ExerciseRunner/CliRunner.php

@@ -160,7 +160,7 @@ private function doVerify(ExecutionContext $context, CliScenario $scenario, Coll
                 $context,
                 $scenario,
                 $context->getStudentExecutionDirectory(),
-                $context->getEntryPoint(),
+                basename($context->getEntryPoint()),
                 $event->getArgs(),
                 'student',
             );

src/Process/DockerProcessFactory.php

@@ -34,9 +34,11 @@ public function create(ProcessInput $processInput): Process
             $mounts[] = $this->composerCacheDir . ':/root/.composer/cache';
         }
 
-        $env = array_map(function ($key, $value) {
-            return sprintf('-e %s=%s', $key, $value);
-        }, array_keys($processInput->getEnv()), $processInput->getEnv());
+        $env = [];
+        foreach ($processInput->getEnv() as $key => $value) {
+            $env[] = '-e';
+            $env[] = $key . '=' . $value;
+        }
 
         return new Process(
             [

src/TestUtils/WorkshopExerciseTest.php

@@ -57,7 +57,7 @@ public function setUp(): void
 
     public function tearDown(): void
     {
-        (new Filesystem())->remove(System::tempDir());
+        // (new Filesystem())->remove(System::tempDir());
     }
 
     /**

test/Process/DockerProcessFactoryTest.php

@@ -93,7 +93,7 @@ public function testCreateWithEnv(): void
 
         $process = $factory->create($input);
         $cmd  = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
-        $cmd .= " 'run' '--rm' '-e SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
+        $cmd .= " 'run' '--rm' '-e' 'SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
         static::assertSame($cmd, $process->getCommandLine());
         static::assertSame('/docker-dir', $process->getWorkingDirectory());
     }
@@ -129,7 +129,7 @@ public function testSolutionDirectoryIsPassedAsEnvVar(): void
 
         $process = $factory->create($input);
         $cmd  = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
-        $cmd .= " 'run' '--rm' '-e SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
+        $cmd .= " 'run' '--rm' '-e' 'SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
         static::assertSame($cmd, $process->getCommandLine());
         static::assertSame('/docker-dir', $process->getWorkingDirectory());
         static::assertSame(['SOLUTION' => __DIR__], $process->getEnv());