mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-08-01 11:50:28 +02:00
Remove trailing whitespace.
Signed-off-by: Edward Z. Yang <edwardzyang@thewritingpot.com>
This commit is contained in:
@@ -302,7 +302,7 @@
|
|||||||
</directive>
|
</directive>
|
||||||
<directive id="Core.EscapeInvalidChildren">
|
<directive id="Core.EscapeInvalidChildren">
|
||||||
<file name="HTMLPurifier/ChildDef/Required.php">
|
<file name="HTMLPurifier/ChildDef/Required.php">
|
||||||
<line>55</line>
|
<line>62</line>
|
||||||
</file>
|
</file>
|
||||||
</directive>
|
</directive>
|
||||||
<directive id="Cache.SerializerPath">
|
<directive id="Cache.SerializerPath">
|
||||||
|
@@ -55,6 +55,8 @@ require 'HTMLPurifier/LanguageFactory.php';
|
|||||||
require 'HTMLPurifier/Length.php';
|
require 'HTMLPurifier/Length.php';
|
||||||
require 'HTMLPurifier/Lexer.php';
|
require 'HTMLPurifier/Lexer.php';
|
||||||
require 'HTMLPurifier/PercentEncoder.php';
|
require 'HTMLPurifier/PercentEncoder.php';
|
||||||
|
require 'HTMLPurifier/PropertyList.php';
|
||||||
|
require 'HTMLPurifier/PropertyListIterator.php';
|
||||||
require 'HTMLPurifier/Strategy.php';
|
require 'HTMLPurifier/Strategy.php';
|
||||||
require 'HTMLPurifier/StringHash.php';
|
require 'HTMLPurifier/StringHash.php';
|
||||||
require 'HTMLPurifier/StringHashParser.php';
|
require 'HTMLPurifier/StringHashParser.php';
|
||||||
|
@@ -49,6 +49,8 @@ require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
|
|||||||
require_once $__dir . '/HTMLPurifier/Length.php';
|
require_once $__dir . '/HTMLPurifier/Length.php';
|
||||||
require_once $__dir . '/HTMLPurifier/Lexer.php';
|
require_once $__dir . '/HTMLPurifier/Lexer.php';
|
||||||
require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
|
require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
|
||||||
|
require_once $__dir . '/HTMLPurifier/PropertyList.php';
|
||||||
|
require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
|
||||||
require_once $__dir . '/HTMLPurifier/Strategy.php';
|
require_once $__dir . '/HTMLPurifier/Strategy.php';
|
||||||
require_once $__dir . '/HTMLPurifier/StringHash.php';
|
require_once $__dir . '/HTMLPurifier/StringHash.php';
|
||||||
require_once $__dir . '/HTMLPurifier/StringHashParser.php';
|
require_once $__dir . '/HTMLPurifier/StringHashParser.php';
|
||||||
|
@@ -85,6 +85,7 @@ class HTMLPurifier_StringHashParser
|
|||||||
if (strpos($line, ':') !== false) {
|
if (strpos($line, ':') !== false) {
|
||||||
// Single-line declaration
|
// Single-line declaration
|
||||||
list($state, $line) = explode(':', $line, 2);
|
list($state, $line) = explode(':', $line, 2);
|
||||||
|
$line = trim($line);
|
||||||
} else {
|
} else {
|
||||||
// Use default declaration
|
// Use default declaration
|
||||||
$state = $this->default;
|
$state = $this->default;
|
||||||
|
43
maintenance/remove-trailing-whitespace.php
Normal file
43
maintenance/remove-trailing-whitespace.php
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
#!/usr/bin/php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
chdir(dirname(__FILE__));
|
||||||
|
require_once 'common.php';
|
||||||
|
assertCli();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* Removes trailing whitespace from files.
|
||||||
|
*/
|
||||||
|
|
||||||
|
chdir(dirname(__FILE__) . '/..');
|
||||||
|
$FS = new FSTools();
|
||||||
|
|
||||||
|
function prefix_is($comp, $subject) {
|
||||||
|
return strncmp($comp, $subject, strlen($comp)) === 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function postfix_is($comp, $subject) {
|
||||||
|
return strlen($subject) < $comp ? false : substr($subject, -strlen($comp)) === $comp;
|
||||||
|
}
|
||||||
|
|
||||||
|
$files = $FS->globr('.', '{,.}*', GLOB_BRACE);
|
||||||
|
foreach ($files as $file) {
|
||||||
|
if (
|
||||||
|
!is_file($file) ||
|
||||||
|
prefix_is('./.git', $file) ||
|
||||||
|
prefix_is('./docs/doxygen', $file) ||
|
||||||
|
postfix_is('.ser', $file) ||
|
||||||
|
postfix_is('.tgz', $file) ||
|
||||||
|
postfix_is('.patch', $file) ||
|
||||||
|
postfix_is('.dtd', $file) ||
|
||||||
|
postfix_is('.ent', $file) ||
|
||||||
|
$file == './library/HTMLPurifier/Lexer/PH5P.php' ||
|
||||||
|
$file == './maintenance/PH5P.php'
|
||||||
|
) continue;
|
||||||
|
$contents = file_get_contents($file);
|
||||||
|
$result = preg_replace('/^(.*?)[ \t]+(\r?)$/m', '\1\2', $contents, -1, $count);
|
||||||
|
if (!$count) continue;
|
||||||
|
echo "$file\n";
|
||||||
|
file_put_contents($file, $result);
|
||||||
|
}
|
Reference in New Issue
Block a user