diff --git a/library/think/console/Output.php b/library/think/console/Output.php index f9eb214e..65dc9fb8 100644 --- a/library/think/console/Output.php +++ b/library/think/console/Output.php @@ -25,10 +25,10 @@ use think\console\output\question\Confirmation; * Class Output * @package think\console * - * @see think\console\output\driver\Console::setDecorated + * @see \think\console\output\driver\Console::setDecorated * @method void setDecorated($decorated) * - * @see think\console\output\driver\Buffer::fetch + * @see \think\console\output\driver\Buffer::fetch * @method string fetch() * * @method void info($message) diff --git a/library/think/console/output/driver/Console.php b/library/think/console/output/driver/Console.php index 3b8f3c7e..0dcd0f77 100644 --- a/library/think/console/output/driver/Console.php +++ b/library/think/console/output/driver/Console.php @@ -356,10 +356,10 @@ class Console { if (DIRECTORY_SEPARATOR === '\\') { return - 0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD) - || false !== getenv('ANSICON') - || 'ON' === getenv('ConEmuANSI') - || 'xterm' === getenv('TERM'); + '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD + || false !== getenv('ANSICON') + || 'ON' === getenv('ConEmuANSI') + || 'xterm' === getenv('TERM'); } return function_exists('posix_isatty') && @posix_isatty($stream); diff --git a/library/think/db/builder/Pgsql.php b/library/think/db/builder/Pgsql.php index 6f256e0e..0a955a5b 100644 --- a/library/think/db/builder/Pgsql.php +++ b/library/think/db/builder/Pgsql.php @@ -50,7 +50,7 @@ class Pgsql extends Builder $key = trim($key); if (strpos($key, '$.') && false === strpos($key, '(')) { // JSON字段支持 - list($field, $name) = explode($key, '$.'); + list($field, $name) = explode('$.', $key); $key = $field . '->>\'' . $name . '\''; } return $key; diff --git a/library/think/model/Relation.php b/library/think/model/Relation.php index 0af4d3b8..1dc43e6e 100644 --- a/library/think/model/Relation.php +++ b/library/think/model/Relation.php @@ -602,7 +602,7 @@ class Relation // 保存关联表数据 $model = new $this->model; $id = $model->save($data); - } elseif (is_numeric($data)) { + } elseif (is_numeric($data) || is_string($data)) { // 根据关联表主键直接写入中间表 $id = $data; } elseif ($data instanceof Model) { @@ -634,7 +634,7 @@ class Relation { if (is_array($data)) { $id = $data; - } elseif (is_numeric($data)) { + } elseif (is_numeric($data) || is_string($data)) { // 根据关联表主键直接写入中间表 $id = $data; } elseif ($data instanceof Model) {