update ...

swoft-cloud · Mar 19, 2018 · 5dfec9b · 5dfec9b
1 parent f302428
commit 5dfec9b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/Console.php b/src/Console.php
@@ -30,8 +30,8 @@ public function run()
             $command = App::getBean('command');
             $command->run();
         } catch (\Throwable $e) {
-            output()->writeln(sprintf('<error>%s</error>', $e->getMessage()), true, false);
-            output()->writeln(sprintf('<error>%s</error>', $e->getTraceAsString()), true, true);
+            \output()->writeln(sprintf('<error>%s</error>', $e->getMessage()), true, false);
+            \output()->writeln(sprintf("Trace:\n%s", $e->getTraceAsString()), true, true);
         }
     }
 

diff --git a/src/Output/Output.php b/src/Output/Output.php
@@ -30,7 +30,7 @@ class Output implements OutputInterface
     public function writeln($messages = '', $newline = true, $quit = false)
     {
         if (\is_array($messages)) {
-            $messages = implode($newline ? PHP_EOL : '', $messages);
+            $messages = \implode($newline ? PHP_EOL : '', $messages);
         }
 
         // 文字里面颜色标签翻译
@@ -111,7 +111,7 @@ private function writeItems(array $items, string $cmdStyle)
 
             // 命令和描述
             $maxLength = $this->getCmdMaxLength(array_keys($items));
-            $cmd = str_pad($cmd, $maxLength, ' ');
+            $cmd = \str_pad($cmd, $maxLength, ' ');
             $cmd = "<$cmdStyle>$cmd</$cmdStyle>";
             $message = self::LEFT_CHAR . $cmd . self::GAP_CHAR . $desc;
 

diff --git a/src/Router/HandlerAdapter.php b/src/Router/HandlerAdapter.php
@@ -84,15 +84,15 @@ private function getBindParams(string $className, string $methodName): array
     /**
      * execute command by coroutine
      *
-     * @param object $class
+     * @param mixed $class
      * @param string $method
      * @param bool   $server
      * @param array  $bindParams
      */
     private function executeCommandByCoroutine($class, string $method, bool $server, $bindParams)
     {
         Coroutine::create(function () use ($class, $method, $server, $bindParams) {
-            $this->beforeCommand(get_parent_class($class), $method, $server);
+            $this->beforeCommand(\get_parent_class($class), $method, $server);
             PhpHelper::call([$class, $method], $bindParams);
             $this->afterCommand($method, $server);
         });
@@ -101,14 +101,14 @@ private function executeCommandByCoroutine($class, string $method, bool $server,
     /**
      * execute command
      *
-     * @param object $class
+     * @param mixed $class
      * @param string $method
      * @param bool   $server
      * @param array  $bindParams
      */
     private function executeCommand($class, string $method, bool $server, $bindParams)
     {
-        $this->beforeCommand(get_parent_class($class), $method, $server);
+        $this->beforeCommand(\get_parent_class($class), $method, $server);
         PhpHelper::call([$class, $method], $bindParams);
         $this->afterCommand($method, $server);
     }
@@ -177,4 +177,4 @@ private function bootstrap()
             }
         }
     }
-}
+}
diff --git a/src/Router/HandlerMapping.php b/src/Router/HandlerMapping.php
@@ -32,7 +32,7 @@ class HandlerMapping implements HandlerMappingInterface
     /**
      * the default command
      */
-    private $deaultCommand = 'index';
+    private $defaultCommand = 'index';
 
     /**
      * the delimiter
@@ -83,7 +83,7 @@ public function register(array $commandMapping)
      */
     public function isDefaultCommand(string $comamnd): bool
     {
-        return $comamnd === $this->deaultCommand;
+        return $comamnd === $this->defaultCommand;
     }
 
     /**
@@ -109,7 +109,7 @@ private function getGroupAndCommand(): array
         }
 
         if (empty($command)) {
-            $command = $this->deaultCommand;
+            $command = $this->defaultCommand;
         }
 
         return [$group, $command];
@@ -153,8 +153,8 @@ private function registerRoute(string $className, array $routes, string $prefix,
             $this->routes[$commandKey] = [$className, $methodName, $coroutine, $server];
         }
 
-        $commandKey = $this->getCommandString($prefix, $this->deaultCommand);
-        $this->routes[$commandKey] = [$className, $this->deaultCommand];
+        $commandKey = $this->getCommandString($prefix, $this->defaultCommand);
+        $this->routes[$commandKey] = [$className, $this->defaultCommand];
     }
 
     /**
@@ -191,4 +191,4 @@ private function getCommandString(string $group, string $command): string
     {
         return sprintf('%s%s%s', $group, $this->delimiter, $command);
     }
-}
+}