From cf10ce9af32f9adadb95a917744ed19ffd8b8bb7 Mon Sep 17 00:00:00 2001 From: Inhere Date: Fri, 2 Dec 2022 14:15:22 +0800 Subject: [PATCH] up: update json,git,str and more tool commands --- app/Common/CmdRunner.php | 10 +- app/Concern/InitApplicationTrait.php | 4 +- app/Console/Component/Clipboard.php | 5 +- app/Console/Component/ContentsAutoReader.php | 26 +- app/Console/Component/FlagValCollector.php | 28 -- .../Controller/Gitx/GitLabController.php | 46 +- app/Console/Controller/JsonController.php | 65 ++- app/Console/Controller/StringController.php | 29 +- app/Helper/AppHelper.php | 1 + app/Kite.php | 13 +- app/Lib/Jenkins/JenkinsConfig.php | 59 --- app/Lib/Jenkins/JenkinsFactory.php | 184 ------- composer.lock | 457 +++++++++++------- config/config.php | 7 +- 14 files changed, 417 insertions(+), 517 deletions(-) delete mode 100644 app/Console/Component/FlagValCollector.php delete mode 100644 app/Lib/Jenkins/JenkinsConfig.php delete mode 100644 app/Lib/Jenkins/JenkinsFactory.php diff --git a/app/Common/CmdRunner.php b/app/Common/CmdRunner.php index 77238ff..af15ad8 100644 --- a/app/Common/CmdRunner.php +++ b/app/Common/CmdRunner.php @@ -221,10 +221,11 @@ public function add(string $command, string $key = ''): self } /** - * @param array $config - * - command STRING|ARRAY - * - workDir STRING - * - where callable + * @param array $config = [ + * 'command' => 'STRING|ARRAY', + * 'workDir' => 'STRING', + * 'where' => 'callable', + * ] * @param string $key * * @return $this @@ -254,6 +255,7 @@ public function addByArray(array $config, string $key = ''): self public function run(bool $printOutput = false): static { $this->printOutput = $printOutput; + if ($command = $this->cmdline) { $this->innerExecute($command, $this->workDir); diff --git a/app/Concern/InitApplicationTrait.php b/app/Concern/InitApplicationTrait.php index f24df0e..0378395 100644 --- a/app/Concern/InitApplicationTrait.php +++ b/app/Concern/InitApplicationTrait.php @@ -5,12 +5,12 @@ use Inhere\Kite\Common\GitAPI\GitHubV3API; use Inhere\Kite\Common\GitAPI\GitLabV4API; use Inhere\Kite\Kite; -use Inhere\Kite\Lib\Jenkins\JenkinsFactory; use Monolog\Handler\RotatingFileHandler; use Monolog\Logger; use PhpPkg\Config\ConfigBox; use PhpPkg\EasyTpl\EasyTemplate; use PhpPkg\EasyTpl\TextTemplate; +use PhpPkg\JenkinsClient\MultiJenkins; use Toolkit\Stdlib\Arr\ArrayHelper; use Toolkit\Stdlib\Obj\ObjectBox; use Toolkit\Stdlib\OS; @@ -129,7 +129,7 @@ protected function registerComServices(ObjectBox $box): void $box->set('jenkins', function () { $config = $this->config()->getArray('jenkins'); - return new JenkinsFactory($config); + return new MultiJenkins($config); }); } diff --git a/app/Console/Component/Clipboard.php b/app/Console/Component/Clipboard.php index 85e1142..3aada32 100644 --- a/app/Console/Component/Clipboard.php +++ b/app/Console/Component/Clipboard.php @@ -2,11 +2,11 @@ namespace Inhere\Kite\Console\Component; -use Toolkit\FsUtil\File; use Toolkit\Stdlib\Obj\AbstractObj; use Toolkit\Stdlib\OS; use Toolkit\Sys\Exec; use function addslashes; +use function file_put_contents; use function tempnam; /** @@ -90,7 +90,8 @@ public function write(string $contents, bool $addSlashes = false): bool if ($multiLine) { $file = tempnam(OS::tempDir(), "tmp_"); - File::write($contents, $file); + // File::write($contents, $file); + file_put_contents($file, $contents); $command = "$program < $file"; } else { $command = "echo $contents | $program"; diff --git a/app/Console/Component/ContentsAutoReader.php b/app/Console/Component/ContentsAutoReader.php index 49a9e0b..9acf696 100644 --- a/app/Console/Component/ContentsAutoReader.php +++ b/app/Console/Component/ContentsAutoReader.php @@ -33,8 +33,20 @@ class ContentsAutoReader extends AbstractObj protected string $srcType = self::TYPE_STRING; /** + * try read contents + * + * - input empty or '@i' or '@stdin' - will read from STDIN + * - input '@c' or '@cb' or '@clipboard' - will read from Clipboard + * - input '@l' or '@load' - will read from loaded file + * - input '@FILEPATH' - will read from the filepath. + * * @param string $source - * @param array{print: bool, loadedFile: string, throwOnEmpty: bool} $opts + * @param array $opts = [ + * 'print' => true, + * 'throwOnEmpty' => false, + * 'loadedFile' => '', + * 'suffix' => '.json', + * ] * * @return string */ @@ -52,7 +64,12 @@ public static function readFrom(string $source, array $opts = []): string * - input '@FILEPATH' or FILEPATH - will read from the filepath. * * @param string $source the input text - * @param array{print: bool, loadedFile: string, throwOnEmpty: bool} $opts + * @param array $opts = [ + * 'print' => true, + * 'throwOnEmpty' => false, + * 'loadedFile' => '', + * 'suffix' => '.json', + * ] * * @return string */ @@ -88,9 +105,14 @@ public function read(string $source, array $opts = []): string $print && Cli::info('try read contents from file: ' . $lFile); $str = File::readAll($lFile); } else { + $suffix = $opts['suffix'] ?? ''; $filepath = Kite::resolve($source); + + // direct path to disk file if ($filepath[0] === '@') { $filepath = substr($filepath, 1); + } elseif ($suffix) { + $filepath = File::appendSuffix($filepath, $suffix); } if (is_file($filepath)) { diff --git a/app/Console/Component/FlagValCollector.php b/app/Console/Component/FlagValCollector.php deleted file mode 100644 index a85a4ef..0000000 --- a/app/Console/Component/FlagValCollector.php +++ /dev/null @@ -1,28 +0,0 @@ -getOptDefine($name)) - } -} diff --git a/app/Console/Controller/Gitx/GitLabController.php b/app/Console/Controller/Gitx/GitLabController.php index e7f0214..f1e6326 100644 --- a/app/Console/Controller/Gitx/GitLabController.php +++ b/app/Console/Controller/Gitx/GitLabController.php @@ -18,11 +18,9 @@ use Inhere\Kite\Common\CmdRunner; use Inhere\Kite\Common\GitLocal\GitLab; use Inhere\Kite\Console\Component\RedirectToGitGroup; -use Inhere\Kite\Console\SubCmd\Gitflow\BranchCreateCmd; use Inhere\Kite\Console\SubCmd\Gitflow\UpdateNoPushCmd; use Inhere\Kite\Console\SubCmd\Gitflow\UpdatePushCmd; use Inhere\Kite\Console\SubCmd\GitlabCmd\BranchCmd; -use Inhere\Kite\Console\SubCmd\GitlabCmd\BranchDeleteCmd; use Inhere\Kite\Console\SubCmd\GitlabCmd\MergeRequestCmd; use Inhere\Kite\Console\SubCmd\GitlabCmd\ProjectCmd; use Inhere\Kite\Console\SubCmd\GitlabCmd\ResolveConflictCmd; @@ -71,8 +69,6 @@ public static function aliases(): array protected static function commandAliases(): array { return [ - 'deleteBranch' => ['del-br', 'delbr', 'dbr', 'db'], - 'newBranch' => ['new-br', 'newbr', 'nbr', 'nb'], 'li' => 'linkInfo', 'cf' => 'config', 'conf' => 'config', @@ -402,47 +398,6 @@ public function configCommand(FlagsParser $fs, Output $output): void $output->success('Complete'); } - /** - * checkout an new branch for development. alias for `br new` - * - * @options - * --nm, --not-main bool;Dont push new branch to the main remote - * - * @arguments - * branch The new branch name. eg: fea_6_12 - * - * @param FlagsParser $fs - * @param Output $output - * - * @throws Throwable - */ - public function newBranchCommand(FlagsParser $fs, Output $output): void - { - $bcCmd = new BranchCreateCmd($this->input, $output); - $bcCmd->run($fs->getFlags()); - } - - /** - * delete branches from local, origin, main remote - * - * @options - * -f, --force bool;Force execute delete command, ignore error - * --nm, --not-main bool;Dont delete branch on the main remote - * - * @arguments - * branches... array;The want deleted branch name(s). eg: fea_6_12;required - * - * @param FlagsParser $fs - * @param Output $output - * - * @throws Throwable - */ - public function deleteBranchCommand(FlagsParser $fs, Output $output): void - { - $bcCmd = new BranchDeleteCmd($this->input, $output); - $bcCmd->run($fs->getFlags()); - } - /** * show gitlab project config information * @@ -663,6 +618,7 @@ public function createCommand(FlagsParser $fs, Output $output): void } $run->addf('git remote -v', $name); + $run->addf('git push -u origin master'); $run->addf('git push main master'); // $run->addf('git push -u origin master'); diff --git a/app/Console/Controller/JsonController.php b/app/Console/Controller/JsonController.php index ea81b77..cf21597 100644 --- a/app/Console/Controller/JsonController.php +++ b/app/Console/Controller/JsonController.php @@ -15,7 +15,6 @@ use Inhere\Kite\Console\Component\Clipboard; use Inhere\Kite\Console\Component\ContentsAutoReader; use Inhere\Kite\Console\Component\ContentsAutoWriter; -use Inhere\Kite\Helper\AppHelper; use Inhere\Kite\Kite; use Inhere\Kite\Lib\Generate\JsonToCode; use Inhere\Kite\Lib\Parser\Text\Json5ItemParser; @@ -79,6 +78,16 @@ protected function init(): void $this->dumpfile = Kite::getTmpPath('json-load.json'); } + /** + * @param int $index + * + * @return string + */ + private function getDumpfile(int $index = 0): string + { + return Kite::getTmpPath("json-load$index.json"); + } + protected function jsonRender(): JSONPretty { return JSONPretty::new([ @@ -91,7 +100,7 @@ protected function jsonRender(): JSONPretty */ private function loadDumpfileJSON(): void { - $dumpfile = $this->dumpfile; + $dumpfile = $this->getDumpfile(); if (!$dumpfile || !is_file($dumpfile)) { throw new InvalidArgumentException("the json temp file '$dumpfile' is not exists"); } @@ -108,7 +117,8 @@ private function loadDumpfileJSON(): void private function autoReadJSON(string $source): void { $this->json = ContentsAutoReader::readFrom($source, [ - 'loadedFile' => $this->dumpfile, + 'loadedFile' => $this->getDumpfile(), + 'suffix' => '.json', ]); if (!$this->json) { throw new InvalidArgumentException('the source json data is empty'); @@ -120,24 +130,41 @@ private function autoReadJSON(string $source): void /** * load json string data from clipboard to an tmp file * + * @options + * -i, --index int;set the loaded tmp file index number;false;0 + * * @arguments * source The source. allow: @clipboard, @stdin + * output The output file, default is @tmp/json-load.json * * @param FlagsParser $fs * @param Output $output * * @throws Throwable + * @example + * {binWithCmd} @c l1 # will save to @tmp/l1.json + * {binName} json load -s @tmp/l1 $ */ public function loadCommand(FlagsParser $fs, Output $output): void { - $json = AppHelper::tryReadContents($fs->getArg('source')); + $ext = '.json'; + $json = ContentsAutoReader::readFrom($fs->getArg('source'), [ + 'suffix' => $ext, + ]); if (!$json) { throw new InvalidArgumentException('the input data is empty'); } $data = json_decode($json, true, 512, JSON_THROW_ON_ERROR); + if ($file = $fs->getArg('output')) { + $file = Kite::getTmpPath($file); + $file = File::appendSuffix($file, $ext); + } else { + $file = $this->dumpfile; + } - File::write(JsonHelper::prettyJSON($data), $this->dumpfile); + $output->info("load temp JSON data to file: $file"); + File::write(JsonHelper::prettyJSON($data), $file); $output->success('Complete'); } @@ -150,11 +177,20 @@ public function loadCommand(FlagsParser $fs, Output $output): void * * @options * --type The search type. allow: keys, path + * --nc, --no-color bool;dont render color for output result. * -s, --source The json data source, default read stdin, allow: @load, @clipboard, @stdin * -o, --output The output, default is stdout, allow: @load, @clipboard, @stdout * --tk, --top-keys bool;only output all top key names + * -f, --filter array;include filter by input keywords. + * -e, --exclude array;exclude filter by input keywords. * * @throws Throwable + * @example + * {binWithCmd} -s @l --nc -e ' 0,' -e '[]' $ # exclude contains ' 0,' '[]' lines. + * + * ## load to custom file and read + * {binName} json load @c l1 # will save to @tmp/l1.json + * {binWithCmd} -s @tmp/l1 $ # read and render from @tmp/l1.json */ public function getCommand(FlagsParser $fs, Output $output): void { @@ -164,7 +200,7 @@ public function getCommand(FlagsParser $fs, Output $output): void $path = $fs->getArg('path'); if ($path = trim($path, ' .$')) { - $ret = Arr::getByPath($this->data, $path); + $ret = Arr::getByPath($this->data, $path); } else { $ret = $this->data; } @@ -184,7 +220,12 @@ public function getCommand(FlagsParser $fs, Output $output): void $ret = array_keys($ret); } - $str = $this->jsonRender()->renderData($ret); + $render = $this->jsonRender() + ->setNoColor($fs->getOpt('no-color')) + ->setIncludes($fs->getOpt('filter')) + ->setExcludes($fs->getOpt('exclude')); + + $str = $render->renderData($ret); } $outFile = $fs->getOpt('output'); @@ -228,14 +269,15 @@ public function searchCommand(FlagsParser $fs, Output $output): void * --uq, --unquote bool;unquote input string before format. * * @arguments - * json The json text line. if empty will try read text from clipboard + * json The json text line. allow: @load, @clipboard, @stdin + * if empty will try read text from clipboard * * @throws Throwable */ public function prettyCommand(FlagsParser $fs, Output $output): void { $json = $fs->getArg('json'); - $json = AppHelper::tryReadContents($json, [ + $json = ContentsAutoReader::readFrom($json, [ 'loadedFile' => $this->dumpfile, ]); @@ -253,13 +295,14 @@ public function prettyCommand(FlagsParser $fs, Output $output): void * collect field and comments from JSON5 contents * * @arguments - * json5 The json text line. if empty will try read text from clipboard + * json5 The json text line. allow: @load, @clipboard, @stdin + * if empty will try read text from clipboard * */ public function fieldsCommand(FlagsParser $fs, Output $output): void { $json = $fs->getArg('json5'); - $json = AppHelper::tryReadContents($json, [ + $json = ContentsAutoReader::readFrom($json, [ 'loadedFile' => $this->dumpfile, ]); diff --git a/app/Console/Controller/StringController.php b/app/Console/Controller/StringController.php index a8b4141..68a86c7 100644 --- a/app/Console/Controller/StringController.php +++ b/app/Console/Controller/StringController.php @@ -19,7 +19,6 @@ use Inhere\Kite\Console\SubCmd\ParseUrlQueryCmd; use Inhere\Kite\Console\SubCmd\ToolCmd\HashCommand; use Inhere\Kite\Console\SubCmd\ToolCmd\RandomCommand; -use Inhere\Kite\Helper\AppHelper; use Inhere\Kite\Helper\KiteUtil; use Inhere\Kite\Kite; use Inhere\Kite\Lib\Parser\Text\Json5ItemParser; @@ -76,6 +75,7 @@ protected static function commandAliases(): array 'process' => ['p', 'filter', 'f'], 'replace' => ['r'], 'parse' => ['fields'], + 'length' => ['len', 'ln', 'count'], ] + [ RandomCommand::getName() => RandomCommand::aliases(), ParseUrlQueryCmd::getName() => ParseUrlQueryCmd::aliases(), @@ -163,7 +163,7 @@ public function loadCommand(FlagsParser $fs, Output $output): void public function joinCommand(FlagsParser $fs): void { $text = trim($fs->getArg('text')); - $text = AppHelper::tryReadContents($text, [ + $text = ContentsAutoReader::readFrom($text, [ 'loadedFile' => $this->dumpfile, ]); @@ -319,8 +319,8 @@ protected function applyFilters(string $str, array $filters): string * @param Output $output * * @example - * {binWithCmd} --cut 'L,' # cut by = and remove left - * {binWithCmd} --replace 'A/a' # replace A to a for each line + * {binWithCmd} --cut 'L,' # cut by ',' and remove left + * {binWithCmd} -f "replace:A,a" # replace A to a for each line * {binWithCmd} -f "wrap:'" * */ @@ -519,7 +519,7 @@ public function parseCommand(FlagsParser $fs, Output $output): void public function caseCommand(FlagsParser $fs, Output $output): void { $source = $fs->getOpt('source'); - $source = AppHelper::tryReadContents($source); + $source = ContentsAutoReader::readFrom($source, []); if (!$source) { throw new InvalidArgumentException('empty source code for convert'); @@ -527,4 +527,23 @@ public function caseCommand(FlagsParser $fs, Output $output): void $output->info('TODO'); } + + /** + * Calc length for input string. + * + * @options + * --nt, --not-trim bool;dont run trim for input + * + * @arguments + * source string;The source code for calc. allow: string, @clipboard;true + * + * @param FlagsParser $fs + * @param Output $output + */ + public function lengthCommand(FlagsParser $fs, Output $output): void + { + $source = ContentsAutoReader::readFrom($fs->getArg('source'), []); + + $output->colored('Length: ' . strlen(trim($source))); + } } diff --git a/app/Helper/AppHelper.php b/app/Helper/AppHelper.php index e6799cc..d72e3cf 100644 --- a/app/Helper/AppHelper.php +++ b/app/Helper/AppHelper.php @@ -237,6 +237,7 @@ public static function getValueByNodes(array $data, array $nodes, mixed $default * @param array{print: bool, loadedFile: string} $opts * * @return string + * @deprecated */ public static function tryReadContents(string $input, array $opts = []): string { diff --git a/app/Kite.php b/app/Kite.php index d0c9d1a..7edda2b 100644 --- a/app/Kite.php +++ b/app/Kite.php @@ -16,13 +16,14 @@ use Inhere\Kite\Console\Component\AutoSetProxyEnv; use Inhere\Kite\Console\Plugin\PluginManager; use Inhere\Kite\Http\WebApplication; -use Inhere\Kite\Lib\Jenkins\JenkinsFactory; use Inhere\Kite\Lib\Jump\QuickJump; use Inhere\Route\Dispatcher\Dispatcher; use Inhere\Route\Router; use Monolog\Logger; use PhpPkg\Config\ConfigBox; +use PhpPkg\JenkinsClient\MultiJenkins; use Toolkit\FsUtil\Dir; +use Toolkit\FsUtil\File; use Toolkit\Stdlib\Obj\ObjectBox; use Toolkit\Stdlib\Util\PhpDotEnv; use const BASE_PATH; @@ -38,7 +39,7 @@ * @method static Router webRouter() * @method static Dispatcher dispatcher() * @method static ScriptRunner scriptRunner() - * @method static JenkinsFactory jenkins() + * @method static MultiJenkins jenkins() * * @see Kite::__callStatic() for quick get object */ @@ -170,6 +171,10 @@ public static function basePath(bool $rmPharMark = true): string */ public static function getTmpPath(string $path): string { + if (File::isAbsPath($path)) { + return $path; + } + if (IN_PHAR) { // see app/boot.php return self::resolve('@user-tmp'); @@ -190,6 +195,10 @@ public static function getPath(string $path = '', bool $rmPharMark = true): stri return self::basePath($rmPharMark); } + if (File::isAbsPath($path)) { + return $path; + } + return self::basePath($rmPharMark) . '/' . $path; } diff --git a/app/Lib/Jenkins/JenkinsConfig.php b/app/Lib/Jenkins/JenkinsConfig.php deleted file mode 100644 index 2cfce0b..0000000 --- a/app/Lib/Jenkins/JenkinsConfig.php +++ /dev/null @@ -1,59 +0,0 @@ -hostUrl . '/job/' . $jobName; - } - - /** - * @param string $viewName - * - * @return string - */ - public function viewPageUrl(string $viewName): string - { - return $this->hostUrl . '/view/' . $viewName; - } - -} diff --git a/app/Lib/Jenkins/JenkinsFactory.php b/app/Lib/Jenkins/JenkinsFactory.php deleted file mode 100644 index 54826a1..0000000 --- a/app/Lib/Jenkins/JenkinsFactory.php +++ /dev/null @@ -1,184 +0,0 @@ - ['username' => '', 'apiToken' => '', 'hostUrl' => '']] - */ - public array $envInfo = []; - - /** - * @param string $jobName - * - * @return $this - */ - public function withJobName(string $jobName): self - { - $this->jobName = $jobName; - return $this; - } - - /** - * @param string $env - * - * @return Jenkins - */ - public function getJenkins(string $env = ''): Jenkins - { - return $this->create($env); - } - - /** - * @param string $env - * - * @return Jenkins - */ - public function create(string $env = ''): Jenkins - { - $jc = $this->getEnvConfig($env); - $jk = new Jenkins($jc->hostUrl); - - $jk->setUsername($jc->username); - $jk->setPassword($jc->password); - $jk->setApiToken($jc->apiToken); - - return $jk; - } - - /** - * @param string $pathTpl - * - * @return string - */ - public function buildUrl(string $pathTpl): string - { - return $this->hostUrl . strtr($pathTpl, [ - '{folderPath}' => $this->folderPath, - '{name}' => $this->jobName, - ]); - } - - /** - * @param string $envName - * - * @return $this - */ - public function useEnv(string $envName): self - { - return $this->setEnvName($envName); - } - - /** - * @param string $envName - * - * @return $this - */ - public function setEnvName(string $envName): self - { - if ($envName) { - $this->envName = $envName; - } - return $this; - } - - /** - * @param string $envName - * - * @return JenkinsConfig - */ - public function getEnvConfig(string $envName = ''): JenkinsConfig - { - $defConf = $this->getDefaultConfig(); - $envName = $envName ?: $this->envName; - - if ($envName) { - if (isset($this->envInfo[$envName])) { - return JenkinsConfig::new(array_merge($defConf->toArray(), $this->envInfo[$envName])); - } - - throw new RuntimeException("get unknown env config: $envName"); - } - - return $defConf; - } - - /** - * @return JenkinsConfig - */ - public function getDefaultConfig(): JenkinsConfig - { - if (!$this->defaultConfig) { - $this->defaultConfig = JenkinsConfig::new([ - 'hostUrl' => $this->hostUrl, - 'username' => $this->username, - 'apiToken' => $this->apiToken, - ]); - } - - return $this->defaultConfig; - } - - -} diff --git a/composer.lock b/composer.lock index 6735e86..df713da 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5dcc648bc525654f3320b0be005aed94", + "content-hash": "05c98aa5622899dfcb986ebddb980f07", "packages": [ { "name": "cebe/markdown", @@ -314,16 +314,16 @@ }, { "name": "gitonomy/gitlib", - "version": "v1.3.5", + "version": "v1.3.6", "source": { "type": "git", "url": "https://github.com/gitonomy/gitlib.git", - "reference": "793ffe5826c30e64ea499ea9e4bb353dd0892bef" + "reference": "33ae0a2e469accc19d1a06bed63ed93dbf368ae2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gitonomy/gitlib/zipball/793ffe5826c30e64ea499ea9e4bb353dd0892bef", - "reference": "793ffe5826c30e64ea499ea9e4bb353dd0892bef", + "url": "https://api.github.com/repos/gitonomy/gitlib/zipball/33ae0a2e469accc19d1a06bed63ed93dbf368ae2", + "reference": "33ae0a2e469accc19d1a06bed63ed93dbf368ae2", "shasum": "", "mirrors": [ { @@ -382,7 +382,7 @@ "description": "Library for accessing git", "support": { "issues": "https://github.com/gitonomy/gitlib/issues", - "source": "https://github.com/gitonomy/gitlib/tree/v1.3.5" + "source": "https://github.com/gitonomy/gitlib/tree/v1.3.6" }, "funding": [ { @@ -390,20 +390,20 @@ "type": "tidelift" } ], - "time": "2022-03-01T10:56:00+00:00" + "time": "2022-08-05T09:17:13+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.4.5", + "version": "7.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", - "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", "shasum": "", "mirrors": [ { @@ -424,10 +424,10 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -437,8 +437,12 @@ }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "7.4-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -504,7 +508,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.5" + "source": "https://github.com/guzzle/guzzle/tree/7.5.0" }, "funding": [ { @@ -520,20 +524,20 @@ "type": "tidelift" } ], - "time": "2022-06-20T22:16:13+00:00" + "time": "2022-08-28T15:39:27+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "", "mirrors": [ { @@ -594,7 +598,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -610,20 +614,20 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.4.0", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "13388f00956b1503577598873fffb5ae994b5737" + "reference": "67c26b443f348a51926030c83481b85718457d3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737", - "reference": "13388f00956b1503577598873fffb5ae994b5737", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", + "reference": "67c26b443f348a51926030c83481b85718457d3d", "shasum": "", "mirrors": [ { @@ -643,15 +647,19 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { "dev-master": "2.4-dev" } @@ -715,7 +723,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.0" + "source": "https://github.com/guzzle/psr7/tree/2.4.3" }, "funding": [ { @@ -731,7 +739,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:11+00:00" + "time": "2022-10-26T14:07:24+00:00" }, { "name": "http-interop/http-factory-guzzle", @@ -803,12 +811,12 @@ "source": { "type": "git", "url": "https://github.com/inhere/php-console.git", - "reference": "527fa73b39188fd45513ebf20efeb18de10ef729" + "reference": "04e5fdbebcc65889d15e32e1993e52fa477b67b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/inhere/php-console/zipball/527fa73b39188fd45513ebf20efeb18de10ef729", - "reference": "527fa73b39188fd45513ebf20efeb18de10ef729", + "url": "https://api.github.com/repos/inhere/php-console/zipball/04e5fdbebcc65889d15e32e1993e52fa477b67b9", + "reference": "04e5fdbebcc65889d15e32e1993e52fa477b67b9", "shasum": "", "mirrors": [ { @@ -865,22 +873,22 @@ ], "support": { "issues": "https://github.com/inhere/php-console/issues", - "source": "https://github.com/inhere/php-console/tree/master" + "source": "https://github.com/inhere/php-console/tree/v4.1.5" }, - "time": "2022-07-14T11:23:08+00:00" + "time": "2022-11-03T02:39:17+00:00" }, { - "name": "inhere/sroute", + "name": "inhere/php-validate", "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/inhere/php-srouter.git", - "reference": "728cf1192e3ff45c5f1126552c5623fad4695091" + "url": "https://github.com/inhere/php-validate.git", + "reference": "41783c5f0e540357194f1dad0eb7e638981ed0e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/inhere/php-srouter/zipball/728cf1192e3ff45c5f1126552c5623fad4695091", - "reference": "728cf1192e3ff45c5f1126552c5623fad4695091", + "url": "https://api.github.com/repos/inhere/php-validate/zipball/41783c5f0e540357194f1dad0eb7e638981ed0e6", + "reference": "41783c5f0e540357194f1dad0eb7e638981ed0e6", "shasum": "", "mirrors": [ { @@ -890,13 +898,67 @@ ] }, "require": { - "php": ">7.1.0" + "php": ">8.1.0", + "toolkit/stdlib": "~2.0" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0" + "phpunit/phpunit": "^9.5" }, - "suggest": { - "inhere/simple-print-tool": "Very lightweight data printing tools" + "default-branch": true, + "type": "library", + "autoload": { + "psr-4": { + "Inhere\\Validate\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "inhere", + "email": "in.798@qq.com", + "homepage": "https://github.com/inhere" + } + ], + "description": "generic data validate, filter library of the php", + "homepage": "https://github.com/inhere/php-validate", + "keywords": [ + "form-validate", + "library", + "php-library", + "validate", + "validation" + ], + "support": { + "issues": "https://github.com/inhere/php-validate/issues", + "source": "https://github.com/inhere/php-validate/tree/v3.0.0" + }, + "time": "2022-11-04T05:39:17+00:00" + }, + { + "name": "inhere/sroute", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/inhere/php-sroute.git", + "reference": "f7ed8f7f81a86d35026678bafa6267119eea7679" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/inhere/php-sroute/zipball/f7ed8f7f81a86d35026678bafa6267119eea7679", + "reference": "f7ed8f7f81a86d35026678bafa6267119eea7679", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=8.0.1" }, "default-branch": true, "type": "library", @@ -919,32 +981,34 @@ "homepage": "http://www.yzone.net/" } ], - "description": "a very lightweight and fasted request router.", - "homepage": "https://github.com/inhere/php-srouter", + "description": "a very lightweight and fasted request router. lightweight web framework", + "homepage": "https://github.com/inhere/php-sroute", "keywords": [ + "http-router", "library", "php-router", "route", - "router" + "router", + "web-framework" ], "support": { - "issues": "https://github.com/inhere/php-srouter/issues", - "source": "https://github.com/inhere/php-srouter/tree/master" + "issues": "https://github.com/inhere/php-sroute/issues", + "source": "https://github.com/inhere/php-sroute/tree/master" }, - "time": "2021-09-30T02:12:34+00:00" + "time": "2022-08-19T03:58:56+00:00" }, { "name": "knplabs/github-api", - "version": "v3.7.0", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/KnpLabs/php-github-api.git", - "reference": "c230ab0162afeaec4318276e6a470af4b52da5fe" + "reference": "a43662d7c9d4032768ec829dde2cf143878a4104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/c230ab0162afeaec4318276e6a470af4b52da5fe", - "reference": "c230ab0162afeaec4318276e6a470af4b52da5fe", + "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/a43662d7c9d4032768ec829dde2cf143878a4104", + "reference": "a43662d7c9d4032768ec829dde2cf143878a4104", "shasum": "", "mirrors": [ { @@ -1017,7 +1081,7 @@ ], "support": { "issues": "https://github.com/KnpLabs/php-github-api/issues", - "source": "https://github.com/KnpLabs/php-github-api/tree/v3.7.0" + "source": "https://github.com/KnpLabs/php-github-api/tree/v3.8.0" }, "funding": [ { @@ -1025,7 +1089,7 @@ "type": "github" } ], - "time": "2022-06-12T17:59:07+00:00" + "time": "2022-08-01T18:58:16+00:00" }, { "name": "laktak/hjson", @@ -1090,16 +1154,16 @@ }, { "name": "monolog/monolog", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0c375495d40df0207e5833dca333f963b171ff43" + "reference": "305444bc6fb6c89e490f4b34fa6e979584d7fa81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0c375495d40df0207e5833dca333f963b171ff43", - "reference": "0c375495d40df0207e5833dca333f963b171ff43", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/305444bc6fb6c89e490f4b34fa6e979584d7fa81", + "reference": "305444bc6fb6c89e490f4b34fa6e979584d7fa81", "shasum": "", "mirrors": [ { @@ -1125,7 +1189,6 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "php-console/php-console": "^3.1.3", "phpstan/phpstan": "^1.4", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", @@ -1148,7 +1211,6 @@ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, @@ -1183,7 +1245,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.1.0" + "source": "https://github.com/Seldaek/monolog/tree/3.2.0" }, "funding": [ { @@ -1195,7 +1257,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T09:09:00+00:00" + "time": "2022-07-24T12:00:55+00:00" }, { "name": "nette/neon", @@ -1338,16 +1400,16 @@ }, { "name": "php-http/client-common", - "version": "2.5.0", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" + "reference": "92b7425ccda1c15547605704723f4639f4cd2d65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", + "url": "https://api.github.com/repos/php-http/client-common/zipball/92b7425ccda1c15547605704723f4639f4cd2d65", + "reference": "92b7425ccda1c15547605704723f4639f4cd2d65", "shasum": "", "mirrors": [ { @@ -1413,9 +1475,9 @@ ], "support": { "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" + "source": "https://github.com/php-http/client-common/tree/2.5.1" }, - "time": "2021-11-26T15:01:24+00:00" + "time": "2022-09-29T07:53:58+00:00" }, { "name": "php-http/discovery", @@ -1831,16 +1893,16 @@ }, { "name": "phppkg/cli-markdown", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/phppkg/cli-markdown.git", - "reference": "9d3fdff07cb8ab7dbfd75a167ae93609ad8610ed" + "reference": "263bf6857a10ac5f1cae254b7d7836e8349cc80b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phppkg/cli-markdown/zipball/9d3fdff07cb8ab7dbfd75a167ae93609ad8610ed", - "reference": "9d3fdff07cb8ab7dbfd75a167ae93609ad8610ed", + "url": "https://api.github.com/repos/phppkg/cli-markdown/zipball/263bf6857a10ac5f1cae254b7d7836e8349cc80b", + "reference": "263bf6857a10ac5f1cae254b7d7836e8349cc80b", "shasum": "", "mirrors": [ { @@ -1875,9 +1937,9 @@ "homepage": "https://github.com/phppkg/cli-markdown", "support": { "issues": "https://github.com/phppkg/cli-markdown/issues", - "source": "https://github.com/phppkg/cli-markdown/tree/v2.0.0" + "source": "https://github.com/phppkg/cli-markdown/tree/v2.0.1" }, - "time": "2021-12-06T14:54:19+00:00" + "time": "2022-08-06T15:00:13+00:00" }, { "name": "phppkg/config", @@ -1885,12 +1947,12 @@ "source": { "type": "git", "url": "https://github.com/phppkg/config.git", - "reference": "301ca08225bb4d5cca4175a579fc957e2391012d" + "reference": "562bbb20f76a4b49381ec4d148e49c805c26c1f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phppkg/config/zipball/301ca08225bb4d5cca4175a579fc957e2391012d", - "reference": "301ca08225bb4d5cca4175a579fc957e2391012d", + "url": "https://api.github.com/repos/phppkg/config/zipball/562bbb20f76a4b49381ec4d148e49c805c26c1f2", + "reference": "562bbb20f76a4b49381ec4d148e49c805c26c1f2", "shasum": "", "mirrors": [ { @@ -1945,7 +2007,7 @@ "issues": "https://github.com/phppkg/config/issues", "source": "https://github.com/phppkg/config/tree/master" }, - "time": "2022-05-11T13:49:43+00:00" + "time": "2022-11-16T12:30:26+00:00" }, { "name": "phppkg/easytpl", @@ -1953,12 +2015,12 @@ "source": { "type": "git", "url": "https://github.com/phppkg/easytpl.git", - "reference": "9321d3c4766579f45399a96daf50d20a160cb391" + "reference": "67b92e99797c22697ddb1c7aa3dddc622ecd68ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phppkg/easytpl/zipball/9321d3c4766579f45399a96daf50d20a160cb391", - "reference": "9321d3c4766579f45399a96daf50d20a160cb391", + "url": "https://api.github.com/repos/phppkg/easytpl/zipball/67b92e99797c22697ddb1c7aa3dddc622ecd68ac", + "reference": "67b92e99797c22697ddb1c7aa3dddc622ecd68ac", "shasum": "", "mirrors": [ { @@ -1995,22 +2057,22 @@ "homepage": "https://github.com/phppkg/easytpl", "support": { "issues": "https://github.com/phppkg/easytpl/issues", - "source": "https://github.com/phppkg/easytpl/tree/main" + "source": "https://github.com/phppkg/easytpl/tree/v1.1.1" }, - "time": "2022-04-06T13:40:40+00:00" + "time": "2022-08-18T14:30:29+00:00" }, { "name": "phppkg/http-client", - "version": "dev-master", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/phppkg/http-client.git", - "reference": "e0cebde8aadc7a3ba07163e4fa26bd70ccc12103" + "reference": "4cfd9e175e256371bea3449f12730a909d9c78b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phppkg/http-client/zipball/e0cebde8aadc7a3ba07163e4fa26bd70ccc12103", - "reference": "e0cebde8aadc7a3ba07163e4fa26bd70ccc12103", + "url": "https://api.github.com/repos/phppkg/http-client/zipball/4cfd9e175e256371bea3449f12730a909d9c78b5", + "reference": "4cfd9e175e256371bea3449f12730a909d9c78b5", "shasum": "", "mirrors": [ { @@ -2027,7 +2089,6 @@ "suggest": { "phppkg/http-message": "Very lightweight PSR-7 implements http message component" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -2056,9 +2117,9 @@ ], "support": { "issues": "https://github.com/phppkg/http-client/issues", - "source": "https://github.com/phppkg/http-client/tree/master" + "source": "https://github.com/phppkg/http-client/tree/v3.0.1" }, - "time": "2022-03-02T02:21:57+00:00" + "time": "2022-11-16T15:40:37+00:00" }, { "name": "phppkg/http-message", @@ -2171,16 +2232,16 @@ }, { "name": "phppkg/ini", - "version": "v0.1.1", + "version": "v0.1.2", "source": { "type": "git", "url": "https://github.com/phppkg/ini.git", - "reference": "9b2eed07750768db1ef98079bf964cd9ff9bdcca" + "reference": "792fd3de0ee3838fe2b96e1da87183f3fa56abf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phppkg/ini/zipball/9b2eed07750768db1ef98079bf964cd9ff9bdcca", - "reference": "9b2eed07750768db1ef98079bf964cd9ff9bdcca", + "url": "https://api.github.com/repos/phppkg/ini/zipball/792fd3de0ee3838fe2b96e1da87183f3fa56abf2", + "reference": "792fd3de0ee3838fe2b96e1da87183f3fa56abf2", "shasum": "", "mirrors": [ { @@ -2220,9 +2281,64 @@ ], "support": { "issues": "https://github.com/phppkg/ini/issues", - "source": "https://github.com/phppkg/ini/tree/v0.1.1" + "source": "https://github.com/phppkg/ini/tree/v0.1.2" }, - "time": "2021-11-30T13:02:33+00:00" + "time": "2022-08-07T09:15:41+00:00" + }, + { + "name": "phppkg/jenkins-client", + "version": "dev-main", + "source": { + "type": "git", + "url": "https://github.com/phppkg/jenkins-client.git", + "reference": "0b8b3f12643abc7505fdfe0160773607fb8e4bf9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phppkg/jenkins-client/zipball/0b8b3f12643abc7505fdfe0160773607fb8e4bf9", + "reference": "0b8b3f12643abc7505fdfe0160773607fb8e4bf9", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">8.0", + "phppkg/http-client": "^3.0", + "toolkit/stdlib": "^2.0" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-4": { + "PhpPkg\\JenkinsClient\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "inhere", + "homepage": "https://github.com/jenkins-khan" + } + ], + "description": "Jenkins PHP API client", + "homepage": "https://github.com/phppkg/jenkins-client", + "keywords": [ + "api", + "jenkins", + "jenkins-client" + ], + "support": { + "issues": "https://github.com/phppkg/jenkins-client/issues", + "source": "https://github.com/phppkg/jenkins-client/tree/main" + }, + "time": "2022-11-17T09:03:12+00:00" }, { "name": "phppkg/phpgit", @@ -2230,12 +2346,12 @@ "source": { "type": "git", "url": "https://github.com/phppkg/phpgit.git", - "reference": "f2968d4bfe4588feefd04deafce8ed9272b04f17" + "reference": "45b1a18c8869478c96af5410889bc0d9b226708c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phppkg/phpgit/zipball/f2968d4bfe4588feefd04deafce8ed9272b04f17", - "reference": "f2968d4bfe4588feefd04deafce8ed9272b04f17", + "url": "https://api.github.com/repos/phppkg/phpgit/zipball/45b1a18c8869478c96af5410889bc0d9b226708c", + "reference": "45b1a18c8869478c96af5410889bc0d9b226708c", "shasum": "", "mirrors": [ { @@ -2245,7 +2361,7 @@ ] }, "require": { - "php": ">8.0.0", + "php": ">8.1.0", "symfony/options-resolver": "~6.0", "symfony/process": "~6.0", "toolkit/cli-utils": "~2.0", @@ -2280,13 +2396,13 @@ "email": "hayashi@valnur.net" } ], - "description": "A Git wrapper library for PHP 8.0+", + "description": "A Git wrapper library for PHP 8.1+", "homepage": "https://github/phppkg/phpgit.git", "support": { "issues": "https://github.com/phppkg/phpgit/issues", "source": "https://github.com/phppkg/phpgit/tree/master" }, - "time": "2022-06-29T03:40:28+00:00" + "time": "2022-11-05T11:50:13+00:00" }, { "name": "psr/cache", @@ -2683,16 +2799,16 @@ }, { "name": "symfony/cache", - "version": "v6.1.2", + "version": "v6.1.7", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "7d8415956df68c8dcbc9468e119945e39bacead1" + "reference": "ee5d5b88162684a1377706f9c25125e97685ee61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/7d8415956df68c8dcbc9468e119945e39bacead1", - "reference": "7d8415956df68c8dcbc9468e119945e39bacead1", + "url": "https://api.github.com/repos/symfony/cache/zipball/ee5d5b88162684a1377706f9c25125e97685ee61", + "reference": "ee5d5b88162684a1377706f9c25125e97685ee61", "shasum": "", "mirrors": [ { @@ -2758,14 +2874,14 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides an extended PSR-6, PSR-16 (and tags) implementation", + "description": "Provides extended PSR-6, PSR-16 (and tags) implementations", "homepage": "https://symfony.com", "keywords": [ "caching", "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.1.2" + "source": "https://github.com/symfony/cache/tree/v6.1.7" }, "funding": [ { @@ -2781,7 +2897,7 @@ "type": "tidelift" } ], - "time": "2022-06-19T13:21:48+00:00" + "time": "2022-10-28T16:23:08+00:00" }, { "name": "symfony/cache-contracts", @@ -3085,16 +3201,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "", "mirrors": [ { @@ -3115,7 +3231,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3153,7 +3269,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -3169,20 +3285,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "", "mirrors": [ { @@ -3203,7 +3319,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3242,7 +3358,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -3258,20 +3374,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "", "mirrors": [ { @@ -3286,7 +3402,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3331,7 +3447,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -3347,20 +3463,20 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", - "version": "v6.1.0", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "318718453c2be58266f1a9e74063d13cb8dd4165" + "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/318718453c2be58266f1a9e74063d13cb8dd4165", - "reference": "318718453c2be58266f1a9e74063d13cb8dd4165", + "url": "https://api.github.com/repos/symfony/process/zipball/a6506e99cfad7059b1ab5cab395854a0a0c21292", + "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292", "shasum": "", "mirrors": [ { @@ -3398,7 +3514,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.1.0" + "source": "https://github.com/symfony/process/tree/v6.1.3" }, "funding": [ { @@ -3414,7 +3530,7 @@ "type": "tidelift" } ], - "time": "2022-05-11T12:12:29+00:00" + "time": "2022-06-27T17:24:16+00:00" }, { "name": "symfony/service-contracts", @@ -3507,16 +3623,16 @@ }, { "name": "symfony/var-exporter", - "version": "v6.1.1", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "ce1452317b1210ddfe18d143fa8a09c18f034b89" + "reference": "b49350f45cebbba6e5286485264b912f2bcfc9ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/ce1452317b1210ddfe18d143fa8a09c18f034b89", - "reference": "ce1452317b1210ddfe18d143fa8a09c18f034b89", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b49350f45cebbba6e5286485264b912f2bcfc9ef", + "reference": "b49350f45cebbba6e5286485264b912f2bcfc9ef", "shasum": "", "mirrors": [ { @@ -3565,7 +3681,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.1.1" + "source": "https://github.com/symfony/var-exporter/tree/v6.1.3" }, "funding": [ { @@ -3581,20 +3697,20 @@ "type": "tidelift" } ], - "time": "2022-05-27T12:58:07+00:00" + "time": "2022-07-04T16:01:56+00:00" }, { "name": "symfony/yaml", - "version": "v6.1.2", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "b01c4e7dc6a51cbf114567af04a19789fd1011fe" + "reference": "cc48dd42ae1201abced04ae38284e23ce2d2d8f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/b01c4e7dc6a51cbf114567af04a19789fd1011fe", - "reference": "b01c4e7dc6a51cbf114567af04a19789fd1011fe", + "url": "https://api.github.com/repos/symfony/yaml/zipball/cc48dd42ae1201abced04ae38284e23ce2d2d8f3", + "reference": "cc48dd42ae1201abced04ae38284e23ce2d2d8f3", "shasum": "", "mirrors": [ { @@ -3645,7 +3761,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.1.2" + "source": "https://github.com/symfony/yaml/tree/v6.1.3" }, "funding": [ { @@ -3661,7 +3777,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T12:01:07+00:00" + "time": "2022-07-20T14:45:06+00:00" }, { "name": "toolkit/cli-utils", @@ -3788,16 +3904,16 @@ }, { "name": "toolkit/pflag", - "version": "v2.0.5", + "version": "v2.0.6", "source": { "type": "git", "url": "https://github.com/php-toolkit/pflag.git", - "reference": "6628805d55af3516725d6bcac60d362aa264ebfe" + "reference": "6619dc82da0bd9a1253fb53af4338759fe170ae8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-toolkit/pflag/zipball/6628805d55af3516725d6bcac60d362aa264ebfe", - "reference": "6628805d55af3516725d6bcac60d362aa264ebfe", + "url": "https://api.github.com/repos/php-toolkit/pflag/zipball/6619dc82da0bd9a1253fb53af4338759fe170ae8", + "reference": "6619dc82da0bd9a1253fb53af4338759fe170ae8", "shasum": "", "mirrors": [ { @@ -3832,22 +3948,22 @@ "homepage": "https://github.com/php-toolkit/pflag", "support": { "issues": "https://github.com/php-toolkit/pflag/issues", - "source": "https://github.com/php-toolkit/pflag/tree/v2.0.5" + "source": "https://github.com/php-toolkit/pflag/tree/v2.0.6" }, - "time": "2022-07-19T05:19:11+00:00" + "time": "2022-11-05T13:50:01+00:00" }, { "name": "toolkit/stdlib", - "version": "v2.0.6", + "version": "v2.0.7", "source": { "type": "git", "url": "https://github.com/php-toolkit/stdlib.git", - "reference": "3c0bfc6a5f9c187fc5fd075198f48fc43e3d6ca1" + "reference": "13fd2e5617e31cc48f2005646f8284bfd868e123" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-toolkit/stdlib/zipball/3c0bfc6a5f9c187fc5fd075198f48fc43e3d6ca1", - "reference": "3c0bfc6a5f9c187fc5fd075198f48fc43e3d6ca1", + "url": "https://api.github.com/repos/php-toolkit/stdlib/zipball/13fd2e5617e31cc48f2005646f8284bfd868e123", + "reference": "13fd2e5617e31cc48f2005646f8284bfd868e123", "shasum": "", "mirrors": [ { @@ -3898,22 +4014,22 @@ ], "support": { "issues": "https://github.com/php-toolkit/stdlib/issues", - "source": "https://github.com/php-toolkit/stdlib/tree/v2.0.6" + "source": "https://github.com/php-toolkit/stdlib/tree/v2.0.7" }, - "time": "2022-05-11T17:21:15+00:00" + "time": "2022-08-07T08:41:41+00:00" }, { "name": "toolkit/sys-utils", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/php-toolkit/sys-utils.git", - "reference": "3d5c546341d6c2491f93ddb2c08ddeddf09bd6b2" + "reference": "74a9075238de5cdc112c30f116252947dfebcec5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-toolkit/sys-utils/zipball/3d5c546341d6c2491f93ddb2c08ddeddf09bd6b2", - "reference": "3d5c546341d6c2491f93ddb2c08ddeddf09bd6b2", + "url": "https://api.github.com/repos/php-toolkit/sys-utils/zipball/74a9075238de5cdc112c30f116252947dfebcec5", + "reference": "74a9075238de5cdc112c30f116252947dfebcec5", "shasum": "", "mirrors": [ { @@ -3957,9 +4073,9 @@ ], "support": { "issues": "https://github.com/php-toolkit/sys-utils/issues", - "source": "https://github.com/php-toolkit/sys-utils/tree/v2.0.3" + "source": "https://github.com/php-toolkit/sys-utils/tree/v2.0.4" }, - "time": "2022-04-10T04:54:33+00:00" + "time": "2022-11-02T14:30:36+00:00" }, { "name": "webmozart/assert", @@ -4154,7 +4270,8 @@ "stability-flags": { "inhere/console": 20, "inhere/sroute": 20, - "phppkg/http-client": 20, + "inhere/php-validate": 20, + "phppkg/jenkins-client": 20, "phppkg/easytpl": 20, "phppkg/config": 20, "phppkg/hucron": 20, @@ -4163,7 +4280,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=8.0.1", + "php": ">=8.1.0", "ext-json": "*", "ext-mbstring": "*" }, diff --git a/config/config.php b/config/config.php index 07dbc6e..241c635 100644 --- a/config/config.php +++ b/config/config.php @@ -63,9 +63,10 @@ // 'https_proxy' => 'http://127.0.0.1:1081', ], 'jenkins' => [ - 'hostUrl' => getenv('JK_HOST_URL') ?: '', - 'username' => getenv('JK_UNAME') ?: '', - 'apiToken' => getenv('JK_API_TOKEN') ?: '', + 'hostUrl' => env('JK_HOST_URL'), + 'username' => env('JK_UNAME'), + 'password' => env('JK_PASSWD'), + 'apiToken' => env('JK_API_TOKEN'), ], // tool command usage docs 'manDocs' => [