From c017ab89cdd0c039748898a8179b2411b1f885a3 Mon Sep 17 00:00:00 2001 From: Justin Proffitt Date: Thu, 1 Oct 2015 11:09:38 -0600 Subject: [PATCH] Removed $cssRules as property, converted to references to a local variable returned by processCSS. --- src/CssToInlineStyles.php | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/CssToInlineStyles.php b/src/CssToInlineStyles.php index 610ea04..8d3773d 100644 --- a/src/CssToInlineStyles.php +++ b/src/CssToInlineStyles.php @@ -21,13 +21,6 @@ class CssToInlineStyles */ private $css; - /** - * The processed CSS rules - * - * @var array - */ - private $cssRules; - /** * Should the generated HTML be cleaned * @@ -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()); @@ -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) { @@ -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); @@ -496,7 +490,7 @@ private function processCSS() $ruleSet['order'] = $i; // add into global rules - $this->cssRules[] = $ruleSet; + $cssRules[] = $ruleSet; } // increment @@ -504,9 +498,11 @@ private function processCSS() } // sort based on specificity - if (!empty($this->cssRules)) { - usort($this->cssRules, array(__CLASS__, 'sortOnSpecificity')); + if (!empty($cssRules)) { + usort($cssRules, array(__CLASS__, 'sortOnSpecificity')); } + + return $cssRules; } /**