From badfc92eb997f676d6671a36897ce89b93f79214 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 22:22:32 +0000 Subject: [PATCH 1/2] Bump axios from 0.22.0 to 0.26.0 Bumps [axios](https://github.com/axios/axios) from 0.22.0 to 0.26.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.22.0...v0.26.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 24 +++++++----------------- package.json | 2 +- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdc70f49e..1c5d3b9e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3433,17 +3433,17 @@ } }, "axios": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz", - "integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==", + "version": "0.26.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz", + "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==", "requires": { - "follow-redirects": "^1.14.4" + "follow-redirects": "^1.14.8" }, "dependencies": { "follow-redirects": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", - "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==" + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" } } }, @@ -4999,16 +4999,6 @@ "css-tree": "^1.1.2" } }, - "d": { - "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/d/download/d-1.0.1.tgz", - "integrity": "sha1-hpgJU3LVjb7jRv/Qxwk/mfj561o=", - "dev": true, - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, "dargs": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", diff --git a/package.json b/package.json index a302d7d9e..f364968d4 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@slimkit/plus-editor": "^0.0.3", - "axios": "^0.22.0", + "axios": "^0.26.0", "babel-plugin-transform-class-properties": "^6.24.1", "bootstrap-sass": "^3.3.7", "echarts": "^5.2.1", From e899b431cb2ca95eadc1db223eaa72353665248e Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 14 Feb 2022 22:22:51 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- scripts/travis-ci-settings.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/travis-ci-settings.php b/scripts/travis-ci-settings.php index 429f5cd61..5262314b1 100644 --- a/scripts/travis-ci-settings.php +++ b/scripts/travis-ci-settings.php @@ -3,6 +3,22 @@ declare(strict_types=1); +/* + * +----------------------------------------------------------------------+ + * | ThinkSNS Plus | + * +----------------------------------------------------------------------+ + * | Copyright (c) 2016-Present ZhiYiChuangXiang Technology Co., Ltd. | + * +----------------------------------------------------------------------+ + * | This source file is subject to enterprise private license, that is | + * | bundled with this package in the file LICENSE, and is available | + * | through the world-wide-web at the following url: | + * | https://github.com/slimkit/plus/blob/master/LICENSE | + * +----------------------------------------------------------------------+ + * | Author: Slim Kit Group | + * | Homepage: www.thinksns.com | + * +----------------------------------------------------------------------+ + */ + $db = $argv[1] ?? 'mysql'; $connection = []; switch ($db) {