diff --git a/composer.json b/composer.json index 409901228f5f67b0ce8cf31f6ce5c361b0af9eb0..0fedc35ebff2fa02faadb5cfeab57814a457a7d1 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "doctrine/instantiator": "^1.4", "doctrine/lexer": "^1.2.1", "egulias/email-validator": "^2.1", - "enshrined/svg-sanitize": "^0.14.0", + "enshrined/svg-sanitize": "^0.14.1", "guzzlehttp/guzzle": "^7.2", "guzzlehttp/psr7": "^1.7.0", "nikic/php-parser": "^4.10.4", diff --git a/composer.lock b/composer.lock index f29c6b33c0b689e6ebcb1265cfc66d669684246c..c6532b1bd654517d38217aae200cbc4dee149f15 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e9862b5af376514f356ce32811be4e78", + "content-hash": "07fe494edcb0afd7960429689b1dceb9", "packages": [ { "name": "bacon/bacon-qr-code", @@ -817,25 +817,26 @@ }, { "name": "enshrined/svg-sanitize", - "version": "0.14.0", + "version": "0.14.1", "source": { "type": "git", "url": "https://github.com/darylldoyle/svg-sanitizer.git", - "reference": "beff89576a72540ee99476aeb9cfe98222e76fb8" + "reference": "307b42066fb0b76b5119f5e1f0826e18fefabe95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/beff89576a72540ee99476aeb9cfe98222e76fb8", - "reference": "beff89576a72540ee99476aeb9cfe98222e76fb8", + "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/307b42066fb0b76b5119f5e1f0826e18fefabe95", + "reference": "307b42066fb0b76b5119f5e1f0826e18fefabe95", "shasum": "" }, "require": { "ext-dom": "*", - "ext-libxml": "*" + "ext-libxml": "*", + "php": "^7.0 || ^8.0" }, "require-dev": { "codeclimate/php-test-reporter": "^0.1.2", - "phpunit/phpunit": "^6" + "phpunit/phpunit": "^6.5 || ^8.5" }, "type": "library", "autoload": { @@ -856,9 +857,9 @@ "description": "An SVG sanitizer for PHP", "support": { "issues": "https://github.com/darylldoyle/svg-sanitizer/issues", - "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.14.0" + "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.14.1" }, - "time": "2021-01-21T10:13:20+00:00" + "time": "2021-08-09T23:46:54+00:00" }, { "name": "guzzlehttp/guzzle", diff --git a/typo3/sysext/core/Tests/Functional/Resource/Security/SvgSanitizerTest.php b/typo3/sysext/core/Tests/Functional/Resource/Security/SvgSanitizerTest.php index a48366505fb67c05e7affff9fcc7cbe4cf415c14..a09ce50005ff4a8c0e8d213a6b99a9f0171aab30 100644 --- a/typo3/sysext/core/Tests/Functional/Resource/Security/SvgSanitizerTest.php +++ b/typo3/sysext/core/Tests/Functional/Resource/Security/SvgSanitizerTest.php @@ -55,10 +55,6 @@ class SvgSanitizerTest extends FunctionalTestCase */ public function svgContentIsSanitized($filePath, $sanitizedFilePath) { - // @todo re-enable test once https://github.com/darylldoyle/svg-sanitizer/pull/53 is merged - if ($filePath === 'DirtySVG/entity.svg' || $filePath === 'DirtySVG/entity_2.svg') { - self::markTestSkipped('Skipped due experienced segmentation faults'); - } $basePath = dirname(__FILE__, 2) . '/Fixtures/'; $sanitizer = new SvgSanitizer(); self::assertStringEqualsFile( diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json index 6e8af0d7673624aa7c4e8da2c7c2429b511a4ebf..fe5d1ad7c0dc6be9810ea3cf692f6218621e0aea 100644 --- a/typo3/sysext/core/composer.json +++ b/typo3/sysext/core/composer.json @@ -35,7 +35,7 @@ "doctrine/instantiator": "^1.4", "doctrine/lexer": "^1.2.1", "egulias/email-validator": "^2.1", - "enshrined/svg-sanitize": "^0.14.0", + "enshrined/svg-sanitize": "^0.14.1", "guzzlehttp/guzzle": "^7.2", "guzzlehttp/psr7": "^1.7.0", "nikic/php-parser": "^4.10.4",