* Wrap basepath in a decorator to canonicalise there

* Update DI merging to let PHP-DI handle except for event listeners
* Convert all notices/warnings to exceptions
* Print out exceptions in full

Author: AydinHassan

app/config.php

@@ -4,6 +4,7 @@
 
 use Colors\Color;
 use PhpSchool\PhpWorkshop\Check\FileComparisonCheck;
+use PhpSchool\PhpWorkshop\ExerciseRunner\Factory\ServerRunnerFactory;
 use PhpSchool\PhpWorkshop\Listener\InitialCodeListener;
 use PhpSchool\PhpWorkshop\Listener\TearDownListener;
 use PhpSchool\PhpWorkshop\Logger\ConsoleLogger;
@@ -96,6 +97,9 @@
     'currentWorkingDirectory' => function (ContainerInterface $c) {
         return getcwd();
     },
+    'basePath' => DI\decorate(function (string $previous) {
+        return canonicalise_path($previous);
+    }),
     WorkshopType::class => WorkshopType::STANDARD(),
     Psr\Log\LoggerInterface::class => function (ContainerInterface $c) {
         $appName = $c->get('appName');
@@ -150,7 +154,7 @@
         return $colors;
     },
     OutputInterface::class => function (ContainerInterface $c) {
-        return new StdOutput($c->get(Color::class), $c->get(Terminal::class));
+        return new StdOutput($c->get(Color::class), $c->get(Terminal::class), $c->get('basePath'));
     },
 
     ExerciseRepository::class => function (ContainerInterface $c) {
@@ -166,10 +170,10 @@
 
     //Exercise Runners
     RunnerManager::class => function (ContainerInterface $c) {
-        $manager = new RunnerManager;
+        $manager = new RunnerManager();
         $manager->addFactory(new CliRunnerFactory($c->get(EventDispatcher::class)));
         $manager->addFactory(new CgiRunnerFactory($c->get(EventDispatcher::class), $c->get(RequestRenderer::class)));
-        $manager->addFactory(new CustomVerifyingRunnerFactory);
+        $manager->addFactory(new CustomVerifyingRunnerFactory());
         return $manager;
     },
 

src/Application.php

@@ -204,9 +204,9 @@ public function configure(bool $debugMode = false): ContainerInterface
             }
         }
 
-        set_error_handler(function () use ($container): bool {
-            $this->tearDown($container);
-            return false; // Use default error handler
+        //turn all notices & warnings in to exceptions
+        set_error_handler(function (int $severity, string $message, string $file, int $line) {
+            throw new \ErrorException($message, 0, $severity, $file, $line);
         });
 
         $this->container = $container;
@@ -259,12 +259,7 @@ public function run(): int
 
             $container
                 ->get(OutputInterface::class)
-                ->printError(
-                    sprintf(
-                        '%s',
-                        $message
-                    )
-                );
+                ->printException($e);
             return 1;
         }
 
@@ -280,13 +275,18 @@ public function run(): int
     private function getContainer(bool $debugMode): Container
     {
         $containerBuilder = new ContainerBuilder();
-        $containerBuilder->addDefinitions(
-            array_merge_recursive(
-                require $this->frameworkConfigLocation,
-                require $this->diConfigFile
-            )
+        $diConfig = require $this->diConfigFile;
+        $fwConfig = require $this->frameworkConfigLocation;
+
+        $fwConfig['eventListeners'] = array_merge_recursive(
+            $fwConfig['eventListeners'],
+            $diConfig['eventListeners'] ?? []
         );
 
+        unset($diConfig['eventListeners']);
+
+        $containerBuilder->addDefinitions($diConfig, $fwConfig);
+
         $containerBuilder->addDefinitions(
             [
                 'workshopTitle' => $this->workshopTitle,

test/ApplicationTest.php

@@ -100,7 +100,7 @@ public function testExceptionIsThrownIfResultRendererClassDoesNotExist(): void
 
     public function testTearDownEventIsFiredOnApplicationException(): void
     {
-        $configFile = $this->getTemporaryFile('config.php', '<?php return [];');
+        $configFile = $this->getTemporaryFile('config.php', '<?php return ["basePath" => __DIR__ . "../"];');
         $application = new Application('Testing TearDown', $configFile);
 
         $container = $application->configure();
@@ -125,7 +125,7 @@ public function testTearDownEventIsFiredOnApplicationException(): void
 
     public function testLoggingExceptionDuringTearDown(): void
     {
-        $configFile = $this->getTemporaryFile('config.php', '<?php return [];');
+        $configFile = $this->getTemporaryFile('config.php', '<?php return ["basePath" => __DIR__ . "../"];');
         $application = new Application('Testing tear down logging', $configFile);
         $exception = new \Exception('Unexpected error');
 
@@ -159,15 +159,15 @@ static function () use ($exception) {
 
     public function testConfigureReturnsSameContainerInstance(): void
     {
-        $configFile = $this->getTemporaryFile('config.php', '<?php return [];');
+        $configFile = $this->getTemporaryFile('config.php', '<?php return ["basePath" => __DIR__ . "../"];');
         $application = new Application('Testing Configure', $configFile);
 
         self::assertSame($application->configure(), $application->configure());
     }
 
     public function testDebugFlagSwitchesLoggerToConsoleLogger(): void
     {
-        $configFile = $this->getTemporaryFile('config.php', '<?php return [];');
+        $configFile = $this->getTemporaryFile('config.php', '<?php return ["basePath" => __DIR__ . "../"];');
         $application = new Application('My workshop', $configFile);
         $container = $application->configure(true);
 

test/Logger/ConsoleLoggerTest.php

@@ -18,6 +18,7 @@ public function setUp(): void
 
         $this->container->set('phpschoolGlobalDir', $this->getTemporaryDirectory());
         $this->container->set('appName', 'my-workshop');
+        $this->container->set('basePath', __DIR__ . '/../');
         $this->container->set('debugMode', true);
     }