tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9948 from open-sausages/4

Browse Source 
FIX Tidy extension and cli fix for tests
This commit is contained in:
Dylan Wagstaff 2021-05-21 09:19:22 +12:00 committed by GitHub
commit a5fc61a23a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Dev/CSSContentParser.php
View File

@ -38,7 +38,7 @@ class CSSContentParser
[ [
'output-xhtml' => true, 'output-xhtml' => true,
'numeric-entities' => true, 'numeric-entities' => true,
'wrap' => 0, // We need this to be consistent for functional test string comparisons 'wrap' => 99999, // We need this to be consistent for functional test string comparisons
], ],
'utf8' 'utf8'
); );
@ -48,7 +48,7 @@ class CSSContentParser
} elseif (@shell_exec('which tidy')) { } elseif (@shell_exec('which tidy')) {
// using tiny through cli // using tiny through cli
$CLI_content = escapeshellarg($content); $CLI_content = escapeshellarg($content);
$tidy = `echo $CLI_content | tidy --force-output 1 -n -q -utf8 -asxhtml -w 0 2> /dev/null`; $tidy = `echo $CLI_content | tidy --force-output 1 -n -q -utf8 -asxhtml -w 99999 2> /dev/null`;
$tidy = str_replace('xmlns="http://www.w3.org/1999/xhtml"', '', $tidy); $tidy = str_replace('xmlns="http://www.w3.org/1999/xhtml"', '', $tidy);
$tidy = str_replace(' ', '', $tidy); $tidy = str_replace(' ', '', $tidy);
} else { } else {