Merge pull request #154 from php-school/php-parser-3

Php parser 3

Author: mikeymike

app/config.php

@@ -3,6 +3,7 @@
 use Colors\Color;
 use function DI\object;
 use function DI\factory;
+use Kadet\Highlighter\KeyLighter;
 use function PhpSchool\PhpWorkshop\Event\containerListener;
 use Interop\Container\ContainerInterface;
 use League\CommonMark\DocParser;
@@ -55,9 +56,7 @@
 use PhpSchool\PhpWorkshop\ResultRenderer\Cli\RequestFailureRenderer as CliRequestFailureRenderer;
 use PhpSchool\PhpWorkshop\ResultRenderer\Cgi\RequestFailureRenderer as CgiRequestFailureRenderer;
 use PhpSchool\PhpWorkshop\Utils\RequestRenderer;
-use PhpSchool\PSX\Factory as PsxFactory;
 use PhpSchool\PhpWorkshop\WorkshopType;
-use PhpSchool\PSX\SyntaxHighlighter;
 use PhpSchool\PhpWorkshop\Check\FileExistsCheck;
 use PhpSchool\PhpWorkshop\Check\FunctionRequirementsCheck;
 use PhpSchool\PhpWorkshop\Check\PhpLintCheck;
@@ -279,8 +278,6 @@
     UserState::class => function (ContainerInterface $c) {
         return $c->get(UserStateSerializer::class)->deSerialize();
     },
-    SyntaxHighlighter::class => factory(PsxFactory::class),
-    PsxFactory::class => object(),
     ResetProgress::class => function (ContainerInterface $c) {
         return new ResetProgress($c->get(UserStateSerializer::class));
     },
@@ -312,11 +309,15 @@ function (CgiResult $result) use ($c) {
             $c->get(Color::class),
             $c->get(TerminalInterface::class),
             $c->get(ExerciseRepository::class),
-            $c->get(SyntaxHighlighter::class),
+            $c->get(KeyLighter::class),
             $c->get(ResultRendererFactory::class)
         );
     },
 
+    KeyLighter::class => function () {
+        return new KeyLighter;
+    },
+
     'coreContributors' => [
         '@AydinHassan' => 'Aydin Hassan',
         '@mikeymike'   => 'Michael Woodward',

composer.json

@@ -23,14 +23,14 @@
         "symfony/process": "^2.3|^3.0",
         "symfony/filesystem": "^2.3|^3.0",
         "fzaninotto/faker": "^1.5",
-        "aydin-hassan/cli-md-renderer": "^2.1",
-        "php-school/psx": "~1.0",
+        "aydin-hassan/cli-md-renderer": "^2.2",
         "php-school/cli-menu": "^2.0",
         "beberlei/assert": "^2.4",
         "psr/http-message": "^1.0",
         "zendframework/zend-diactoros": "^1.3.6",
         "myclabs/php-enum": "^1.4",
-        "nikic/php-parser": "^2.1"
+        "kadet/keylighter": "^0.8.2",
+        "nikic/php-parser": "^3.0"
     },
     "require-dev": {
         "composer/composer": "^1.2",