wip

chevere · Jan 24, 2020 · f94f004 · f94f004
1 parent ffd535c
commit f94f004
Show file tree

Hide file tree

Showing 14 changed files with 139 additions and 60 deletions.
diff --git a/Chevere/Components/Screen/ConsoleScreen.php b/Chevere/Components/Screen/ConsoleScreen.php
diff --git a/Chevere/Components/Screen/Container.php b/Chevere/Components/Screen/Container.php
@@ -29,6 +29,20 @@ public function __construct(ScreenInterface $runtime)
         ];
     }
 
+    public function withDebugScreen(ScreenInterface $screen)
+    {
+        $new = clone $this;
+
+        return $new->withAddedScreen(static::DEBUG, $screen);
+    }
+
+    public function withConsoleScreen(ScreenInterface $screen)
+    {
+        $new = clone $this;
+
+        return $new->withAddedScreen(static::CONSOLE, $screen);
+    }
+
     public function withAddedScreen(string $name, ScreenInterface $screen): ContainerInterface
     {
         $new = clone $this;

diff --git a/Chevere/Components/Screen/Formatters/ConsoleFormatter.php b/Chevere/Components/Screen/Formatters/ConsoleFormatter.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of Chevere.
+ *
+ * (c) Rodolfo Berrios <rodolfo@chevere.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chevere\Components\Screen\Formatters;
+
+use Chevere\Components\Screen\Interfaces\FormatterInterface;
+use JakubOnderka\PhpConsoleColor\ConsoleColor;
+
+final class ConsoleFormatter implements FormatterInterface
+{
+    private string $char;
+
+    public function __construct()
+    {
+        $this->char = (new ConsoleColor)->apply('reverse', '%');
+    }
+
+    public function wrap(string $display): string
+    {
+        return $this->char . $display . $this->char;
+    }
+}
diff --git a/Chevere/Components/Screen/DebugScreen.php → ...ents/Screen/Formatters/DebugFormatter.php b/Chevere/Components/Screen/DebugScreen.php → ...ents/Screen/Formatters/DebugFormatter.php
@@ -11,11 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Components\Screen;
+namespace Chevere\Components\Screen\Formatters;
 
-final class DebugScreen extends AbstractScreen
+use Chevere\Components\Screen\Interfaces\FormatterInterface;
+
+final class DebugFormatter implements FormatterInterface
 {
-    protected function wrap(string $display): string
+    public function wrap(string $display): string
     {
         return '🐞 ▶' . $display . '🔚 ';
     }

diff --git a/Chevere/Components/Screen/RuntimeScreen.php → ...ts/Screen/Formatters/RuntimeFormatter.php b/Chevere/Components/Screen/RuntimeScreen.php → ...ts/Screen/Formatters/RuntimeFormatter.php
@@ -11,11 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Components\Screen;
+namespace Chevere\Components\Screen\Formatters;
 
-final class RuntimeScreen extends AbstractScreen
+use Chevere\Components\Screen\Interfaces\FormatterInterface;
+
+final class RuntimeFormatter implements FormatterInterface
 {
-    protected function wrap(string $display): string
+    public function wrap(string $display): string
     {
         return $display;
     }

diff --git a/Chevere/Components/Screen/Formatters/SilentFormatter.php b/Chevere/Components/Screen/Formatters/SilentFormatter.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of Chevere.
+ *
+ * (c) Rodolfo Berrios <rodolfo@chevere.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chevere\Components\Screen\Formatters;
+
+use Chevere\Components\Screen\Interfaces\FormatterInterface;
+
+final class SilentFormatter implements FormatterInterface
+{
+    public function wrap(string $display): string
+    {
+        return '';
+    }
+}
diff --git a/Chevere/Components/Screen/Interfaces/ContainerInterface.php b/Chevere/Components/Screen/Interfaces/ContainerInterface.php
@@ -21,6 +21,10 @@ interface ContainerInterface
 
     public function __construct(ScreenInterface $runtime);
 
+    public function withDebugScreen(ScreenInterface $screen);
+
+    public function withConsoleScreen(ScreenInterface $screen);
+
     public function withAddedScreen(string $name, ScreenInterface $screen): ContainerInterface;
 
     public function has(string $name): bool;

diff --git a/Chevere/Components/Screen/Interfaces/FormatterInterface.php b/Chevere/Components/Screen/Interfaces/FormatterInterface.php
@@ -15,7 +15,5 @@
 
 interface FormatterInterface
 {
-    public function before(string $display): string;
-
-    public function after(string $display): string;
+    public function wrap(string $display): string;
 }
diff --git a/Chevere/Components/Screen/Interfaces/ScreenInterface.php b/Chevere/Components/Screen/Interfaces/ScreenInterface.php
@@ -19,6 +19,8 @@ interface ScreenInterface
 {
     public function traceability(): bool;
 
+    public function formatter(): FormatterInterface;
+
     public function trace(): array;
 
     /**

diff --git a/Chevere/Components/Screen/AbstractScreen.php → Chevere/Components/Screen/Screen.php b/Chevere/Components/Screen/AbstractScreen.php → Chevere/Components/Screen/Screen.php
@@ -13,55 +13,64 @@
 
 namespace Chevere\Components\Screen;
 
+use Chevere\Components\Screen\Interfaces\FormatterInterface;
 use Chevere\Components\Screen\Interfaces\ScreenInterface;
 use Psr\Http\Message\StreamInterface;
 use function GuzzleHttp\Psr7\stream_for;
 
-abstract class AbstractScreen implements ScreenInterface
+final class Screen implements ScreenInterface
 {
     private bool $traceability;
 
+    private FormatterInterface $formatter;
+
     private array $trace = [];
 
     /** @var StreamInterface[] */
     private array $queue = [];
 
-    public function __construct(bool $traceability)
+    public function __construct(bool $traceability, FormatterInterface $formatter)
     {
         $this->traceability = $traceability;
+        $this->formatter = $formatter;
     }
 
     public function traceability(): bool
     {
         return $this->traceability;
     }
 
+    public function formatter(): FormatterInterface
+    {
+        return $this->formatter;
+    }
+
     public function trace(): array
     {
         return $this->trace;
     }
 
-    final public function attach(string $display): ScreenInterface
+    public function attach(string $display): ScreenInterface
     {
         $this->handleTrace();
-        $this->queue[] = stream_for($this->wrap($display));
+        $this->queue[] = stream_for($this->formatter->wrap($display));
 
         return $this;
     }
 
-    final public function attachNl(string $display): ScreenInterface
+    public function attachNl(string $display): ScreenInterface
     {
         $this->handleTrace();
 
         return $this->attach($display . "\n");
     }
 
-    final public function queue(): array
+    public function queue(): array
     {
         return $this->queue;
     }
 
-    final public function show(): ScreenInterface
+    public function show(): ScreenInterface
     {
         $this->handleTrace();
         // TODO YIELD HERE
@@ -93,6 +102,4 @@ private function handleTrace(): void
             'arguments' => $caller['args'],
         ];
     }
-
-    abstract protected function wrap(string $display): string;
 }
diff --git a/Chevere/Components/Screen/ScreenContainer.php b/Chevere/Components/Screen/ScreenContainer.php
@@ -44,6 +44,11 @@ public function console(): ScreenInterface
         return $this->container->get($this->container::CONSOLE);
     }
 
+    public function get(string $name): ScreenInterface
+    {
+        return $this->container->get($name);
+    }
+
     public function getAll(): array
     {
         return $this->container->getAll();

diff --git a/Chevere/Components/Screen/SilentScreen.php b/Chevere/Components/Screen/SilentScreen.php
@@ -13,18 +13,30 @@
 
 namespace Chevere\Components\Screen;
 
+use Chevere\Components\Screen\Formatters\SilentFormatter;
+use Chevere\Components\Screen\Interfaces\FormatterInterface;
 use Chevere\Components\Screen\Interfaces\ScreenInterface;
 
 /**
  * A completely silent screen.
  */
 final class SilentScreen implements ScreenInterface
 {
+    public function __construct()
+    {
+        $this->formatter = new SilentFormatter;
+    }
+
     public function traceability(): bool
     {
         return false;
     }
 
+    public function formatter(): FormatterInterface
+    {
+        return $this->formatter;
+    }
+
     public function trace(): array
     {
         return [];

diff --git a/Chevere/Components/Screen/Tests/ScreenTest.php b/Chevere/Components/Screen/Tests/ScreenTest.php
@@ -22,7 +22,7 @@ public function testConstruct(): void
         $this->expectNotToPerformAssertions();
         // xdump($this);
         // xdd(screen()->debug()->attach('Fatal error at: ' . __FILE__));
-        screens()->debug()->attach('Fatal error at: ' . __FILE__)->show();
+        screens()->console()->attach('Fatal error at: ' . __FILE__)->show();
         // xdd(screens()->debug()->trace());
         // screens()->console()->attach('Fatal error at: ' . __FILE__)->show();
         // screen()->runtime()->attachNl(varInfo($this))->display();

diff --git a/phpunit.php b/phpunit.php
@@ -16,15 +16,14 @@
 use Chevere\Components\App\Instances\BootstrapInstance;
 use Chevere\Components\App\Instances\ScreenContainerInstance;
 use Chevere\Components\Bootstrap\Bootstrap;
-use Chevere\Components\Screen\ConsoleScreen;
 use Chevere\Components\Screen\Container;
-use Chevere\Components\Screen\DebugScreen;
+use Chevere\Components\Screen\Formatters\ConsoleFormatter;
+use Chevere\Components\Screen\Formatters\DebugFormatter;
+use Chevere\Components\Screen\Formatters\RuntimeFormatter;
 use Chevere\Components\Screen\Interfaces\ContainerInterface;
 use Chevere\Components\Screen\RuntimeScreen;
 use Chevere\Components\Screen\Screen;
 use Chevere\Components\Screen\ScreenContainer;
-use Chevere\Components\Screen\SilentScreen;
-use JakubOnderka\PhpConsoleColor\ConsoleColor;
 
 require 'vendor/autoload.php';
 
@@ -37,20 +36,24 @@
 
 new ScreenContainerInstance(
     new ScreenContainer(
-        (new Container(new RuntimeScreen(true)))
-            ->withAddedScreen(
-                ContainerInterface::DEBUG,
-                new DebugScreen(true),
+        (new Container(
+            new Screen(false, new RuntimeFormatter)
+        ))
+            ->withDebugScreen(
+                new Screen(false, new DebugFormatter)
+            )
+            ->withConsoleScreen(
+                new Screen(false, new DebugFormatter)
             )
             ->withAddedScreen(
-                ContainerInterface::CONSOLE,
-                new ConsoleScreen(true),
+                'rodo',
+                new Screen(false, new RuntimeFormatter)
             )
     )
 );
 
-register_shutdown_function(function () {
-    foreach (ScreenContainerInstance::get()->getAll() as $screen) {
-        xdump($screen->trace());
-    }
-});
+// register_shutdown_function(function () {
+//     foreach (ScreenContainerInstance::get()->getAll() as $screen) {
+//         xdump($screen->trace());
+//     }
+// });