Colors moved to template files, and namespace cleanups

app/common/Controller/Logs.php

@@ -5,7 +5,7 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\Views\Blade as View;
 use ProVM\Common\Service\Logs as Service;
-use ProVM\Logview\Log;
+use function Safe\json_encode;
 
 class Logs
 {
@@ -13,16 +13,9 @@ class Logs
     {
         $log = $service->get($log_file);
 
-        $levels = [];
-        foreach (Log::LEVELS as $level) {
-            $levels[strtolower($level)] = (object) [
-                'text' => Log::COLORS[$level],
-                'background' => Log::BACKGROUNDS[$level],
-            ];
-        }
-        return $view->render($response, 'logs.show', compact('log', 'levels'));
+        return $view->render($response, 'logs.show', compact('log'));
     }
-    public function getMore(ServerRequestInterface $request, ResponseInterface $response, View $view, Service $service, string $log_file, int $start = 0, int $amount = 100): ResponseInterface
+    public function getMore(ServerRequestInterface $request, ResponseInterface $response, Service $service, string $log_file, int $start = 0, int $amount = 100): ResponseInterface
     {
         $log = $service->get($log_file);
 
@@ -32,7 +25,7 @@ class Logs
         }
         $logs = array_reverse($logs);
         $total = $log->getTotal();
-        $response->getBody()->write(\Safe\json_encode([
+        $response->getBody()->write(json_encode([
             'total' => $total,
             'logs' => $logs
         ]));

app/common/Implement/Parser.php

@@ -1,14 +1,18 @@
 <?php
 namespace ProVM\Common\Implement;
 
+use Exception;
 use ProVM\Common\Define\Log;
+use ProVM\Logview\Log as LogContent;
+use ProVM\Common\Define\Parser as Definition;
+use function Safe\fopen;
 
-abstract class Parser implements \ProVM\Common\Define\Parser
+abstract class Parser implements Definition
 {
     public function total(string $filename): int
     {
         try {
-            $fh = \Safe\fopen($filename, 'r');
+            $fh = fopen($filename, 'r');
             $cnt = 0;
             while(!feof($fh)) {
                 $line = fgets($fh);
@@ -16,12 +20,12 @@ abstract class Parser implements \ProVM\Common\Define\Parser
             }
             fclose($fh);
             return $cnt;
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return 0;
         }
     }
     public function parse(string $content): Log
     {
-        return new \ProVM\Logview\Log($content);
+        return new LogContent($content);
     }
 }

app/common/Service/Logs.php

@@ -3,11 +3,14 @@ namespace ProVM\Common\Service;
 
 use DateTimeImmutable;
 use SplFileInfo;
+use FilesystemIterator;
 use Psr\Log\LoggerInterface;
 use ProVM\Logview\Log\File;
 use ProVM\Common\Define\Parser;
 use ProVM\Logview\Parser as Parsers;
 
+use function Safe\{preg_match};
+
 class Logs
 {
     public function __construct(LoggerInterface $logger, string $folder)
@@ -42,7 +45,7 @@ class Logs
 
     public function getFiles(): array
     {
-        $files = new \FilesystemIterator($this->getFolder());
+        $files = new FilesystemIterator($this->getFolder());
         $output = [];
         foreach ($files as $file) {
             if ($file->isDir()) {
@@ -61,7 +64,7 @@ class Logs
             Parsers\PHPDefault::class => '/(php_errors.log)/'
         ];
         foreach ($map as $class => $regex) {
-            if (\Safe\preg_match($regex, $filename) === 1) {
+            if (preg_match($regex, $filename) === 1) {
                 return new $class;
             }
         }