update some logic

php-toolkit · Jun 29, 2019 · b739899 · b739899
1 parent 6563a42
commit b739899
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/libs/cli-utils/src/Cli.php b/libs/cli-utils/src/Cli.php
@@ -178,9 +178,9 @@ public static function log(string $msg, array $data = [], string $type = 'info',
         }
 
         $optString = $userOpts ? ' ' . implode(' ', $userOpts) : '';
+        $dataString = $data ? PHP_EOL . json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT) : '';
 
-        self::write(sprintf('%s [%s]%s %s %s', date('Y/m/d H:i:s'), $type, $optString, trim($msg),
-            $data ? PHP_EOL . json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT) : ''));
+        self::writef('%s [%s]%s %s %s', date('Y/m/d H:i:s'), $type, $optString, trim($msg), $dataString);
     }
 
     /*******************************************************************************
@@ -245,6 +245,7 @@ public static function isAnsiSupport(): bool
      */
     public static function isInteractive($fileDescriptor): bool
     {
+        /** @noinspection PhpComposerExtensionStubsInspection */
         return function_exists('posix_isatty') && @posix_isatty($fileDescriptor);
     }
 

diff --git a/libs/cli-utils/src/Highlighter.php b/libs/cli-utils/src/Highlighter.php
@@ -123,8 +123,18 @@ public function highlight(string $source, bool $withLineNumber = false): string
         return implode(PHP_EOL, $lines);
     }
 
+    /**
+     * @param string $file
+     * @param bool   $withLineNumber
+     *
+     * @return string
+     */
     public function highlightFile(string $file, bool $withLineNumber = false): string
     {
+        if (!file_exists($file)) {
+            throw new InvalidArgumentException("the target file is not exist! file: $file");
+        }
+
         $source = file_get_contents($file);
 
         return $this->highlight($source, $withLineNumber);