Check code for errors and warnings.

app/config.php

@@ -203,9 +203,9 @@
     }),
     CodePatcher::class  => factory(function (ContainerInterface $c) {
         $patch = (new Patch)
-            ->withInsertion(new Insertion(Insertion::TYPE_BEFORE, 'ini_set("display_errors", 1);'))
+            ->withInsertion(new Insertion(Insertion::TYPE_BEFORE, 'ini_set("display_errors", 0);'))
             ->withInsertion(new Insertion(Insertion::TYPE_BEFORE, 'error_reporting(E_ALL);'))
-            ->withInsertion(new Insertion(Insertion ::TYPE_BEFORE, 'date_default_timezone_set("Europe/London");'));
+            ->withInsertion(new Insertion(Insertion::TYPE_BEFORE, 'date_default_timezone_set("Europe/London");'));
 
         return new CodePatcher($c->get(Parser::class), new Standard, $patch);
     }),

src/Exception/CodeExecutionException.php

@@ -12,14 +12,50 @@
  */
 class CodeExecutionException extends RuntimeException
 {
+
+    /**
+     * @var string
+     */
+    private $actual;
+    /**
+     * @var string
+     */
+    private $errors;
+
+    /**
+     * CodeExecutionException constructor.
+     * @param string $reason
+     * @param string $actual
+     * @param string $errors
+     */
+    public function __construct($reason, $actual = null, $errors = null)
+    {
+        $this->message  = $reason;
+        $this->actual   = $actual;
+        $this->errors   = $errors;
+    }
+
     /**
      * @param Process $process
      * @return static
      */
     public static function fromProcess(Process $process)
     {
-        $message        = 'PHP Code failed to execute. Error: "%s"';
-        $processOutput  = $process->getErrorOutput() ? $process->getErrorOutput() : $process->getOutput();
-        return new static(sprintf($message, $processOutput));
+        $message        = "PHP Code failed to execute. Error: \n%s";
+        $processOutput  = $process->getOutput();
+        $processErrorOutput  = $process->getErrorOutput();
+        return new static(
+            sprintf($message, $processErrorOutput ?: $processOutput), $processOutput, $processErrorOutput
+        );
+    }
+
+    public function getActual()
+    {
+        return $this->actual;
+    }
+
+    public function getErrors()
+    {
+        return $this->errors;
     }
 }

src/ExerciseRunner/CgiRunner.php

@@ -98,7 +98,7 @@ private function checkRequest(RequestInterface $request, $fileName)
 
         try {
             $event = $this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.verify.user-execute.pre', $request));
-            $userResponse = $this->executePhpFile($fileName, $event->getRequest(), 'user');
+            list($userResponse, $userWarnings) = $this->executePhpFile($fileName, $event->getRequest(), 'user');
         } catch (CodeExecutionException $e) {
             $this->eventDispatcher->dispatch(new Event('cgi.verify.user-execute.fail', ['exception' => $e]));
             return Failure::fromNameAndCodeExecutionFailure($this->getName(), $e);
@@ -109,8 +109,15 @@ private function checkRequest(RequestInterface $request, $fileName)
         $solutionHeaders    = $this->getHeaders($solutionResponse);
         $userHeaders        = $this->getHeaders($userResponse);
 
-        if ($solutionBody !== $userBody || $solutionHeaders !== $userHeaders) {
-            return new CgiOutRequestFailure($request, $solutionBody, $userBody, $solutionHeaders, $userHeaders);
+        if ($solutionBody !== $userBody || $solutionHeaders !== $userHeaders || $userWarnings) {
+            return new CgiOutRequestFailure(
+                $request,
+                $solutionBody,
+                $userBody,
+                $solutionHeaders,
+                $userHeaders,
+                $userWarnings
+            );
         }
 
         return new Success($this->getName());
@@ -153,7 +160,11 @@ private function executePhpFile($fileName, RequestInterface $request, $type)
             $output = "HTTP/1.0 200 OK\r\n" . $output;
         }
 
-        return ResponseSerializer::fromString($output);
+        return (
+        $type == 'user' ?
+            [ResponseSerializer::fromString($output), $process->getErrorOutput()]
+            : ResponseSerializer::fromString($output)
+        );
     }
 
     /**