Merge pull request #142 from php-school/improve-ui

Improve ui

Author: AydinHassan

.travis.yml

@@ -24,8 +24,7 @@ before_script:
 
 script:
   - ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
-  - ./vendor/bin/phpcs --standard=PSR2 ./src/
-  - ./vendor/bin/phpcs --standard=PSR2 ./test/
+  - composer cs
 
 after_script:
   - bash <(curl -s https://codecov.io/bash)

app/config.php

@@ -37,7 +37,23 @@
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\Output\StdOutput;
 use PhpSchool\PhpWorkshop\Patch;
+use PhpSchool\PhpWorkshop\Result\Cgi\GenericFailure as CgiGenericFailure;
+use PhpSchool\PhpWorkshop\Result\Cgi\RequestFailure as CgiRequestFailure;
+use PhpSchool\PhpWorkshop\Result\Cgi\CgiResult;
+use PhpSchool\PhpWorkshop\Result\Cli\CliResult;
+use PhpSchool\PhpWorkshop\Result\Cli\GenericFailure as CliGenericFailure;
+use PhpSchool\PhpWorkshop\Result\Cli\RequestFailure as CliRequestFailure;
+use PhpSchool\PhpWorkshop\Result\Failure;
+use PhpSchool\PhpWorkshop\Result\FunctionRequirementsFailure;
+use PhpSchool\PhpWorkshop\Result\StdOutFailure;
 use PhpSchool\PhpWorkshop\ResultAggregator;
+use PhpSchool\PhpWorkshop\ResultRenderer\CgiResultRenderer;
+use PhpSchool\PhpWorkshop\ResultRenderer\CliResultRenderer;
+use PhpSchool\PhpWorkshop\ResultRenderer\FailureRenderer;
+use PhpSchool\PhpWorkshop\ResultRenderer\FunctionRequirementsFailureRenderer;
+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;
@@ -125,7 +141,7 @@
     RunnerManager::class => function (ContainerInterface $c) {
         $manager = new RunnerManager;
         $manager->addFactory(new CliRunnerFactory($c->get(EventDispatcher::class)));
-        $manager->addFactory(new CgiRunnerFactory($c->get(EventDispatcher::class)));
+        $manager->addFactory(new CgiRunnerFactory($c->get(EventDispatcher::class), $c->get(RequestRenderer::class)));
         $manager->addFactory(new CustomVerifyingRunnerFactory);
         return $manager;
     },
@@ -231,6 +247,7 @@
     FakerGenerator::class => function () {
         return FakerFactory::create();
     },
+    RequestRenderer::class => object(),
 
     TerminalInterface::class => factory([TerminalFactory::class, 'fromSystem']),
     'menu' => factory(MenuFactory::class),
@@ -266,7 +283,26 @@
     ResetProgress::class => function (ContainerInterface $c) {
         return new ResetProgress($c->get(UserStateSerializer::class));
     },
-    ResultRendererFactory::class => object(),
+    ResultRendererFactory::class => function (ContainerInterface $c) {
+        $factory = new ResultRendererFactory;
+        $factory->registerRenderer(FunctionRequirementsFailure::class, FunctionRequirementsFailureRenderer::class);
+        $factory->registerRenderer(Failure::class, FailureRenderer::class);
+        $factory->registerRenderer(
+            CgiResult::class,
+            CgiResultRenderer::class,
+            function (CgiResult $result) use ($c) {
+                return new CgiResultRenderer($result, $c->get(RequestRenderer::class));
+            }
+        );
+        $factory->registerRenderer(CgiGenericFailure::class, FailureRenderer::class);
+        $factory->registerRenderer(CgiRequestFailure::class, CgiRequestFailureRenderer::class);
+
+        $factory->registerRenderer(CliResult::class, CliResultRenderer::class);
+        $factory->registerRenderer(CliGenericFailure::class, FailureRenderer::class);
+        $factory->registerRenderer(CliRequestFailure::class, CliRequestFailureRenderer::class);
+
+        return $factory;
+    },
     ResultsRenderer::class => function (ContainerInterface $c) {
         return new ResultsRenderer(
             $c->get('appName'),
@@ -277,6 +313,7 @@
             $c->get(ResultRendererFactory::class)
         );
     },
+
     'coreContributors' => [
         '@AydinHassan' => 'Aydin Hassan',
         '@mikeymike'   => 'Michael Woodward',

composer.json

@@ -28,13 +28,13 @@
         "php-school/cli-menu": "^2.0",
         "beberlei/assert": "^2.4",
         "psr/http-message": "^1.0",
-        "zendframework/zend-diactoros": "^1.1.3",
+        "zendframework/zend-diactoros": "^1.3.6",
         "myclabs/php-enum": "^1.4",
         "nikic/php-parser": "^2.1"
     },
     "require-dev": {
         "composer/composer": "^1.2",
-        "phpunit/phpunit": "^5.6",
+        "phpunit/phpunit": "^5.7.2",
         "phpunit/phpunit-mock-objects": "^3.3",
         "squizlabs/php_codesniffer": "^2.4"
     },
@@ -43,7 +43,8 @@
             "PhpSchool\\PhpWorkshop\\": "src"
         },
         "files": [
-            "src/Event/functions.php"
+            "src/Event/functions.php",
+            "src/functions.php"
         ]
     },
     "autoload-dev": {
@@ -58,8 +59,8 @@
     },
     "scripts" : {
         "cs" : [
-            "phpcs src --standard=PSR2",
-            "phpcs test --standard=PSR2"
+            "phpcs src --standard=PSR2 --encoding=UTF-8",
+            "phpcs test --standard=PSR2 --encoding=UTF-8"
         ]
     }
 }