From c2e41719a3ce0d06b4b68c022bae8828ea0ec13f Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 22 Apr 2020 14:45:39 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- vendor/zoujingli/think-library/src/command/Install.php | 10 ++++++++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index d6b47d93b..25d9a69e6 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "f4cb0f3958f9b6b5b460a0ecf123db7ba180279a" + "reference": "a3669a172aaaa239a8ff1b557f38ab75eae79434" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f4cb0f3958f9b6b5b460a0ecf123db7ba180279a", - "reference": "f4cb0f3958f9b6b5b460a0ecf123db7ba180279a", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a3669a172aaaa239a8ff1b557f38ab75eae79434", + "reference": "a3669a172aaaa239a8ff1b557f38ab75eae79434", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-04-22T03:34:30+00:00" + "time": "2020-04-22T06:39:20+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index b6bb4061f..b10aa7bb4 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "f4cb0f3958f9b6b5b460a0ecf123db7ba180279a" + "reference": "a3669a172aaaa239a8ff1b557f38ab75eae79434" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f4cb0f3958f9b6b5b460a0ecf123db7ba180279a", - "reference": "f4cb0f3958f9b6b5b460a0ecf123db7ba180279a", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a3669a172aaaa239a8ff1b557f38ab75eae79434", + "reference": "a3669a172aaaa239a8ff1b557f38ab75eae79434", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-04-22T03:34:30+00:00", + "time": "2020-04-22T06:39:20+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index ab6323b58..6e7bc585f 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php index ceb29d906..f3cc2b328 100644 --- a/vendor/zoujingli/think-library/src/command/Install.php +++ b/vendor/zoujingli/think-library/src/command/Install.php @@ -97,11 +97,17 @@ class Install extends Command $this->name = trim($input->getArgument('name')); if (empty($this->name)) { $this->output->writeln('Module name of online installation cannot be empty'); + } elseif ($this->name === 'all') { + list($this->rules, $this->ignore) = [[], []]; + foreach ($this->bind as $bind) { + $this->rules = array_merge($this->rules, $bind['rules']); + $this->ignore = array_merge($this->ignore, $bind['ignore']); + } + [$this->installFile(), $this->installData()]; } elseif (isset($this->bind[$this->name])) { $this->rules = empty($this->bind[$this->name]['rules']) ? [] : $this->bind[$this->name]['rules']; $this->ignore = empty($this->bind[$this->name]['ignore']) ? [] : $this->bind[$this->name]['ignore']; - $this->installFile(); - $this->installData(); + [$this->installFile(), $this->installData()]; } else { $this->output->writeln("The specified module {$this->name} is not configured with installation rules"); }