Merge branch 'master' into develop

Author: AydinHassan

CHANGELOG.md

@@ -0,0 +1,31 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+
+## [Unreleased][unreleased]
+### Added
+
+### Changed
+
+### Fixed
+
+### Removed
+
+## [1.2.0]
+ 
+### Added
+ - Added ability to register event listeners via config as either callables or the name of a callable container entry (#133)
+ - Added an event dispatch for whenever an exercise is selected via the menu (#134)
+
+## [1.1.0]
+### Fixed
+ - Menu items now update the status when progress is reset (#131, #86)
+ - Added tests for ResultRendererFactory and fixed the interface validation (#126)
+   
+### Changed
+ - Improved message when a solution fails (#129)  
+ 
+### Added
+ - Added feature to put workshop in tutorial mode where exercises must be completed one after another (#127)
+ - Updated dependencies (5d16877)
+ - Added list support to markdown problem files (#132)

app/config.php

@@ -32,6 +32,7 @@
 use PhpSchool\PhpWorkshop\Patch;
 use PhpSchool\PhpWorkshop\ResultAggregator;
 use PhpSchool\PSX\Factory as PsxFactory;
+use PhpSchool\PhpWorkshop\WorkshopType;
 use PhpSchool\PSX\SyntaxHighlighter;
 use PhpSchool\PhpWorkshop\Check\FileExistsCheck;
 use PhpSchool\PhpWorkshop\Check\FunctionRequirementsCheck;
@@ -46,7 +47,6 @@
 use PhpSchool\PhpWorkshop\CommandRouter;
 use PhpSchool\PhpWorkshop\ExerciseRenderer;
 use PhpSchool\PhpWorkshop\ExerciseRepository;
-use PhpSchool\PhpWorkshop\ExerciseRunner;
 use PhpSchool\PhpWorkshop\Factory\MarkdownCliRendererFactory;
 use PhpSchool\PhpWorkshop\MarkdownRenderer;
 use PhpSchool\PhpWorkshop\ResultRenderer\ResultsRenderer;
@@ -58,6 +58,7 @@
 
 return [
     'appName' => basename($_SERVER['argv'][0]),
+    WorkshopType::class => WorkshopType::STANDARD(),
     ExerciseDispatcher::class => function (ContainerInterface $c) {
         return new ExerciseDispatcher(
             $c->get(RunnerFactory::class),
@@ -239,10 +240,7 @@
     SyntaxHighlighter::class => factory(PsxFactory::class),
     PsxFactory::class => object(),
     ResetProgress::class => function (ContainerInterface $c) {
-        return new ResetProgress(
-            $c->get(UserStateSerializer::class),
-            $c->get(OutputInterface::class)
-        );
+        return new ResetProgress($c->get(UserStateSerializer::class));
     },
     ResultRendererFactory::class => object(),
     ResultsRenderer::class => function (ContainerInterface $c) {

composer.json

@@ -23,9 +23,9 @@
         "symfony/process": "^2.3|^3.0",
         "symfony/filesystem": "^2.3|^3.0",
         "fzaninotto/faker": "^1.5",
-        "aydin-hassan/cli-md-renderer": "^2.0",
+        "aydin-hassan/cli-md-renderer": "^2.1",
         "php-school/psx": "~1.0",
-        "php-school/cli-menu": "^1.0.3",
+        "php-school/cli-menu": "^2.0",
         "beberlei/assert": "^2.4",
         "psr/http-message": "^1.0",
         "zendframework/zend-diactoros": "^1.1.3",