DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10897 from ubc-cpsc/develop

Browse source 
Security updates to enshrined/svg-sanitize and guzzlehttp/psr7
This commit is contained in:
snipe 2022-04-05 20:19:26 +01:00 committed by GitHub
parent 91e6acbfd9 472c94ef89
commit 56ee5c50a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -27,7 +27,7 @@
"doctrine/inflector": "^1.3", "doctrine/inflector": "^1.3",
"doctrine/instantiator": "^1.3", "doctrine/instantiator": "^1.3",
"eduardokum/laravel-mail-auto-embed": "^1.0", "eduardokum/laravel-mail-auto-embed": "^1.0",
"enshrined/svg-sanitize": "^0.13.3", "enshrined/svg-sanitize": "^0.15.0",
"erusev/parsedown": "^1.7", "erusev/parsedown": "^1.7",
"facade/ignition": "^2.10", "facade/ignition": "^2.10",
"fideloper/proxy": "^4.3", "fideloper/proxy": "^4.3",

48
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "c1c8533013db55e3b5f154e2a9464239", "content-hash": "442a6af235589e35cfcaa7e5e39e75ec",
"packages": [ "packages": [
{ {
"name": "alek13/slack", "name": "alek13/slack",
@ -2010,25 +2010,25 @@
}, },
{ {
"name": "enshrined/svg-sanitize", "name": "enshrined/svg-sanitize",
"version": "0.13.3", "version": "0.15.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/darylldoyle/svg-sanitizer.git", "url": "https://github.com/darylldoyle/svg-sanitizer.git",
"reference": "bc66593f255b7d2613d8f22041180036979b6403" "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/bc66593f255b7d2613d8f22041180036979b6403", "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
"reference": "bc66593f255b7d2613d8f22041180036979b6403", "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-libxml": "*" "ext-libxml": "*",
"php": "^7.0 || ^8.0"
}, },
"require-dev": { "require-dev": {
"codeclimate/php-test-reporter": "^0.1.2", "phpunit/phpunit": "^6.5 || ^8.5"
"phpunit/phpunit": "^6"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -2049,9 +2049,9 @@
"description": "An SVG sanitizer for PHP", "description": "An SVG sanitizer for PHP",
"support": { "support": {
"issues": "https://github.com/darylldoyle/svg-sanitizer/issues", "issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
"source": "https://github.com/darylldoyle/svg-sanitizer/tree/develop" "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.4"
}, },
"time": "2020-01-20T01:34:17+00:00" "time": "2022-02-21T09:13:59+00:00"
}, },
{ {
"name": "erusev/parsedown", "name": "erusev/parsedown",
@ -2679,16 +2679,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "7.4.1", "version": "7.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
"reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2783,7 +2783,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.4.1" "source": "https://github.com/guzzle/guzzle/tree/7.4.2"
}, },
"funding": [ "funding": [
{ {
@ -2799,7 +2799,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-12-06T18:43:05+00:00" "time": "2022-03-20T14:16:28+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@ -2887,16 +2887,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.1.0", "version": "2.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
"reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2920,7 +2920,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1-dev" "dev-master": "2.2-dev"
} }
}, },
"autoload": { "autoload": {
@ -2982,7 +2982,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.1.0" "source": "https://github.com/guzzle/psr7/tree/2.2.1"
}, },
"funding": [ "funding": [
{ {
@ -2998,7 +2998,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-10-06T17:43:30+00:00" "time": "2022-03-20T21:55:58+00:00"
}, },
{ {
"name": "intervention/image", "name": "intervention/image",
@ -13474,5 +13474,5 @@
"ext-pdo": "*" "ext-pdo": "*"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.0.0" "plugin-api-version": "2.3.0"
} }