XPathHelper: ignore malformed expression in minify()

s9e · Jan 22, 2020 · ec72f4f · ec72f4f
1 parent aec2d9f
commit ec72f4f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 39 deletions.
diff --git a/docs/testdox.txt b/docs/testdox.txt
@@ -1062,8 +1062,6 @@ XPath Helper (s9e\TextFormatter\Tests\Configurator\Helpers\XPathHelper)
  [x] minify() tests with data set #25
  [x] minify() tests with data set #26
  [x] minify() tests with data set #27
- [x] minify() tests with data set #28
- [x] minify() tests with data set #29
  [x] Parse equality expr with data set #0
  [x] Parse equality expr with data set #1
  [x] Parse equality expr with data set #2
@@ -1900,7 +1898,6 @@ Minify Inline CSS (s9e\TextFormatter\Tests\Configurator\TemplateNormalizations\M
  [x] Works with data set #8
 
 Minify XPath Expressions (s9e\TextFormatter\Tests\Configurator\TemplateNormalizations\MinifyXPathExpressions)
- [x] Throws an exception if a string isn't properly closed
  [x] Works with data set #0
  [x] Works with data set #1
  [x] Works with data set #2

diff --git a/src/Configurator/Helpers/XPathHelper.php b/src/Configurator/Helpers/XPathHelper.php
@@ -119,12 +119,6 @@ public static function minify($expr)
 			return $expr;
 		}
 
-		preg_match_all('("[^"]*+"|\'[^\']*+\'|[\'"](*:X))', $expr, $m);
-		if (!empty($m['MARK']))
-		{
-			throw new RuntimeException("Cannot parse XPath expression '" . $expr . "'");
-		}
-
 		// Temporarily encode the content of literal strings
 		$expr = self::encodeStrings(trim($expr));
 
@@ -174,19 +168,11 @@ protected static function removeRedundantParentheses(string $expr): string
 		{
 			if ($token === '(')
 			{
-				$left[$depth] = $k;
-				++$depth;
+				$left[$depth++] = $k;
 			}
-			elseif ($token === ')')
+			elseif ($token === ')' && --$depth >= 0 && $tokens[$k + 1] === ')' && $left[$depth - 1] === $left[$depth] - 1)
 			{
-				if (--$depth < 0)
-				{
-					throw new RuntimeException("Cannot parse XPath expression '" . self::decodeStrings($expr) . "'");
-				}
-				if ($tokens[$k + 1] === ')' && $left[$depth - 1] === $left[$depth] - 1)
-				{
-					unset($tokens[$k], $tokens[$left[$depth]]);
-				}
+				unset($tokens[$k], $tokens[$left[$depth]]);
 			}
 		}
 

diff --git a/tests/Configurator/Helpers/XPathHelperTest.php b/tests/Configurator/Helpers/XPathHelperTest.php
@@ -158,10 +158,6 @@ public function getMinifyTests()
 				' foo or _bar ',
 				'foo or_bar'
 			],
-			[
-				'foo = "bar',
-				new RuntimeException("Cannot parse XPath expression 'foo = \"bar'")
-			],
 			[
 				'100 * (315 + 30) div 560',
 				'100*(315+30)div560'
@@ -226,10 +222,6 @@ public function getMinifyTests()
 				'true() and true()',
 				'true()andtrue()'
 			],
-			[
-				'"1")',
-				new RuntimeException('Cannot parse XPath expression \'"1")\'')
-			],
 			[
 				'(1+(1+1))',
 				'1+(1+1)'

diff --git a/tests/Configurator/TemplateNormalizations/MinifyXPathExpressionsTest.php b/tests/Configurator/TemplateNormalizations/MinifyXPathExpressionsTest.php
@@ -7,17 +7,6 @@
 */
 class MinifyXPathExpressionsTest extends AbstractTest
 {
-	/**
-	* @testdox Throws an exception if a string isn't properly closed
-	*/
-	public function testInvalidXPath()
-	{
-		$this->expectException('RuntimeException');
-		$this->expectExceptionMessage("Cannot parse XPath expression 'foo = \"bar'");
-
-		$this->test('<xsl:if test="foo = &quot;bar">!</xsl:if>', null);
-	}
-
 	public function getData()
 	{
 		return [