Skip to content

Converted $cssRules to a local variable returned by processCSS #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tijsverkoyen merged 1 commit into from
Nov 20, 2015
Merged

Converted $cssRules to a local variable returned by processCSS #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions src/CssToInlineStyles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ class CssToInlineStyles
*/
private $css;

/**
* The processed CSS rules
*
* @var array
*/
private $cssRules;

/**
* Should the generated HTML be cleaned
*
Expand Down Expand Up @@ -137,7 +130,7 @@ public function convert($outputXHTML = false)
}

// process css
$this->processCSS();
$cssRules = $this->processCSS();

// create new DOMDocument
$document = new \DOMDocument('1.0', $this->getEncoding());
Expand All @@ -155,9 +148,9 @@ public function convert($outputXHTML = false)
$xPath = new \DOMXPath($document);

// any rules?
if (!empty($this->cssRules)) {
if (!empty($cssRules)) {
// loop rules
foreach ($this->cssRules as $rule) {
foreach ($cssRules as $rule) {
try {
$query = CssSelector::toXPath($rule['selector']);
} catch (ExceptionInterface $e) {
Expand Down Expand Up @@ -425,12 +418,13 @@ private function getEncoding()
/**
* Process the loaded CSS
*
* @return void
* @return array
*/
private function processCSS()
{
// init vars
$css = (string) $this->css;
$cssRules = array();

// remove newlines
$css = str_replace(array("\r", "\n"), '', $css);
Expand Down Expand Up @@ -496,17 +490,19 @@ private function processCSS()
$ruleSet['order'] = $i;

// add into global rules
$this->cssRules[] = $ruleSet;
$cssRules[] = $ruleSet;
}

// increment
$i++;
}

// sort based on specificity
if (!empty($this->cssRules)) {
usort($this->cssRules, array(__CLASS__, 'sortOnSpecificity'));
if (!empty($cssRules)) {
usort($cssRules, array(__CLASS__, 'sortOnSpecificity'));
}

return $cssRules;
}

/**
Expand Down