* @variables
- * {
- * defaultColor: black;
- * }
+ * {
+ * defaultColor: black;
+ * }
* color: var(defaultColor);
*
*
@@ -544,95 +525,90 @@ class CssWhitesmithsFormatter extends aCssFormatter
* color:black;
*
*
- * @package CssMin/Minifier/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . $variable . " in media types " . implode(", ", $mediaTypes) . "", (string) $token));
- $token = new CssNullToken();
- return true;
- }
- }
- return false;
- }
- /**
- * Implements {@link aMinifierPlugin::getTriggerTokens()}
- *
- * @return array
- */
- public function getTriggerTokens()
- {
- return array
- (
- "CssAtFontFaceDeclarationToken",
- "CssAtPageDeclarationToken",
- "CssRulesetDeclarationToken"
- );
- }
- /**
- * Sets the variables.
- *
- * @param array $variables Variables to set
- * @return void
- */
- public function setVariables(array $variables)
- {
- $this->variables = $variables;
- }
+ /**
+ * Regular expression matching a value.
+ *
+ * @var string
+ */
+ private $reMatch = "/var\((.+)\)/iSU";
+ /**
+ * Parsed variables.
+ *
+ * @var array
+ */
+ private $variables = NULL;
+
+ /**
+ * Returns the variables.
+ *
+ * @return array
+ */
+ public function getVariables() {
+ return $this->variables;
+ }
+
+ /**
+ * Implements {@link aCssMinifierPlugin::minify()}.
+ *
+ * @param aCssToken $token Token to process
+ * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+ */
+ public function apply(aCssToken &$token) {
+ if (stripos($token->Value, "var") !== FALSE && preg_match_all($this->reMatch, $token->Value, $m)) {
+ $mediaTypes = $token->MediaTypes;
+ if (!in_array("all", $mediaTypes)) {
+ $mediaTypes[] = "all";
+ }
+ for ($i = 0, $l = count($m[0]); $i < $l; $i++) {
+ $variable = trim($m[1][$i]);
+ foreach ($mediaTypes as $mediaType) {
+ if (isset($this->variables[$mediaType], $this->variables[$mediaType][$variable])) {
+ // Variable value found => set the declaration value to the variable value and return
+ $token->Value = str_replace($m[0][$i], $this->variables[$mediaType][$variable], $token->Value);
+ continue 2;
+ }
+ }
+ // If no value was found trigger an error and replace the token with a CssNullToken
+ CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": No value found for variable " . $variable . " in media types " . implode(", ", $mediaTypes) . "", (string)$token));
+ $token = new CssNullToken();
+ return TRUE;
+ }
+ }
+ return FALSE;
+ }
+
+ /**
+ * Implements {@link aMinifierPlugin::getTriggerTokens()}
+ *
+ * @return array
+ */
+ public function getTriggerTokens() {
+ return array
+ (
+ "CssAtFontFaceDeclarationToken",
+ "CssAtPageDeclarationToken",
+ "CssRulesetDeclarationToken"
+ );
+ }
+
+ /**
+ * Sets the variables.
+ *
+ * @param array $variables Variables to set
+ * @return void
+ */
+ public function setVariables(array $variables) {
+ $this->variables = $variables;
+ }
}
/**
@@ -640,93 +616,75 @@ class CssVariablesMinifierPlugin extends aCssMinifierPlugin
* blocks. The variables will get store in the {@link CssVariablesMinifierPlugin} that will apply the variables to
* declaration.
*
- * @package CssMin/Minifier/Filters
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla CssVariablesMinifierPlugin was not found but is required for " . __CLASS__ . ""));
- }
- else
- {
- $plugin->setVariables($variables);
- }
- return count($remove);
- }
+ /**
+ * Implements {@link aCssMinifierFilter::filter()}.
+ *
+ * @param array $tokens Array of objects of type aCssToken
+ * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+ */
+ public function apply(array &$tokens) {
+ $variables = array();
+ $defaultMediaTypes = array("all");
+ $mediaTypes = array();
+ $remove = array();
+ for ($i = 0, $l = count($tokens); $i < $l; $i++) {
+ // @variables at-rule block found
+ if (get_class($tokens[$i]) === "CssAtVariablesStartToken") {
+ $remove[] = $i;
+ $mediaTypes = (count($tokens[$i]->MediaTypes) == 0 ? $defaultMediaTypes : $tokens[$i]->MediaTypes);
+ foreach ($mediaTypes as $mediaType) {
+ if (!isset($variables[$mediaType])) {
+ $variables[$mediaType] = array();
+ }
+ }
+ // Read the variable declaration tokens
+ for ($i = $i; $i < $l; $i++) {
+ // Found a variable declaration => read the variable values
+ if (get_class($tokens[$i]) === "CssAtVariablesDeclarationToken") {
+ foreach ($mediaTypes as $mediaType) {
+ $variables[$mediaType][$tokens[$i]->Property] = $tokens[$i]->Value;
+ }
+ $remove[] = $i;
+ } // Found the variables end token => break;
+ else if (get_class($tokens[$i]) === "CssAtVariablesEndToken") {
+ $remove[] = $i;
+ break;
+ }
+ }
+ }
+ }
+ // Variables in @variables at-rule blocks
+ foreach ($variables as $mediaType => $null) {
+ foreach ($variables[$mediaType] as $variable => $value) {
+ // If a var() statement in a variable value found...
+ if (stripos($value, "var") !== FALSE && preg_match_all("/var\((.+)\)/iSU", $value, $m)) {
+ // ... then replace the var() statement with the variable values.
+ for ($i = 0, $l = count($m[0]); $i < $l; $i++) {
+ $variables[$mediaType][$variable] = str_replace($m[0][$i], (isset($variables[$mediaType][$m[1][$i]]) ? $variables[$mediaType][$m[1][$i]] : ""), $variables[$mediaType][$variable]);
+ }
+ }
+ }
+ }
+ // Remove the complete @variables at-rule block
+ foreach ($remove as $i) {
+ $tokens[$i] = NULL;
+ }
+ if (!($plugin = $this->minifier->getPlugin("CssVariablesMinifierPlugin"))) {
+ CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin CssVariablesMinifierPlugin was not found but is required for " . __CLASS__ . ""));
+ } else {
+ $plugin->setVariables($variables);
+ }
+ return count($remove);
+ }
}
/**
@@ -734,75 +692,65 @@ class CssVariablesMinifierFilter extends aCssMinifierFilter
*
* This plugin return no {@link aCssToken CssToken} but ensures that url() values will get parsed properly.
*
- * @package CssMin/Parser/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . $name . " with the class name " . $class . " was not found"));
- }
- }
- }
- if (!is_null($source))
- {
- $this->parse($source);
- }
- }
- /**
- * Append a token to the array of tokens.
- *
- * @param aCssToken $token Token to append
- * @return void
- */
- public function appendToken(aCssToken $token)
- {
- $this->tokens[] = $token;
- }
- /**
- * Clears the current buffer.
- *
- * @return void
- */
- public function clearBuffer()
- {
- $this->buffer = "";
- }
- /**
- * Returns and clear the current buffer.
- *
- * @param string $trim Chars to use to trim the returned buffer
- * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
- * @return string
- */
- public function getAndClearBuffer($trim = "", $tolower = false)
- {
- $r = $this->getBuffer($trim, $tolower);
- $this->buffer = "";
- return $r;
- }
- /**
- * Returns the current buffer.
- *
- * @param string $trim Chars to use to trim the returned buffer
- * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
- * @return string
- */
- public function getBuffer($trim = "", $tolower = false)
- {
- $r = $this->buffer;
- if ($trim)
- {
- $r = trim($r, " \t\n\r\0\x0B" . $trim);
- }
- if ($tolower)
- {
- $r = strtolower($r);
- }
- return $r;
- }
- /**
- * Returns the current media types state.
- *
- * @return array
- */
- public function getMediaTypes()
- {
- return $this->stateMediaTypes;
- }
- /**
- * Returns the CSS source.
- *
- * @return string
- */
- public function getSource()
- {
- return $this->source;
- }
- /**
- * Returns the current state.
- *
- * @return integer The current state
- */
- public function getState()
- {
- return $this->state;
- }
- /**
- * Returns a plugin by class name.
- *
- * @param string $name Class name of the plugin
- * @return aCssParserPlugin
- */
- public function getPlugin($class)
- {
- static $index = null;
- if (is_null($index))
- {
- $index = array();
- for ($i = 0, $l = count($this->plugins); $i < $l; $i++)
- {
- $index[get_class($this->plugins[$i])] = $i;
- }
- }
- return isset($index[$class]) ? $this->plugins[$index[$class]] : false;
- }
- /**
- * Returns the parsed tokens.
- *
- * @return array
- */
- public function getTokens()
- {
- return $this->tokens;
- }
- /**
- * Returns if the current state equals the passed state.
- *
- * @param integer $state State to compare with the current state
- * @return boolean TRUE is the state equals to the passed state; FALSE if not
- */
- public function isState($state)
- {
- return ($this->state == $state);
- }
- /**
- * Parse the CSS source and return a array with parsed tokens.
- *
- * @param string $source CSS source
- * @return array Array with tokens
- */
- public function parse($source)
- {
- // Reset
- $this->source = "";
- $this->tokens = array();
- // Create a global and plugin lookup table for trigger chars; set array of plugins as local variable and create
- // several helper variables for plugin handling
- $globalTriggerChars = "";
- $plugins = $this->plugins;
- $pluginCount = count($plugins);
- $pluginIndex = array();
- $pluginTriggerStates = array();
- $pluginTriggerChars = array();
- for ($i = 0, $l = count($plugins); $i < $l; $i++)
- {
- $tPluginClassName = get_class($plugins[$i]);
- $pluginTriggerChars[$i] = implode("", $plugins[$i]->getTriggerChars());
- $tPluginTriggerStates = $plugins[$i]->getTriggerStates();
- $pluginTriggerStates[$i] = $tPluginTriggerStates === false ? false : "|" . implode("|", $tPluginTriggerStates) . "|";
- $pluginIndex[$tPluginClassName] = $i;
- for ($ii = 0, $ll = strlen($pluginTriggerChars[$i]); $ii < $ll; $ii++)
- {
- $c = substr($pluginTriggerChars[$i], $ii, 1);
- if (strpos($globalTriggerChars, $c) === false)
- {
- $globalTriggerChars .= $c;
- }
- }
- }
- // Normalise line endings
- $source = str_replace("\r\n", "\n", $source); // Windows to Unix line endings
- $source = str_replace("\r", "\n", $source); // Mac to Unix line endings
- $this->source = $source;
- // Variables
- $buffer = &$this->buffer;
- $exclusive = &$this->stateExclusive;
- $state = &$this->state;
- $c = $p = null;
- // --
- for ($i = 0, $l = strlen($source); $i < $l; $i++)
- {
- // Set the current Char
- $c = $source[$i]; // Is faster than: $c = substr($source, $i, 1);
- // Normalize and filter double whitespace characters
- if ($exclusive === false)
- {
- if ($c === "\n" || $c === "\t")
- {
- $c = " ";
- }
- if ($c === " " && $p === " ")
- {
- continue;
- }
- }
- $buffer .= $c;
-
- // Fix case when value of url() contains parentheses, for example: url("data: ... ()")
- if ($this->getState() == 'T_URL' && $c == ')') {
- $trimmedBuffer = trim($buffer);
- if (preg_match('@url\((\s+)?".+@', $trimmedBuffer)
- && !preg_match('@url\((\s+)?".+"\)@', $trimmedBuffer)
- || preg_match('@url\((\s+)?\'.+@', $trimmedBuffer)
- && !preg_match('@url\((\s+)?\'.+\'\)@', $trimmedBuffer)
- ) {
- $p = $c; // Set the parent char
- continue;
- }
- }
-
- // Extended processing only if the current char is a global trigger char
- if (strpos($globalTriggerChars, $c) !== false)
- {
- // Exclusive state is set; process with the exclusive plugin
- if ($exclusive)
- {
- $tPluginIndex = $pluginIndex[$exclusive];
- if (strpos($pluginTriggerChars[$tPluginIndex], $c) !== false && ($pluginTriggerStates[$tPluginIndex] === false || strpos($pluginTriggerStates[$tPluginIndex], $state) !== false))
- {
- $r = $plugins[$tPluginIndex]->parse($i, $c, $p, $state);
- // Return value is TRUE => continue with next char
- if ($r === true)
- {
- continue;
- }
- // Return value is numeric => set new index and continue with next char
- elseif ($r !== false && $r != $i)
- {
- $i = $r;
- continue;
- }
- }
- }
- // Else iterate through the plugins
- else
- {
- $triggerState = "|" . $state . "|";
- for ($ii = 0, $ll = $pluginCount; $ii < $ll; $ii++)
- {
- // Only process if the current char is one of the plugin trigger chars
- if (strpos($pluginTriggerChars[$ii], $c) !== false && ($pluginTriggerStates[$ii] === false || strpos($pluginTriggerStates[$ii], $triggerState) !== false))
- {
- // Process with the plugin
- $r = $plugins[$ii]->parse($i, $c, $p, $state);
- // Return value is TRUE => break the plugin loop and and continue with next char
- if ($r === true)
- {
- break;
- }
- // Return value is numeric => set new index, break the plugin loop and and continue with next char
- elseif ($r !== false && $r != $i)
- {
- $i = $r;
- break;
- }
- }
- }
- }
- }
- $p = $c; // Set the parent char
- }
- return $this->tokens;
- }
- /**
- * Remove the last state of the state stack and return the removed stack value.
- *
- * @return integer Removed state value
- */
- public function popState()
- {
- $r = array_pop($this->states);
- $this->state = $this->states[count($this->states) - 1];
- return $r;
- }
- /**
- * Adds a new state onto the state stack.
- *
- * @param integer $state State to add onto the state stack.
- * @return integer The index of the added state in the state stacks
- */
- public function pushState($state)
- {
- $r = array_push($this->states, $state);
- $this->state = $this->states[count($this->states) - 1];
- return $r;
- }
- /**
- * Sets/restores the buffer.
- *
- * @param string $buffer Buffer to set
- * @return void
- */
- public function setBuffer($buffer)
- {
- $this->buffer = $buffer;
- }
- /**
- * Set the exclusive state.
- *
- * @param string $exclusive Exclusive state
- * @return void
- */
- public function setExclusive($exclusive)
- {
- $this->stateExclusive = $exclusive;
- }
- /**
- * Set the media types state.
- *
- * @param array $mediaTypes Media types state
- * @return void
- */
- public function setMediaTypes(array $mediaTypes)
- {
- $this->stateMediaTypes = $mediaTypes;
- }
- /**
- * Sets the current state in the state stack; equals to {@link CssParser::popState()} + {@link CssParser::pushState()}.
- *
- * @param integer $state State to set
- * @return integer
- */
- public function setState($state)
- {
- $r = array_pop($this->states);
- array_push($this->states, $state);
- $this->state = $this->states[count($this->states) - 1];
- return $r;
- }
- /**
- * Removes the exclusive state.
- *
- * @return void
- */
- public function unsetExclusive()
- {
- $this->stateExclusive = false;
- }
- /**
- * Removes the media types state.
- *
- * @return void
- */
- public function unsetMediaTypes()
- {
- $this->stateMediaTypes = false;
- }
+ /**
+ * Parse buffer.
+ *
+ * @var string
+ */
+ private $buffer = "";
+ /**
+ * {@link aCssParserPlugin Plugins}.
+ *
+ * @var array
+ */
+ private $plugins = array();
+ /**
+ * Source to parse.
+ *
+ * @var string
+ */
+ private $source = "";
+ /**
+ * Current state.
+ *
+ * @var integer
+ */
+ private $state = "T_DOCUMENT";
+ /**
+ * Exclusive state.
+ *
+ * @var string
+ */
+ private $stateExclusive = FALSE;
+ /**
+ * Media types state.
+ *
+ * @var mixed
+ */
+ private $stateMediaTypes = FALSE;
+ /**
+ * State stack.
+ *
+ * @var array
+ */
+ private $states = array("T_DOCUMENT");
+ /**
+ * Parsed tokens.
+ *
+ * @var array
+ */
+ private $tokens = array();
+
+ /**
+ * Constructer.
+ *
+ * Create instances of the used {@link aCssParserPlugin plugins}.
+ *
+ * @param string $source CSS source [optional]
+ * @param array $plugins Plugin configuration [optional]
+ * @return void
+ */
+ public function __construct($source = NULL, array $plugins = NULL) {
+ $plugins = array_merge(array
+ (
+ "Comment" => TRUE,
+ "String" => TRUE,
+ "Url" => TRUE,
+ "Expression" => TRUE,
+ "Ruleset" => TRUE,
+ "AtCharset" => TRUE,
+ "AtFontFace" => TRUE,
+ "AtImport" => TRUE,
+ "AtKeyframes" => TRUE,
+ "AtMedia" => TRUE,
+ "AtPage" => TRUE,
+ "AtVariables" => TRUE
+ ), is_array($plugins) ? $plugins : array());
+ // Create plugin instances
+ foreach ($plugins as $name => $config) {
+ if ($config !== FALSE) {
+ $class = "Css" . $name . "ParserPlugin";
+ $config = is_array($config) ? $config : array();
+ if (class_exists($class)) {
+ $this->plugins[] = new $class($this, $config);
+ } else {
+ CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin " . $name . " with the class name " . $class . " was not found"));
+ }
+ }
+ }
+ if (!is_null($source)) {
+ $this->parse($source);
+ }
+ }
+
+ /**
+ * Append a token to the array of tokens.
+ *
+ * @param aCssToken $token Token to append
+ * @return void
+ */
+ public function appendToken(aCssToken $token) {
+ $this->tokens[] = $token;
+ }
+
+ /**
+ * Clears the current buffer.
+ *
+ * @return void
+ */
+ public function clearBuffer() {
+ $this->buffer = "";
+ }
+
+ /**
+ * Returns and clear the current buffer.
+ *
+ * @param string $trim Chars to use to trim the returned buffer
+ * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
+ * @return string
+ */
+ public function getAndClearBuffer($trim = "", $tolower = FALSE) {
+ $r = $this->getBuffer($trim, $tolower);
+ $this->buffer = "";
+ return $r;
+ }
+
+ /**
+ * Returns the current buffer.
+ *
+ * @param string $trim Chars to use to trim the returned buffer
+ * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
+ * @return string
+ */
+ public function getBuffer($trim = "", $tolower = FALSE) {
+ $r = $this->buffer;
+ if ($trim) {
+ $r = trim($r, " \t\n\r\0\x0B" . $trim);
+ }
+ if ($tolower) {
+ $r = strtolower($r);
+ }
+ return $r;
+ }
+
+ /**
+ * Returns the current media types state.
+ *
+ * @return array
+ */
+ public function getMediaTypes() {
+ return $this->stateMediaTypes;
+ }
+
+ /**
+ * Returns the CSS source.
+ *
+ * @return string
+ */
+ public function getSource() {
+ return $this->source;
+ }
+
+ /**
+ * Returns the current state.
+ *
+ * @return integer The current state
+ */
+ public function getState() {
+ return $this->state;
+ }
+
+ /**
+ * Returns a plugin by class name.
+ *
+ * @param string $name Class name of the plugin
+ * @return aCssParserPlugin
+ */
+ public function getPlugin($class) {
+ static $index = NULL;
+ if (is_null($index)) {
+ $index = array();
+ for ($i = 0, $l = count($this->plugins); $i < $l; $i++) {
+ $index[get_class($this->plugins[$i])] = $i;
+ }
+ }
+ return isset($index[$class]) ? $this->plugins[$index[$class]] : FALSE;
+ }
+
+ /**
+ * Returns the parsed tokens.
+ *
+ * @return array
+ */
+ public function getTokens() {
+ return $this->tokens;
+ }
+
+ /**
+ * Returns if the current state equals the passed state.
+ *
+ * @param integer $state State to compare with the current state
+ * @return boolean TRUE is the state equals to the passed state; FALSE if not
+ */
+ public function isState($state) {
+ return ($this->state == $state);
+ }
+
+ /**
+ * Parse the CSS source and return a array with parsed tokens.
+ *
+ * @param string $source CSS source
+ * @return array Array with tokens
+ */
+ public function parse($source) {
+ // Reset
+ $this->source = "";
+ $this->tokens = array();
+ // Create a global and plugin lookup table for trigger chars; set array of plugins as local variable and create
+ // several helper variables for plugin handling
+ $globalTriggerChars = "";
+ $plugins = $this->plugins;
+ $pluginCount = count($plugins);
+ $pluginIndex = array();
+ $pluginTriggerStates = array();
+ $pluginTriggerChars = array();
+ for ($i = 0, $l = count($plugins); $i < $l; $i++) {
+ $tPluginClassName = get_class($plugins[$i]);
+ $pluginTriggerChars[$i] = implode("", $plugins[$i]->getTriggerChars());
+ $tPluginTriggerStates = $plugins[$i]->getTriggerStates();
+ $pluginTriggerStates[$i] = $tPluginTriggerStates === FALSE ? FALSE : "|" . implode("|", $tPluginTriggerStates) . "|";
+ $pluginIndex[$tPluginClassName] = $i;
+ for ($ii = 0, $ll = strlen($pluginTriggerChars[$i]); $ii < $ll; $ii++) {
+ $c = substr($pluginTriggerChars[$i], $ii, 1);
+ if (strpos($globalTriggerChars, $c) === FALSE) {
+ $globalTriggerChars .= $c;
+ }
+ }
+ }
+ // Normalise line endings
+ $source = str_replace("\r\n", "\n", $source); // Windows to Unix line endings
+ $source = str_replace("\r", "\n", $source); // Mac to Unix line endings
+ $this->source = $source;
+ // Variables
+ $buffer = &$this->buffer;
+ $exclusive = &$this->stateExclusive;
+ $state = &$this->state;
+ $c = $p = NULL;
+ // --
+ for ($i = 0, $l = strlen($source); $i < $l; $i++) {
+ // Set the current Char
+ $c = $source[$i]; // Is faster than: $c = substr($source, $i, 1);
+ // Normalize and filter double whitespace characters
+ if ($exclusive === FALSE) {
+ if ($c === "\n" || $c === "\t") {
+ $c = " ";
+ }
+ if ($c === " " && $p === " ") {
+ continue;
+ }
+ }
+ $buffer .= $c;
+
+ // Fix case when value of url() contains parentheses, for example: url("data: ... ()")
+ if ($this->getState() == 'T_URL' && $c == ')') {
+ $trimmedBuffer = trim($buffer);
+ if (preg_match('@url\((\s+)?".+@', $trimmedBuffer)
+ && !preg_match('@url\((\s+)?".+"\)@', $trimmedBuffer)
+ || preg_match('@url\((\s+)?\'.+@', $trimmedBuffer)
+ && !preg_match('@url\((\s+)?\'.+\'\)@', $trimmedBuffer)
+ ) {
+ $p = $c; // Set the parent char
+ continue;
+ }
+ }
+
+ // Extended processing only if the current char is a global trigger char
+ if (strpos($globalTriggerChars, $c) !== FALSE) {
+ // Exclusive state is set; process with the exclusive plugin
+ if ($exclusive) {
+ $tPluginIndex = $pluginIndex[$exclusive];
+ if (strpos($pluginTriggerChars[$tPluginIndex], $c) !== FALSE && ($pluginTriggerStates[$tPluginIndex] === FALSE || strpos($pluginTriggerStates[$tPluginIndex], $state) !== FALSE)) {
+ $r = $plugins[$tPluginIndex]->parse($i, $c, $p, $state);
+ // Return value is TRUE => continue with next char
+ if ($r === TRUE) {
+ continue;
+ } // Return value is numeric => set new index and continue with next char
+ else if ($r !== FALSE && $r != $i) {
+ $i = $r;
+ continue;
+ }
+ }
+ } // Else iterate through the plugins
+ else {
+ $triggerState = "|" . $state . "|";
+ for ($ii = 0, $ll = $pluginCount; $ii < $ll; $ii++) {
+ // Only process if the current char is one of the plugin trigger chars
+ if (strpos($pluginTriggerChars[$ii], $c) !== FALSE && ($pluginTriggerStates[$ii] === FALSE || strpos($pluginTriggerStates[$ii], $triggerState) !== FALSE)) {
+ // Process with the plugin
+ $r = $plugins[$ii]->parse($i, $c, $p, $state);
+ // Return value is TRUE => break the plugin loop and and continue with next char
+ if ($r === TRUE) {
+ break;
+ } // Return value is numeric => set new index, break the plugin loop and and continue with next char
+ else if ($r !== FALSE && $r != $i) {
+ $i = $r;
+ break;
+ }
+ }
+ }
+ }
+ }
+ $p = $c; // Set the parent char
+ }
+ return $this->tokens;
+ }
+
+ /**
+ * Remove the last state of the state stack and return the removed stack value.
+ *
+ * @return integer Removed state value
+ */
+ public function popState() {
+ $r = array_pop($this->states);
+ $this->state = $this->states[count($this->states) - 1];
+ return $r;
+ }
+
+ /**
+ * Adds a new state onto the state stack.
+ *
+ * @param integer $state State to add onto the state stack.
+ * @return integer The index of the added state in the state stacks
+ */
+ public function pushState($state) {
+ $r = array_push($this->states, $state);
+ $this->state = $this->states[count($this->states) - 1];
+ return $r;
+ }
+
+ /**
+ * Sets/restores the buffer.
+ *
+ * @param string $buffer Buffer to set
+ * @return void
+ */
+ public function setBuffer($buffer) {
+ $this->buffer = $buffer;
+ }
+
+ /**
+ * Set the exclusive state.
+ *
+ * @param string $exclusive Exclusive state
+ * @return void
+ */
+ public function setExclusive($exclusive) {
+ $this->stateExclusive = $exclusive;
+ }
+
+ /**
+ * Set the media types state.
+ *
+ * @param array $mediaTypes Media types state
+ * @return void
+ */
+ public function setMediaTypes(array $mediaTypes) {
+ $this->stateMediaTypes = $mediaTypes;
+ }
+
+ /**
+ * Sets the current state in the state stack; equals to {@link CssParser::popState()} + {@link CssParser::pushState()}.
+ *
+ * @param integer $state State to set
+ * @return integer
+ */
+ public function setState($state) {
+ $r = array_pop($this->states);
+ array_push($this->states, $state);
+ $this->state = $this->states[count($this->states) - 1];
+ return $r;
+ }
+
+ /**
+ * Removes the exclusive state.
+ *
+ * @return void
+ */
+ public function unsetExclusive() {
+ $this->stateExclusive = FALSE;
+ }
+
+ /**
+ * Removes the media types state.
+ *
+ * @return void
+ */
+ public function unsetMediaTypes() {
+ $this->stateMediaTypes = FALSE;
+ }
}
/**
* {@link aCssFromatter Formatter} returning the CSS source in {@link http://goo.gl/j4XdU OTBS indent style} (The One True Brace Style).
*
- * @package CssMin/Formatter
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . $name . " with the class name " . $class . " was not found"));
- }
- }
- }
- // Plugins
- foreach ($plugins as $name => $config)
- {
- if ($config !== false)
- {
- $class = "Css" . $name . "MinifierPlugin";
- $config = is_array($config) ? $config : array();
- if (class_exists($class))
- {
- $this->plugins[] = new $class($this, $config);
- }
- else
- {
- CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin " . $name . " with the class name " . $class . " was not found"));
- }
- }
- }
- // --
- if (!is_null($source))
- {
- $this->minify($source);
- }
- }
- /**
- * Returns the minified Source.
- *
- * @return string
- */
- public function getMinified()
- {
- return $this->minified;
- }
- /**
- * Returns a plugin by class name.
- *
- * @param string $name Class name of the plugin
- * @return aCssMinifierPlugin
- */
- public function getPlugin($class)
- {
- static $index = null;
- if (is_null($index))
- {
- $index = array();
- for ($i = 0, $l = count($this->plugins); $i < $l; $i++)
- {
- $index[get_class($this->plugins[$i])] = $i;
- }
- }
- return isset($index[$class]) ? $this->plugins[$index[$class]] : false;
- }
- /**
- * Minifies the CSS source.
- *
- * @param string $source CSS source
- * @return string
- */
- public function minify($source)
- {
- // Variables
- $r = "";
- $parser = new CssParser($source);
- $tokens = $parser->getTokens();
- $filters = $this->filters;
- $filterCount = count($this->filters);
- $plugins = $this->plugins;
- $pluginCount = count($plugins);
- $pluginIndex = array();
- $pluginTriggerTokens = array();
- $globalTriggerTokens = array();
- for ($i = 0, $l = count($plugins); $i < $l; $i++)
- {
- $tPluginClassName = get_class($plugins[$i]);
- $pluginTriggerTokens[$i] = $plugins[$i]->getTriggerTokens();
- foreach ($pluginTriggerTokens[$i] as $v)
- {
- if (!in_array($v, $globalTriggerTokens))
- {
- $globalTriggerTokens[] = $v;
- }
- }
- $pluginTriggerTokens[$i] = "|" . implode("|", $pluginTriggerTokens[$i]) . "|";
- $pluginIndex[$tPluginClassName] = $i;
- }
- $globalTriggerTokens = "|" . implode("|", $globalTriggerTokens) . "|";
- /*
+ /**
+ * {@link aCssMinifierFilter Filters}.
+ *
+ * @var array
+ */
+ private $filters = array();
+ /**
+ * {@link aCssMinifierPlugin Plugins}.
+ *
+ * @var array
+ */
+ private $plugins = array();
+ /**
+ * Minified source.
+ *
+ * @var string
+ */
+ private $minified = "";
+
+ /**
+ * Constructer.
+ *
+ * Creates instances of {@link aCssMinifierFilter filters} and {@link aCssMinifierPlugin plugins}.
+ *
+ * @param string $source CSS source [optional]
+ * @param array $filters Filter configuration [optional]
+ * @param array $plugins Plugin configuration [optional]
+ * @return void
+ */
+ public function __construct($source = NULL, array $filters = NULL, array $plugins = NULL) {
+ $filters = array_merge(array
+ (
+ "ImportImports" => FALSE,
+ "RemoveComments" => TRUE,
+ "RemoveEmptyRulesets" => TRUE,
+ "RemoveEmptyAtBlocks" => TRUE,
+ "ConvertLevel3Properties" => FALSE,
+ "ConvertLevel3AtKeyframes" => FALSE,
+ "Variables" => TRUE,
+ "RemoveLastDelarationSemiColon" => TRUE
+ ), is_array($filters) ? $filters : array());
+ $plugins = array_merge(array
+ (
+ "Variables" => TRUE,
+ "ConvertFontWeight" => FALSE,
+ "ConvertHslColors" => FALSE,
+ "ConvertRgbColors" => FALSE,
+ "ConvertNamedColors" => FALSE,
+ "CompressColorValues" => FALSE,
+ "CompressUnitValues" => FALSE,
+ "CompressExpressionValues" => FALSE
+ ), is_array($plugins) ? $plugins : array());
+ // Filters
+ foreach ($filters as $name => $config) {
+ if ($config !== FALSE) {
+ $class = "Css" . $name . "MinifierFilter";
+ $config = is_array($config) ? $config : array();
+ if (class_exists($class)) {
+ $this->filters[] = new $class($this, $config);
+ } else {
+ CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The filter " . $name . " with the class name " . $class . " was not found"));
+ }
+ }
+ }
+ // Plugins
+ foreach ($plugins as $name => $config) {
+ if ($config !== FALSE) {
+ $class = "Css" . $name . "MinifierPlugin";
+ $config = is_array($config) ? $config : array();
+ if (class_exists($class)) {
+ $this->plugins[] = new $class($this, $config);
+ } else {
+ CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin " . $name . " with the class name " . $class . " was not found"));
+ }
+ }
+ }
+ // --
+ if (!is_null($source)) {
+ $this->minify($source);
+ }
+ }
+
+ /**
+ * Returns the minified Source.
+ *
+ * @return string
+ */
+ public function getMinified() {
+ return $this->minified;
+ }
+
+ /**
+ * Returns a plugin by class name.
+ *
+ * @param string $name Class name of the plugin
+ * @return aCssMinifierPlugin
+ */
+ public function getPlugin($class) {
+ static $index = NULL;
+ if (is_null($index)) {
+ $index = array();
+ for ($i = 0, $l = count($this->plugins); $i < $l; $i++) {
+ $index[get_class($this->plugins[$i])] = $i;
+ }
+ }
+ return isset($index[$class]) ? $this->plugins[$index[$class]] : FALSE;
+ }
+
+ /**
+ * Minifies the CSS source.
+ *
+ * @param string $source CSS source
+ * @return string
+ */
+ public function minify($source) {
+ // Variables
+ $r = "";
+ $parser = new CssParser($source);
+ $tokens = $parser->getTokens();
+ $filters = $this->filters;
+ $filterCount = count($this->filters);
+ $plugins = $this->plugins;
+ $pluginCount = count($plugins);
+ $pluginIndex = array();
+ $pluginTriggerTokens = array();
+ $globalTriggerTokens = array();
+ for ($i = 0, $l = count($plugins); $i < $l; $i++) {
+ $tPluginClassName = get_class($plugins[$i]);
+ $pluginTriggerTokens[$i] = $plugins[$i]->getTriggerTokens();
+ foreach ($pluginTriggerTokens[$i] as $v) {
+ if (!in_array($v, $globalTriggerTokens)) {
+ $globalTriggerTokens[] = $v;
+ }
+ }
+ $pluginTriggerTokens[$i] = "|" . implode("|", $pluginTriggerTokens[$i]) . "|";
+ $pluginIndex[$tPluginClassName] = $i;
+ }
+ $globalTriggerTokens = "|" . implode("|", $globalTriggerTokens) . "|";
+ /*
* Apply filters
*/
- for($i = 0; $i < $filterCount; $i++)
- {
- // Apply the filter; if the return value is larger than 0...
- if ($filters[$i]->apply($tokens) > 0)
- {
- // ...then filter null values and rebuild the token array
- $tokens = array_values(array_filter($tokens));
- }
- }
- $tokenCount = count($tokens);
- /*
+ for ($i = 0; $i < $filterCount; $i++) {
+ // Apply the filter; if the return value is larger than 0...
+ if ($filters[$i]->apply($tokens) > 0) {
+ // ...then filter null values and rebuild the token array
+ $tokens = array_values(array_filter($tokens));
+ }
+ }
+ $tokenCount = count($tokens);
+ /*
* Apply plugins
*/
- for($i = 0; $i < $tokenCount; $i++)
- {
- $triggerToken = "|" . get_class($tokens[$i]) . "|";
- if (strpos($globalTriggerTokens, $triggerToken) !== false)
- {
- for($ii = 0; $ii < $pluginCount; $ii++)
- {
- if (strpos($pluginTriggerTokens[$ii], $triggerToken) !== false || $pluginTriggerTokens[$ii] === false)
- {
- // Apply the plugin; if the return value is TRUE continue to the next token
- if ($plugins[$ii]->apply($tokens[$i]) === true)
- {
- continue 2;
- }
- }
- }
- }
- }
- // Stringify the tokens
- for($i = 0; $i < $tokenCount; $i++)
- {
- $r .= (string) $tokens[$i];
- }
- $this->minified = $r;
- return $r;
- }
+ for ($i = 0; $i < $tokenCount; $i++) {
+ $triggerToken = "|" . get_class($tokens[$i]) . "|";
+ if (strpos($globalTriggerTokens, $triggerToken) !== FALSE) {
+ for ($ii = 0; $ii < $pluginCount; $ii++) {
+ if (strpos($pluginTriggerTokens[$ii], $triggerToken) !== FALSE || $pluginTriggerTokens[$ii] === FALSE) {
+ // Apply the plugin; if the return value is TRUE continue to the next token
+ if ($plugins[$ii]->apply($tokens[$i]) === TRUE) {
+ continue 2;
+ }
+ }
+ }
+ }
+ }
+ // Stringify the tokens
+ for ($i = 0; $i < $tokenCount; $i++) {
+ $r .= (string)$tokens[$i];
+ }
+ $this->minified = $r;
+ return $r;
+ }
}
/**
@@ -2176,166 +2000,155 @@ class CssMinifier
* THE SOFTWARE.
* --
*
- * @package CssMin
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . ($this->configuration["BasePath"] ? $this->configuration["BasePath"] : "null"). " is not a directory"));
- return 0;
- }
- for ($i = 0, $l = count($tokens); $i < $l; $i++)
- {
- if (get_class($tokens[$i]) === "CssAtImportToken")
- {
- $import = $this->configuration["BasePath"] . "/" . $tokens[$i]->Import;
- // Import file was not found/is not a file
- if (!is_file($import))
- {
- CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file " . $import. " was not found.", (string) $tokens[$i]));
- }
- // Import file already imported; remove this @import at-rule to prevent recursions
- elseif (in_array($import, $this->imported))
- {
- CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file " . $import. " was already imported.", (string) $tokens[$i]));
- $tokens[$i] = null;
- }
- else
- {
- $this->imported[] = $import;
- $parser = new CssParser(file_get_contents($import));
- $import = $parser->getTokens();
- // The @import at-rule has media types defined requiring special handling
- if (count($tokens[$i]->MediaTypes) > 0 && !(count($tokens[$i]->MediaTypes) == 1 && $tokens[$i]->MediaTypes[0] == "all"))
- {
- $blocks = array();
- /*
+ /**
+ * Array with already imported external stylesheets.
+ *
+ * @var array
+ */
+ private $imported = array();
+
+ /**
+ * Implements {@link aCssMinifierFilter::filter()}.
+ *
+ * @param array $tokens Array of objects of type aCssToken
+ * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+ */
+ public function apply(array &$tokens) {
+ if (!isset($this->configuration["BasePath"]) || !is_dir($this->configuration["BasePath"])) {
+ CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Base path " . ($this->configuration["BasePath"] ? $this->configuration["BasePath"] : "null") . " is not a directory"));
+ return 0;
+ }
+ for ($i = 0, $l = count($tokens); $i < $l; $i++) {
+ if (get_class($tokens[$i]) === "CssAtImportToken") {
+ $import = $this->configuration["BasePath"] . "/" . $tokens[$i]->Import;
+ // Import file was not found/is not a file
+ if (!is_file($import)) {
+ CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file " . $import . " was not found.", (string)$tokens[$i]));
+ } // Import file already imported; remove this @import at-rule to prevent recursions
+ else if (in_array($import, $this->imported)) {
+ CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file " . $import . " was already imported.", (string)$tokens[$i]));
+ $tokens[$i] = NULL;
+ } else {
+ $this->imported[] = $import;
+ $parser = new CssParser(file_get_contents($import));
+ $import = $parser->getTokens();
+ // The @import at-rule has media types defined requiring special handling
+ if (count($tokens[$i]->MediaTypes) > 0 && !(count($tokens[$i]->MediaTypes) == 1 && $tokens[$i]->MediaTypes[0] == "all")) {
+ $blocks = array();
+ /*
* Filter or set media types of @import at-rule or remove the @import at-rule if no media type is matching the parent @import at-rule
*/
- for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
- {
- if (get_class($import[$ii]) === "CssAtImportToken")
- {
- // @import at-rule defines no media type or only the "all" media type; set the media types to the one defined in the parent @import at-rule
- if (count($import[$ii]->MediaTypes) == 0 || (count($import[$ii]->MediaTypes) == 1 && $import[$ii]->MediaTypes[0] == "all"))
- {
- $import[$ii]->MediaTypes = $tokens[$i]->MediaTypes;
- }
- // @import at-rule defineds one or more media types; filter out media types not matching with the parent @import at-rule
- elseif (count($import[$ii]->MediaTypes) > 0)
- {
- foreach ($import[$ii]->MediaTypes as $index => $mediaType)
- {
- if (!in_array($mediaType, $tokens[$i]->MediaTypes))
- {
- unset($import[$ii]->MediaTypes[$index]);
- }
- }
- $import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
- // If there are no media types left in the @import at-rule remove the @import at-rule
- if (count($import[$ii]->MediaTypes) == 0)
- {
- $import[$ii] = null;
- }
- }
- }
- }
- /*
+ for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
+ if (get_class($import[$ii]) === "CssAtImportToken") {
+ // @import at-rule defines no media type or only the "all" media type; set the media types to the one defined in the parent @import at-rule
+ if (count($import[$ii]->MediaTypes) == 0 || (count($import[$ii]->MediaTypes) == 1 && $import[$ii]->MediaTypes[0] == "all")) {
+ $import[$ii]->MediaTypes = $tokens[$i]->MediaTypes;
+ } // @import at-rule defineds one or more media types; filter out media types not matching with the parent @import at-rule
+ else if (count($import[$ii]->MediaTypes) > 0) {
+ foreach ($import[$ii]->MediaTypes as $index => $mediaType) {
+ if (!in_array($mediaType, $tokens[$i]->MediaTypes)) {
+ unset($import[$ii]->MediaTypes[$index]);
+ }
+ }
+ $import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
+ // If there are no media types left in the @import at-rule remove the @import at-rule
+ if (count($import[$ii]->MediaTypes) == 0) {
+ $import[$ii] = NULL;
+ }
+ }
+ }
+ }
+ /*
* Remove media types of @media at-rule block not defined in the @import at-rule
*/
- for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
- {
- if (get_class($import[$ii]) === "CssAtMediaStartToken")
- {
- foreach ($import[$ii]->MediaTypes as $index => $mediaType)
- {
- if (!in_array($mediaType, $tokens[$i]->MediaTypes))
- {
- unset($import[$ii]->MediaTypes[$index]);
- }
- $import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
- }
- }
- }
- /*
+ for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
+ if (get_class($import[$ii]) === "CssAtMediaStartToken") {
+ foreach ($import[$ii]->MediaTypes as $index => $mediaType) {
+ if (!in_array($mediaType, $tokens[$i]->MediaTypes)) {
+ unset($import[$ii]->MediaTypes[$index]);
+ }
+ $import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
+ }
+ }
+ }
+ /*
* If no media types left of the @media at-rule block remove the complete block
*/
- for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
- {
- if (get_class($import[$ii]) === "CssAtMediaStartToken")
- {
- if (count($import[$ii]->MediaTypes) === 0)
- {
- for ($iii = $ii; $iii < $ll; $iii++)
- {
- if (get_class($import[$iii]) === "CssAtMediaEndToken")
- {
- break;
- }
- }
- if (get_class($import[$iii]) === "CssAtMediaEndToken")
- {
- array_splice($import, $ii, $iii - $ii + 1, array());
- $ll = count($import);
- }
- }
- }
- }
- /*
+ for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
+ if (get_class($import[$ii]) === "CssAtMediaStartToken") {
+ if (count($import[$ii]->MediaTypes) === 0) {
+ for ($iii = $ii; $iii < $ll; $iii++) {
+ if (get_class($import[$iii]) === "CssAtMediaEndToken") {
+ break;
+ }
+ }
+ if (get_class($import[$iii]) === "CssAtMediaEndToken") {
+ array_splice($import, $ii, $iii - $ii + 1, array());
+ $ll = count($import);
+ }
+ }
+ }
+ }
+ /*
* If the media types of the @media at-rule equals the media types defined in the @import
* at-rule remove the CssAtMediaStartToken and CssAtMediaEndToken token
*/
- for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
- {
- if (get_class($import[$ii]) === "CssAtMediaStartToken" && count(array_diff($tokens[$i]->MediaTypes, $import[$ii]->MediaTypes)) === 0)
- {
- for ($iii = $ii; $iii < $ll; $iii++)
- {
- if (get_class($import[$iii]) == "CssAtMediaEndToken")
- {
- break;
- }
- }
- if (get_class($import[$iii]) == "CssAtMediaEndToken")
- {
- unset($import[$ii]);
- unset($import[$iii]);
- $import = array_values($import);
- $ll = count($import);
- }
- }
- }
- /**
- * Extract CssAtImportToken and CssAtCharsetToken tokens
- */
- for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
- {
- $class = get_class($import[$ii]);
- if ($class === "CssAtImportToken" || $class === "CssAtCharsetToken")
- {
- $blocks = array_merge($blocks, array_splice($import, $ii, 1, array()));
- $ll = count($import);
- }
- }
- /*
+ for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
+ if (get_class($import[$ii]) === "CssAtMediaStartToken" && count(array_diff($tokens[$i]->MediaTypes, $import[$ii]->MediaTypes)) === 0) {
+ for ($iii = $ii; $iii < $ll; $iii++) {
+ if (get_class($import[$iii]) == "CssAtMediaEndToken") {
+ break;
+ }
+ }
+ if (get_class($import[$iii]) == "CssAtMediaEndToken") {
+ unset($import[$ii]);
+ unset($import[$iii]);
+ $import = array_values($import);
+ $ll = count($import);
+ }
+ }
+ }
+ /**
+ * Extract CssAtImportToken and CssAtCharsetToken tokens
+ */
+ for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
+ $class = get_class($import[$ii]);
+ if ($class === "CssAtImportToken" || $class === "CssAtCharsetToken") {
+ $blocks = array_merge($blocks, array_splice($import, $ii, 1, array()));
+ $ll = count($import);
+ }
+ }
+ /*
* Extract the @font-face, @media and @page at-rule block
*/
- for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
- {
- $class = get_class($import[$ii]);
- if ($class === "CssAtFontFaceStartToken" || $class === "CssAtMediaStartToken" || $class === "CssAtPageStartToken" || $class === "CssAtVariablesStartToken")
- {
- for ($iii = $ii; $iii < $ll; $iii++)
- {
- $class = get_class($import[$iii]);
- if ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken")
- {
- break;
- }
- }
- $class = get_class($import[$iii]);
- if (isset($import[$iii]) && ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken"))
- {
- $blocks = array_merge($blocks, array_splice($import, $ii, $iii - $ii + 1, array()));
- $ll = count($import);
- }
- }
- }
- // Create the import array with extracted tokens and the rulesets wrapped into a @media at-rule block
- $import = array_merge($blocks, array(new CssAtMediaStartToken($tokens[$i]->MediaTypes)), $import, array(new CssAtMediaEndToken()));
- }
- // Insert the imported tokens
- array_splice($tokens, $i, 1, $import);
- // Modify parameters of the for-loop
- $i--;
- $l = count($tokens);
- }
- }
- }
- }
+ for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
+ $class = get_class($import[$ii]);
+ if ($class === "CssAtFontFaceStartToken" || $class === "CssAtMediaStartToken" || $class === "CssAtPageStartToken" || $class === "CssAtVariablesStartToken") {
+ for ($iii = $ii; $iii < $ll; $iii++) {
+ $class = get_class($import[$iii]);
+ if ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken") {
+ break;
+ }
+ }
+ $class = get_class($import[$iii]);
+ if (isset($import[$iii]) && ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken")) {
+ $blocks = array_merge($blocks, array_splice($import, $ii, $iii - $ii + 1, array()));
+ $ll = count($import);
+ }
+ }
+ }
+ // Create the import array with extracted tokens and the rulesets wrapped into a @media at-rule block
+ $import = array_merge($blocks, array(new CssAtMediaStartToken($tokens[$i]->MediaTypes)), $import, array(new CssAtMediaEndToken()));
+ }
+ // Insert the imported tokens
+ array_splice($tokens, $i, 1, $import);
+ // Modify parameters of the for-loop
+ $i--;
+ $l = count($tokens);
+ }
+ }
+ }
+ }
}
/**
@@ -2548,145 +2322,136 @@ class CssImportImportsMinifierFilter extends aCssMinifierFilter
* This plugin return no {@link aCssToken CssToken} but ensures that expression() declaration values will get parsed
* properly.
*
- * @package CssMin/Parser/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . $this->Source . "": "") . "" . $this->Source . "" : "") . "