Level-2 / Transphporm

src/Property/Content.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 	private function pseudoBefore($value, $element, $rule) {
 		if (in_array('before', $rule->getPseudoMatcher()->getPseudo())) {
-			$element->firstChild->nodeValue = implode('', $value) . $element->firstChild->nodeValue;
+			$element->firstChild->nodeValue = implode('', $value).$element->firstChild->nodeValue;
 			return true;
 		}
 	}

Braces +11 added lines, -4 removed lines

@@ -18,15 +18,20 @@ 
 	}
 
 	public function run($value, \DomElement $element, \Transphporm\Hook\PropertyHook $rule) {
-		if ($element->getAttribute('transphporm') === 'remove') return;
+		if ($element->getAttribute('transphporm') === 'remove') {
+			return;
+		}
 				
 		$value = $this->formatter->format($value, $rule->getRules());
 		if (!$this->processPseudo($value, $element, $rule)) {
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rule->getRules()) === 'replace') $this->replaceContent($element, $value);
-			else $this->appendContent($element, $value);
+			if ($this->getContentMode($rule->getRules()) === 'replace') {
+				$this->replaceContent($element, $value);
+			} else {
+				$this->appendContent($element, $value);
+			}
 		}
 	}
 
@@ -92,6 +97,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }
\ No newline at end of file

src/Property/Repeat.php

Braces +6 added lines, -2 removed lines

@@ -13,7 +13,9 @@ 
 	}
 
 	public function run($value, \DomElement $element, \Transphporm\Hook\Rule $rule)  {
-		if ($element->getAttribute('transphporm') === 'added') return $element->parentNode->removeChild($element);
+		if ($element->getAttribute('transphporm') === 'added') {
+			return $element->parentNode->removeChild($element);
+		}
 
 		foreach ($value as $key => $iteration) {
 			$clone = $element->cloneNode(true);
@@ -37,7 +39,9 @@ 
 
 	private function createHook($newRules, $rule) {
 		$hook = new \Transphporm\Hook\Rule($newRules, $rule->getPseudoMatcher(), $this->data);
-		foreach ($rule->getProperties() as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($rule->getProperties() as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }
\ No newline at end of file

Doc Comments +3 added lines

@@ -35,6 +35,9 @@
 		return false;
 	}
 
+	/**
+	 * @param \Transphporm\Hook\PropertyHook $rule
+	 */
 	private function createHook($newRules, $rule) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $rule->getPseudoMatcher(), new \Transphporm\Parser\Value($this->data));
 		foreach ($rule->getProperties() as $name => $property) $hook->registerProperty($name, $property);

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 		$this->data = $data;
 	}
 
-	public function run($value, \DomElement $element, \Transphporm\Hook\PropertyHook $rule)  {
+	public function run($value, \DomElement $element, \Transphporm\Hook\PropertyHook $rule) {
 		if ($element->getAttribute('transphporm') === 'added') return $element->parentNode->removeChild($element);
 
 		foreach ($value as $key => $iteration) {

src/Builder.php

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
 
 		$cachedOutput = $this->loadTemplate();
 		//To be a valid XML document it must have a root element, automatically wrap it in <template> to ensure it does
-		$template = new Template($this->isValidDoc($cachedOutput['body']) ? str_ireplace('<!doctype', '<!DOCTYPE', $cachedOutput['body']) : '<template>' . $cachedOutput['body'] . '</template>' );
+		$template = new Template($this->isValidDoc($cachedOutput['body']) ? str_ireplace('<!doctype', '<!DOCTYPE', $cachedOutput['body']) : '<template>'.$cachedOutput['body'].'</template>');
 
 		//Allow $time to be set via arguments to spoof time passage during tests
 		foreach ($this->getRules($template) as $rule) {
@@ -92,11 +92,11 @@ 
 	//N.b. only files can be cached
 	private function getRules($template) {		
 		if (is_file($this->tss)) {
-			$this->baseDir = dirname(realpath($this->tss)) . DIRECTORY_SEPARATOR;
+			$this->baseDir = dirname(realpath($this->tss)).DIRECTORY_SEPARATOR;
 			//The cache for the key: the filename and template prefix
 			//Each template may have a different prefix which changes the parsed TSS,
 			//Because of this the cache needs to be generated for each template prefix.
-			$key = $this->tss . $template->getPrefix() . $this->baseDir;
+			$key = $this->tss.$template->getPrefix().$this->baseDir;
 			//Try to load the cached rules, if not set in the cache (or expired) parse the supplied sheet
 			$rules = $this->cache->load($key, filemtime($this->tss));
 			if (!$rules) return $this->cache->write($key, (new Sheet(file_get_contents($this->tss), $this->baseDir, $template->getPrefix()))->parse());
@@ -111,8 +111,8 @@ 
 
 	private function getLocale() {
 		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.$this->locale.'.json'), true);
+		else return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.'enGB.json'), true);
 	}
 
 	public function registerProperty($name, Property $property) {

Braces +22 added lines, -9 removed lines

@@ -52,7 +52,9 @@ 
 	private function processRules($template, $data) {
 		$valueParser = new Parser\Value($data);
 		foreach ($this->getRules($template, $valueParser) as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $data, $valueParser);			
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $data, $valueParser);
+			}
 		}
 	}
 
@@ -66,7 +68,9 @@ 
 	private function executeTssRule($rule, $template, $data, $valueParser) {
 		$rule->touch();
 		$hook = new Hook\PropertyHook($rule->properties, new Hook\PseudoMatcher($rule->pseudo, $data), $valueParser);
-		foreach ($this->registeredProperties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($this->registeredProperties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		$template->addHook($rule->query, $hook);
 	}
 
@@ -75,8 +79,9 @@ 
 		if (trim($this->template)[0] !== '<') {			
 			$xml = $this->cache->load($this->template, filemtime($this->template));
 			return $xml ? $xml : ['body' => file_get_contents($this->template), 'headers' => []];
+		} else {
+			return ['body' => $this->template, 'headers' => []];
 		}
-		else return ['body' => $this->template, 'headers' => []];	
 	}
 
 	//Load the TSS rules either from a file or as a string
@@ -90,10 +95,14 @@ 
 			$key = $this->tss . $template->getPrefix() . $this->baseDir;
 			//Try to load the cached rules, if not set in the cache (or expired) parse the supplied sheet
 			$rules = $this->cache->load($key, filemtime($this->tss));
-			if (!$rules) return $this->cache->write($key, (new Parser\Sheet(file_get_contents($this->tss), $this->baseDir, $valueParser, $template->getPrefix()))->parse());
-			else return $rules;
+			if (!$rules) {
+				return $this->cache->write($key, (new Parser\Sheet(file_get_contents($this->tss), $this->baseDir, $valueParser, $template->getPrefix()))->parse());
+			} else {
+				return $rules;
+			}
+		} else {
+			return (new Parser\Sheet($this->tss, $this->baseDir, $valueParser, $template->getPrefix()))->parse();
 		}
-		else return (new Parser\Sheet($this->tss, $this->baseDir, $valueParser, $template->getPrefix()))->parse();
 	}
 
 	public function setCache(\ArrayAccess $cache) {
@@ -101,9 +110,13 @@ 
 	}
 
 	private function getLocale() {
-		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		if (is_array($this->locale)) {
+			return $this->locale;
+		} else if (strlen($this->locale) > 0) {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
+		} else {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		}
 	}
 
 	public function registerProperty($name, Property $property) {

src/Parser/Sheet.php

Doc Comments +18 added lines

@@ -12,6 +12,9 @@ 
 	private $prefix;
 	private $valueParser;
 
+	/**
+	 * @param string $tss
+	 */
 	public function __construct($tss, $baseDir, Value $valueParser, $prefix = '') {
 		$this->tss = $this->stripComments($tss);
 		$this->baseDir = $baseDir;
@@ -38,12 +41,20 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param string $selector
+	 * @param integer $index
+	 */
 	private function CssToRule($selector, $index) {
 		$xPath = new CssToXpath($selector, $this->valueParser, $this->prefix);
 		$rule = new \Transphporm\Rule($xPath->getXpath(), $xPath->getPseudo(), $xPath->getDepth(), $index++);
 		return $rule;
 	}
 
+	/**
+	 * @param string $selector
+	 * @param \Transphporm\Rule $newRule
+	 */
 	private function writeRule($rules, $selector, $newRule) {
 		if (isset($rules[$selector])) {
 			$newRule->properties = array_merge($rules[$selector]->properties, $newRule->properties);
@@ -54,6 +65,10 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $pos
+	 * @param integer $next
+	 */
 	private function processingInstructions($tss, $pos, $next) {
 		$rules = [];
 		while (($atPos = strpos($tss, '@', $pos)) !== false) {
@@ -94,6 +109,9 @@ 
 		return $str;
 	}
 
+	/**
+	 * @param string $str
+	 */
 	private function getProperties($str) {
 		$stringExtractor = new StringExtractor($str);
 		$rules = explode(';', $stringExtractor);

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 
 			$selector = trim(substr($this->tss, $pos, $next-$pos));
 			$rule = $this->cssToRule($selector, count($rules));	
-			$pos =  strpos($this->tss, '}', $next)+1;
+			$pos = strpos($this->tss, '}', $next)+1;
 			$rule->properties = $this->getProperties(trim(substr($this->tss, $next+1, $pos-2-$next)));	
 			$rules = $this->writeRule($rules, $selector, $rule);
 		}
@@ -54,7 +54,7 @@ 
 	private function processingInstructions($tss, $pos, $next) {
 		$rules = [];
 		while (($atPos = strpos($tss, '@', $pos)) !== false) {
-			if ($atPos  <= (int) $next) {
+			if ($atPos <= (int) $next) {
 				$spacePos = strpos($tss, ' ', $atPos);
 				$funcName = substr($tss, $atPos+1, $spacePos-$atPos-1);
 				$pos = strpos($tss, ';', $spacePos);
@@ -70,7 +70,7 @@ 
 	}
 
 	private function import($args) {
-		$sheet = new Sheet(file_get_contents($this->baseDir . trim($args, '\'" ')), $this->baseDir, $this->valueParser, $this->prefix);
+		$sheet = new Sheet(file_get_contents($this->baseDir.trim($args, '\'" ')), $this->baseDir, $this->valueParser, $this->prefix);
 		return $sheet->parse();
 	}
 

Braces +10 added lines, -5 removed lines

@@ -33,7 +33,9 @@ 
 			$rules = $this->writeRule($rules, $selector, $rule);
 		}
 		//there may be processing instructions at the end
-		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss))) $rules = array_merge($processing['rules'], $rules);
+		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss))) {
+			$rules = array_merge($processing['rules'], $rules);
+		}
 		usort($rules, [$this, 'sortRules']);
 		return $rules;
 	}
@@ -63,8 +65,7 @@ 
 				$pos = strpos($tss, ';', $spacePos);
 				$args = substr($tss, $spacePos+1, $pos-$spacePos-1);
 				$rules = array_merge($rules, $this->$funcName($args));
-			}
-			else {
+			} else {
 				break;	
 			} 
 		}
@@ -79,7 +80,9 @@ 
 
 	private function sortRules($a, $b) {
 		//If they have the same depth, compare on index
-		if ($a->depth === $b->depth) return $a->index < $b->index ? -1 : 1;
+		if ($a->depth === $b->depth) {
+			return $a->index < $b->index ? -1 : 1;
+		}
 
 		return ($a->depth < $b->depth) ? -1 : 1;
 	}
@@ -100,7 +103,9 @@ 
 		$return = [];
 
 		foreach ($rules as $rule) {
-			if (trim($rule) === '') continue;
+			if (trim($rule) === '') {
+				continue;
+			}
 			$parts = explode(':', $rule, 2);
 
 			$parts[1] = $stringExtractor->rebuild($parts[1]);

src/Parser/Value.php

Doc Comments +7 added lines

@@ -63,6 +63,9 @@ 
 		return $array;
 	}
 
+	/**
+	 * @param null|\DOMElement $element
+	 */
 	private function callFunc($name, $params, $element) {
 		if ($name && is_callable([$this->dataFunction, $name])) {
 			return $this->dataFunction->$name($this->parse($params, $element), $element);	
@@ -70,6 +73,10 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $remaining
+	 * @param null|\DOMElement $element
+	 */
 	private function parseNextValue($remaining, $result, $element) {
 		if (strlen($remaining) > 0 && $remaining[0] == ',') $result = array_merge($result, $this->parse(trim(substr($remaining, 1)), $element));
 		return $result;

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 		$finalPos = $this->findMatchingPos($str, $marker);
 		$string = substr($str, 1, $finalPos-1);
 		//Now remove escape characters
-		return str_replace('\\' . $marker, $marker, $string);
+		return str_replace('\\'.$marker, $marker, $string);
 	}
 
 	private function parseFunction($function) {

Braces +20 added lines, -11 removed lines

@@ -27,14 +27,17 @@ 
 
 			//Count the number of fresh opening ( before $close
 			$cPos = $open+1;
-			while (($cPos = strpos($function, '(', $cPos+1)) !== false && $cPos < $close) $close = strpos($function, ')', $close+1);
+			while (($cPos = strpos($function, '(', $cPos+1)) !== false && $cPos < $close) {
+				$close = strpos($function, ')', $close+1);
+			}
 
 			$name = substr($function, 0, $open);
 
 			$params = substr($function, $open+1, $close-$open-1);
 			return ['name' => $name, 'params' => $params, 'endPoint' => $close];
+		} else {
+			return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 		}
-		else return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 		
 	}
 
@@ -43,23 +46,26 @@ 
 		if ($function && in_array($function[0], ['\'', '"'])) {
 			$finalPos = $this->findMatchingPos($function, $function[0]);
 			$result[] = $this->extractQuotedString($function[0], $function);
-		}
-		else {
+		} else {
 			$func = $this->parseFunction($function);
 			$finalPos = $func['endPoint'];			
 
 			if (($data = $this->callFunc($func['name'], $func['params'], $element)) !== false) {
 				$result = $this->appendToArray($result, $data);
-			} 
-			else $result[] = trim($function);
+			} else {
+				$result[] = trim($function);
+			}
 		}
 		$remaining = trim(substr($function, $finalPos+1));
 		return $this->parseNextValue($remaining, $result, $element);
 	}
 
 	private function appendToArray($array, $value) {
-		if (is_array($value)) $array += $value;
-		else $array[] = $value;
+		if (is_array($value)) {
+			$array += $value;
+		} else {
+			$array[] = $value;
+		}
 		return $array;
 	}
 
@@ -71,7 +77,9 @@ 
 	}
 
 	private function parseNextValue($remaining, $result, $element) {
-		if (strlen($remaining) > 0 && $remaining[0] == ',') $result = array_merge($result, $this->parse(trim(substr($remaining, 1)), $element));
+		if (strlen($remaining) > 0 && $remaining[0] == ',') {
+			$result = array_merge($result, $this->parse(trim(substr($remaining, 1)), $element));
+		}
 		return $result;
 	}
 	
@@ -79,8 +87,9 @@ 
 		$pos = $start+1;
 		$end = 0;
 		while ($end = strpos($string, $char, $pos)) {
-			if ($string[$end-1] === $escape) $pos = $end+1;
-			else {
+			if ($string[$end-1] === $escape) {
+				$pos = $end+1;
+			} else {
 				break;
 			}
 		}

src/PropertyBuilder.php

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 		$formatter->register(new Formatter\Date($locale));
 		$formatter->register(new Formatter\StringFormatter());
 		
-		foreach ($formatters as $format) $formatter->register($format);
+		foreach ($formatters as $format) {
+			$formatter->register($format);
+		}
 
 		$this->builder->registerProperty('content', new Property\Content($data, $headers, $formatter));
 		$this->builder->registerProperty('repeat', new Property\Repeat($data));

src/Hook/PropertyHook.php

Braces +9 added lines, -3 removed lines

@@ -20,11 +20,15 @@ 
 
 	public function run(\DomElement $element) {	
 		//Don't run if there's a pseudo element like nth-child() and this element doesn't match it
-		if (!$this->pseudoMatcher->matches($element)) return;
+		if (!$this->pseudoMatcher->matches($element)) {
+			return;
+		}
 
 		foreach ($this->rules as $name => $value) {
 			$result = $this->callProperty($name, $element, $this->valueParser->parse(trim($value), $element));
-			if ($result === false) break;
+			if ($result === false) {
+				break;
+			}
 		}
 	}
 
@@ -45,7 +49,9 @@ 
 	}
 
 	private function callProperty($name, $element, $value) {
-		if (isset($this->properties[$name])) return $this->properties[$name]->run($value, $element, $this);
+		if (isset($this->properties[$name])) {
+			return $this->properties[$name]->run($value, $element, $this);
+		}
 		return false;
 	}
 

src/Parser/CssToXpath.php

Spacing +8 added lines, -8 removed lines

@@ -13,15 +13,15 @@ 
 	private $valueParser;
 
 	public function __construct($css, ValueParser $valueParser, $prefix = '') {
-		$this->css = str_replace([' >', '> '],['>', '>'], trim($css));
+		$this->css = str_replace([' >', '> '], ['>', '>'], trim($css));
 		$this->valueParser = $valueParser;
 		$this->translators = [
-			' ' => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-			'' => function($string) use ($prefix) { return '/' . $prefix . $string;	},
-			'>' => function($string) use ($prefix) { return '/' . $prefix  . $string; },
-			'#' => function($string) { return '[@id=\'' . $string . '\']'; },
-			'.' => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' ' . $string . ' \')]'; }, 
-			'[' => function($string) { return '[@' . $this->parseAttr($string) . ']';	},
+			' ' => function($string) use ($prefix) { return '//'.$prefix.$string; },
+			'' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			'>' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			'#' => function($string) { return '[@id=\''.$string.'\']'; },
+			'.' => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' '.$string.' \')]'; }, 
+			'[' => function($string) { return '[@'.$this->parseAttr($string).']'; },
 			']' => function() {	return ''; }
 		];
 	}
@@ -40,7 +40,7 @@ 
 				$parts = explode($comparator, $attr);
 
 				foreach ($parts as &$part) $part = implode('', $this->valueParser->parse($part));
-				if (isset($parts[1])) $parts[1] = '"' . $parts[1] . '"';
+				if (isset($parts[1])) $parts[1] = '"'.$parts[1].'"';
 				return implode($comparator, $parts);
 			}
 		}

Braces +8 added lines, -3 removed lines

@@ -41,7 +41,9 @@ 
 				$parts = array_map(function($val) {
 					return implode($this->valueParser->parse($val));
 				}, $parts);
-				if (isset($parts[1])) $parts[1] = '"' . $parts[1] . '"';
+				if (isset($parts[1])) {
+					$parts[1] = '"' . $parts[1] . '"';
+				}
 				return implode($comparator, $parts);
 			}
 		}
@@ -60,8 +62,9 @@ 
 				$selector = $this->createSelector();
 				$selector->type = $css[$i];
 				$selectors[] = $selector;
+			} else {
+				$selector->string .= $css[$i];
 			}
-			else $selector->string .= $css[$i];			
 		}
 		return $selectors;
 	}
@@ -72,7 +75,9 @@ 
 		$this->depth = count($selectors);
 		$xpath = '/';
 		foreach ($selectors as $selector) {
-			if (isset($this->translators[$selector->type])) $xpath .= $this->translators[$selector->type]($selector->string);
+			if (isset($this->translators[$selector->type])) {
+				$xpath .= $this->translators[$selector->type]($selector->string);
+			}
 		}
 
 		$xpath = str_replace('/[', '/*[', $xpath);

src/Parser/StringExtractor.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
 		while (($pos = strpos($str, '"', $pos+1)) !== false) {
 			$end = strpos($str, '"', $pos+1);
 			while ($str[$end-1] == '\\') $end = strpos($str, '"', $end+1);
-			$strings['$+STR' . ++$num] = substr($str, $pos, $end-$pos+1);
-			$str = substr_replace($str, '$+STR' . $num, $pos, $end-$pos+1);
+			$strings['$+STR'.++$num] = substr($str, $pos, $end-$pos+1);
+			$str = substr_replace($str, '$+STR'.$num, $pos, $end-$pos+1);
 		}
 
 		return [$str, $strings];

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 		$strings = [];
 		while (($pos = strpos($str, '"', $pos+1)) !== false) {
 			$end = strpos($str, '"', $pos+1);
-			while ($str[$end-1] == '\\') $end = strpos($str, '"', $end+1);
+			while ($str[$end-1] == '\\') {
+				$end = strpos($str, '"', $end+1);
+			}
 			$strings['$+STR' . ++$num] = substr($str, $pos, $end-$pos+1);
 			$str = substr_replace($str, '$+STR' . $num, $pos, $end-$pos+1);
 		}