From f578e2c9e75439ecff6fc959234fc0690ff51a6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 05:18:49 +0000 Subject: [PATCH 1/5] Bump axios from 0.20.0 to 0.21.0 Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.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.20.0...v0.21.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e78f438f7b..1a08a97c85 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@johmun/vue-tags-input": "^2.1.0", - "axios": "^0.20.0", + "axios": "^0.21.0", "bootstrap-sass": "^3.3.7", "cross-env": "^7.0", "font-awesome": "^4.7.0", diff --git a/yarn.lock b/yarn.lock index bc19d1051b..1a6430fafd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1286,10 +1286,10 @@ autoprefixer@^9.4.2: postcss "^7.0.32" postcss-value-parser "^4.1.0" -axios@^0.20.0: - version "0.20.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz#057ba30f04884694993a8cd07fa394cff11c50bd" - integrity sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA== +axios@^0.21.0: + version "0.21.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.0.tgz#26df088803a2350dff2c27f96fef99fe49442aca" + integrity sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw== dependencies: follow-redirects "^1.10.0" From ed6a331faab3fa2ed171878b7fb5cbe60ff0d5e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 05:19:05 +0000 Subject: [PATCH 2/5] Bump uiv from 1.1.1 to 1.1.2 Bumps [uiv](https://github.com/uiv-lib/uiv) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/uiv-lib/uiv/releases) - [Commits](https://github.com/uiv-lib/uiv/compare/v1.1.1...v1.1.2) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bc19d1051b..a34ed2f6ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6333,9 +6333,9 @@ uglify-js@3.4.x: source-map "~0.6.1" uiv@^1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/uiv/-/uiv-1.1.1.tgz#b747b18781f95a77b5215957dc21d34caedb320b" - integrity sha512-Ny8koCu1jJt83jZAiFIRe0DS6C0fQ2RGV1BevKR6z8ILOwvoqKLWoM/solvU+zWcwLxYVeg0PXpj+ZCiKRONuw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/uiv/-/uiv-1.1.2.tgz#02a074d2a95bfb446d9c3e524dd62492e19b2151" + integrity sha512-T+UVykoEUG3C9qvpFGnWozcIl/nkM/vuP5UpncDAkf8aB202eWJJ9TNAVKyvpvu6igBe85D5hnsd66cNuFtp+Q== dependencies: portal-vue "^2.1.7" vue-functional-data-merge "^3.0.0" From 465e49476a330e35f46f201fcd339d164af3d25c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 05:24:43 +0000 Subject: [PATCH 3/5] Bump phpstan/phpstan from 0.12.51 to 0.12.52 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.51 to 0.12.52. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.12.51...0.12.52) Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 8c1fcd6383..3eb1c87679 100644 --- a/composer.lock +++ b/composer.lock @@ -8974,16 +8974,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.51", + "version": "0.12.52", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "b430527cd7b956324bcd554fb85a5e2fd43177d6" + "reference": "e96dd5e7ae9aefed663bc7e285ad96792b67eadc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b430527cd7b956324bcd554fb85a5e2fd43177d6", - "reference": "b430527cd7b956324bcd554fb85a5e2fd43177d6", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e96dd5e7ae9aefed663bc7e285ad96792b67eadc", + "reference": "e96dd5e7ae9aefed663bc7e285ad96792b67eadc", "shasum": "" }, "require": { @@ -9026,7 +9026,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T11:58:04+00:00" + "time": "2020-10-25T07:23:44+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", From 61c8b79e306a4ddd9dda7ff866da4ba95e7ae433 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 05:52:19 +0000 Subject: [PATCH 4/5] Bump axios from 0.20.0 to 0.21.0 in /frontend Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.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.20.0...v0.21.0) Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 14 +++----------- frontend/package.json | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) mode change 100755 => 100644 frontend/package-lock.json mode change 100755 => 100644 frontend/package.json diff --git a/frontend/package-lock.json b/frontend/package-lock.json old mode 100755 new mode 100644 index 82fbb20924..a34fb3c952 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1626,20 +1626,12 @@ } }, "axios": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz", - "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz", + "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==", "dev": true, "requires": { "follow-redirects": "^1.10.0" - }, - "dependencies": { - "follow-redirects": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", - "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==", - "dev": true - } } }, "babel-code-frame": { diff --git a/frontend/package.json b/frontend/package.json old mode 100755 new mode 100644 index 6370221619..22458bd3e7 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,7 +10,7 @@ "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { - "axios": "^0.20", + "axios": "^0.21", "cross-env": "^7.0", "laravel-mix": "^5.0.7", "laravel-mix-bundle-analyzer": "^1.0.5", From aa3e467a3e754740b6dbd098cea1c4d89a1158f4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Oct 2020 16:22:20 +0100 Subject: [PATCH 5/5] Add message so exception isn't empty. --- app/Support/Amount.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 7c5f99728d..a585a86b5c 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -350,6 +350,7 @@ class Amount try { $value = Crypt::decrypt($value); // verified } catch (DecryptException $e) { + // ignore decryption error. } return $value;