ComposerUpdate

This commit is contained in:
Anyon 2020-04-22 14:45:39 +08:00
parent 98f33df9a2
commit c2e41719a3
4 changed files with 17 additions and 11 deletions

8
composer.lock generated
View File

@ -909,12 +909,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "f4cb0f3958f9b6b5b460a0ecf123db7ba180279a" "reference": "a3669a172aaaa239a8ff1b557f38ab75eae79434"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f4cb0f3958f9b6b5b460a0ecf123db7ba180279a", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a3669a172aaaa239a8ff1b557f38ab75eae79434",
"reference": "f4cb0f3958f9b6b5b460a0ecf123db7ba180279a", "reference": "a3669a172aaaa239a8ff1b557f38ab75eae79434",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -958,7 +958,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "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", "name": "zoujingli/wechat-developer",

View File

@ -935,12 +935,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "f4cb0f3958f9b6b5b460a0ecf123db7ba180279a" "reference": "a3669a172aaaa239a8ff1b557f38ab75eae79434"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f4cb0f3958f9b6b5b460a0ecf123db7ba180279a", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a3669a172aaaa239a8ff1b557f38ab75eae79434",
"reference": "f4cb0f3958f9b6b5b460a0ecf123db7ba180279a", "reference": "a3669a172aaaa239a8ff1b557f38ab75eae79434",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -956,7 +956,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-04-22T03:34:30+00:00", "time": "2020-04-22T06:39:20+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-04-22 11:47:03 // This file is automatically generated at:2020-04-22 14:45:04
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

View File

@ -97,11 +97,17 @@ class Install extends Command
$this->name = trim($input->getArgument('name')); $this->name = trim($input->getArgument('name'));
if (empty($this->name)) { if (empty($this->name)) {
$this->output->writeln('Module name of online installation cannot be empty'); $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])) { } elseif (isset($this->bind[$this->name])) {
$this->rules = empty($this->bind[$this->name]['rules']) ? [] : $this->bind[$this->name]['rules']; $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->ignore = empty($this->bind[$this->name]['ignore']) ? [] : $this->bind[$this->name]['ignore'];
$this->installFile(); [$this->installFile(), $this->installData()];
$this->installData();
} else { } else {
$this->output->writeln("The specified module {$this->name} is not configured with installation rules"); $this->output->writeln("The specified module {$this->name} is not configured with installation rules");
} }