Commit 6563a42

committed

fix: some error for cli utils

1 parent cd0a4d4 commit 6563a42Copy full SHA for 6563a42

File tree

2 files changed

+32

-8

lines changed

libs/cli-utils/src
- App.php
- Color.php

2 files changed

+32

-8

lines changed

`‎libs/cli-utils/src/App.php`

Lines changed: 30 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`namespace Toolkit\Cli;`
`10`	`10`
`11`	`11`	`use InvalidArgumentException;`
	`12`	`+use RuntimeException;`
`12`	`13`	`use Throwable;`
`13`	`14`	`use function array_merge;`
`14`	`15`	`use function array_shift;`
`@@ -23,6 +24,8 @@`
`23`	`24`	`use function method_exists;`
`24`	`25`	`use function str_pad;`
`25`	`26`	`use function strlen;`
	`27`	`+use function strpos;`
	`28`	`+use function strtr;`
`26`	`29`	`use function trim;`
`27`	`30`	`use function ucfirst;`
`28`	`31`
`@@ -181,7 +184,7 @@ public function runHandler(string $command, $handler)`
`181`	`184`	`return $handler($this);`
`182`	`185`	`}`
`183`	`186`
`184`		`- throw new InvalidArgumentException("Invalid handler of the command: $command");`
	`187`	`+ throw new RuntimeException("Invalid handler of the command: $command");`
`185`	`188`	`}`
`186`	`189`
`187`	`190`	`/**`
`@@ -191,6 +194,11 @@ public function runHandler(string $command, $handler)`
`191`	`194`	`*/`
`192`	`195`	`protected function handleException(Throwable $e): int`
`193`	`196`	`{`
	`197`	`+ if ($e instanceof InvalidArgumentException) {`
	`198`	`+ Color::println('ERROR: ' . $e->getMessage(), 'error');`
	`199`	`+ return 0;`
	`200`	`+ }`
	`201`	`+`
`194`	`202`	`$code = $e->getCode() !== 0 ? $e->getCode() : -1;`
`195`	`203`
`196`	`204`	`printf("Exception(%d): %s\nFile: %s(Line %d)\nTrace:\n%s\n", $code, $e->getMessage(), $e->getFile(),`
`@@ -292,24 +300,40 @@ public function displayHelp(string $err = ''): void`
`292`	`300`	`*/`
`293`	`301`	`public function displayCommandHelp(string $name): void`
`294`	`302`	`{`
`295`		`- $fullCmd = $this->script . "$name";`
`296`		`- $config = $this->messages[$name] ?? [];`
`297`		`- $usage = "$fullCmd [args ...] [--opts ...]";`
	`303`	`+ $checkVar = false;`
	`304`	`+ $fullCmd = $this->script . "$name";`
	`305`	`+`
	`306`	`+ $config = $this->messages[$name] ?? [];`
	`307`	`+ $usage = "$fullCmd [args ...] [--opts ...]";`
`298`	`308`
`299`	`309`	`if (!$config) {`
`300`	`310`	`$nodes = [`
`301`	`311`	`'No description for the command',`
`302`	`312`	`"<comment>Usage:</comment> \n$usage"`
`303`	`313`	`];`
`304`	`314`	`} else {`
	`315`	`+ $checkVar = true;`
	`316`	`+`
`305`	`317`	`$nodes = [`
`306`	`318`	`ucfirst($config['desc']),`
`307`	`319`	`"<comment>Usage:</comment> \n" . ($config['usage'] ?: $usage),`
`308`	`320`	`$config['help']`
`309`	`321`	`];`
`310`	`322`	`}`
`311`	`323`
`312`		`- echo Color::render(implode("\n", $nodes));`
	`324`	`+ $help = implode("\n", $nodes);`
	`325`	`+`
	`326`	`+ if ($checkVar && strpos($help, '{{')) {`
	`327`	`+ $help = strtr($help, [`
	`328`	`+ '{{command}}' => $name,`
	`329`	`+ '{{fullCmd}}' => $fullCmd,`
	`330`	`+ '{{workDir}}' => $this->pwd,`
	`331`	`+ '{{pwdDir}}' => $this->pwd,`
	`332`	`+ '{{script}}' => $this->script,`
	`333`	`+ ]);`
	`334`	`+ }`
	`335`	`+`
	`336`	`+ echo Color::render($help);`
`313`	`337`	`}`
`314`	`338`
`315`	`339`	`/**`
`@@ -380,7 +404,7 @@ public function getStrOpt(string $name, string $default = ''): string`
`380`	`404`
`381`	`405`	`/**`
`382`	`406`	`* @param string $name`
`383`		`- * @param bool $default`
	`407`	`+ * @param bool $default`
`384`	`408`	`*`
`385`	`409`	`* @return bool`
`386`	`410`	`*/`

`‎libs/cli-utils/src/Color.php`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -219,11 +219,11 @@ public static function printf(string $format, ...$args): void`
`219`	`219`	`* @param string\|array $messages`
`220`	`220`	`* @param string $style`
`221`	`221`	`*/`
`222`		`- public function println($messages, string $style = 'info'): void`
	`222`	`+ public staticfunction println($messages, string $style = 'info'): void`
`223`	`223`	`{`
`224`	`224`	`$string = is_array($messages) ? implode("\n", $messages) : (string)$messages;`
`225`	`225`
`226`		`- echo self::render($string, $style);`
	`226`	`+ echo self::render($string . "\n", $style);`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`/*******************************************************************************`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 6563a42

File tree

2 files changed

2 files changed

`‎libs/cli-utils/src/App.php`

`‎libs/cli-utils/src/Color.php`

0 commit comments