1
0
mirror of https://github.com/mrclay/minify.git synced 2025-08-21 21:26:13 +02:00

do some trivial codestyle fixes

unix newlines, trailing spaces
This commit is contained in:
Elan Ruusamäe
2016-01-22 00:30:38 +02:00
parent 90bf31f53b
commit 379feaba99
40 changed files with 1424 additions and 1327 deletions

View File

@@ -1,6 +1,6 @@
<?php
/**
* Class Minify_Lines
* Class Minify_Lines
* @package Minify
*/
@@ -17,13 +17,13 @@ class Minify_Lines {
* Add line numbers in C-style comments
*
* This uses a very basic parser easily fooled by comment tokens inside
* strings or regexes, but, otherwise, generally clean code will not be
* strings or regexes, but, otherwise, generally clean code will not be
* mangled. URI rewriting can also be performed.
*
* @param string $content
*
*
* @param array $options available options:
*
*
* 'id': (optional) string to identify file. E.g. file name/path
*
* 'currentDir': (default null) if given, this is assumed to be the
@@ -31,10 +31,10 @@ class Minify_Lines {
* all relative URIs in import/url declarations to correctly point to
* the desired files, and prepend a comment with debugging information about
* this process.
*
* @return string
*
* @return string
*/
public static function minify($content, $options = array())
public static function minify($content, $options = array())
{
$id = (isset($options['id']) && $options['id'])
? $options['id']
@@ -66,7 +66,7 @@ class Minify_Lines {
$inComment = self::_eolInComment($line, $inComment);
}
$content = implode("\n", $newLines) . "\n";
// check for desired URI rewriting
if (isset($options['currentDir'])) {
Minify_CSS_UriRewriter::$debugText = '';
@@ -76,19 +76,19 @@ class Minify_Lines {
,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT']
,isset($options['symlinks']) ? $options['symlinks'] : array()
);
$content = "/* Minify_CSS_UriRewriter::\$debugText\n\n"
$content = "/* Minify_CSS_UriRewriter::\$debugText\n\n"
. Minify_CSS_UriRewriter::$debugText . "*/\n"
. $content;
}
return $content;
}
/**
* Is the parser within a C-style comment at the end of this line?
*
* @param string $line current line of code
*
*
* @param bool $inComment was the parser in a comment at the
* beginning of the line?
*
@@ -117,21 +117,22 @@ class Minify_Lines {
$line = substr($line, $pos + 2);
}
}
return $inComment;
}
/**
* Prepend a comment (or note) to the given line
*
* @param string $line current line of code
*
* @param string $note content of note/comment
*
*
* @param bool $inComment was the parser in a comment at the
* beginning of the line?
*
* @param int $padTo minimum width of comment
*
*
* @return string
*/
private static function _addNote($line, $note, $inComment, $padTo)