From 2f0067445d2af60b9d155b318826f728e940be8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Feb 2022 22:26:04 +0000
Subject: [PATCH 1/2] Bump sass-loader from 7.3.1 to 12.5.0

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.3.1 to 12.5.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.3.1...v12.5.0)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 37 +++++--------------------------------
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fdc70f49e..3cce4da7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -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",
@@ -10379,30 +10369,13 @@
             }
         },
         "sass-loader": {
-            "version": "7.3.1",
-            "resolved": "https://registry.npm.taobao.org/sass-loader/download/sass-loader-7.3.1.tgz?cache=0&sync_timestamp=1604315406511&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-7.3.1.tgz",
-            "integrity": "sha1-pb9ooEvOocE/+ELXRxUPerfQ0j8=",
+            "version": "12.5.0",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.5.0.tgz",
+            "integrity": "sha512-POCQch5T2PFYOaHGJJgPoVaxJ76Ks+OIqKsDv2ErD53HE/WdPRehkVqdc5Qbt2fD2iGmgIRILDgQGbSHjmPrCA==",
             "dev": true,
             "requires": {
-                "clone-deep": "^4.0.1",
-                "loader-utils": "^1.0.1",
-                "neo-async": "^2.5.0",
-                "pify": "^4.0.1",
-                "semver": "^6.3.0"
-            },
-            "dependencies": {
-                "pify": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz?cache=0&sync_timestamp=1581697613983&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpify%2Fdownload%2Fpify-4.0.1.tgz",
-                    "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz",
-                    "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
-                    "dev": true
-                }
+                "klona": "^2.0.4",
+                "neo-async": "^2.6.2"
             }
         },
         "schema-utils": {
diff --git a/package.json b/package.json
index a302d7d9e..bc069fb7a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "opencollective": "^1.0.3",
         "resolve-url-loader": "^4.0.0",
         "sass": "^1.41.1",
-        "sass-loader": "7.*",
+        "sass-loader": "12.*",
         "vue-template-compiler": "^2.6.14"
     },
     "dependencies": {

From a99edb2133cec4561783129afd08ecf5b5e761f9 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Mon, 14 Feb 2022 22:26:17 +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 <master@zhiyicx.com>                          |
+ * | Homepage: www.thinksns.com                                           |
+ * +----------------------------------------------------------------------+
+ */
+
 $db = $argv[1] ?? 'mysql';
 $connection = [];
 switch ($db) {