Skip to content

Commit

Permalink
Merge pull request #9948 from open-sausages/4
Browse files Browse the repository at this point in the history
FIX Tidy extension and cli fix for tests
  • Loading branch information
NightJar committed May 20, 2021
2 parents 766df06 + 5e2ca7f commit a5fc61a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Dev/CSSContentParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __construct($content)
[
'output-xhtml' => 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'
);
Expand All @@ -48,7 +48,7 @@ public function __construct($content)
} elseif (@shell_exec('which tidy')) {
// using tiny through cli
$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(' ', '', $tidy);
} else {
Expand Down

0 comments on commit a5fc61a

Please sign in to comment.