Split into multiple

Author: tvdijen

src/Assert/Assert.php

@@ -9,20 +9,29 @@
 /**
  * @package simplesamlphp/xml-common
  *
+ * @method static void validAllowedXPathAxes(mixed $value, array $allowed_axes, string $message = '', string $exception = '')
+ * @method static void validAllowedXPathFilter(mixed $value, array $allowed_axes, array $allowed_functions, string $message = '', string $exception = '')
+ * @method static void validAllowedXPathFunctions(mixed $value, array $allowed_functions, string $message = '', string $exception = '')
  * @method static void validHexBinary(mixed $value, string $message = '', string $exception = '')
  * @method static void validNMToken(mixed $value, string $message = '', string $exception = '')
  * @method static void validNMTokens(mixed $value, string $message = '', string $exception = '')
  * @method static void validDuration(mixed $value, string $message = '', string $exception = '')
  * @method static void validDateTime(mixed $value, string $message = '', string $exception = '')
  * @method static void validNCName(mixed $value, string $message = '', string $exception = '')
  * @method static void validQName(mixed $value, string $message = '', string $exception = '')
+ * @method static void nullOrValidAllowedXPathAxes(mixed $value, array $allowed_axes, string $message = '', string $exception = '')
+ * @method static void nullOrValidAllowedXPathFilter(mixed $value, array $allowed_axes, array $allowed_functions, string $message = '', string $exception = '')
+ * @method static void nullOrValidAllowedXPathFunctions(mixed $value, array $allowed_functions, string $message = '', string $exception = '')
  * @method static void nullOrValidHexBinary(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidNMToken(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidNMTokens(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidDuration(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidDateTime(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidNCName(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidQName(mixed $value, string $message = '', string $exception = '')
+ * @method static void allValidAllowedXPathAxes(mixed $value, array $allowed_axes, string $message = '', string $exception = '')
+ * @method static void allValidAllowedXPathFilter(mixed $value, array $allowed_axes, array $allowed_functions, string $message = '', string $exception = '')
+ * @method static void allValidAllowedXPathFunctions(mixed $value, array $allowed_functions, string $message = '', string $exception = '')
  * @method static void allValidHexBinary(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidNMToken(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidNMTokens(mixed $value, string $message = '', string $exception = '')

src/Assert/XPathFilterTrait.php

@@ -107,7 +107,7 @@ trait XPathFilterTrait
      * @param array<string> $allowed_functions
      * @param string $message
      */
-    public static function allowedXPathFilter(
+    public static function validAllowedXPathFilter(
         string $value,
         array $allowed_axes = C::DEFAULT_ALLOWED_AXES,
         array $allowed_functions = C::DEFAULT_ALLOWED_FUNCTIONS,
@@ -132,6 +132,21 @@ public static function allowedXPathFilter(
             throw new Exception("Error in preg_replace.");
         }
 
+        self::validAllowedXpathFunctions($strippedValue, $allowed_functions);
+        self::validAllowedXpathAxes($strippedValue, $allowed_axes);
+    }
+
+
+    /**
+     * @param string $value
+     * @param array<string> $allowed_functions
+     * @param string $message
+     */
+    public static function validAllowedXPathFunctions(
+        string $value,
+        array $allowed_functions = C::DEFAULT_ALLOWED_FUNCTIONS,
+        string $message = '',
+    ): void {
         /**
          * Check if the $xpath_expression uses an XPath function that is not in the list of allowed functions
          *
@@ -140,7 +155,7 @@ public static function allowedXPathFilter(
          * All functions must match a string on a list of allowed function names
          */
         $matches = [];
-        $res = preg_match_all(self::$regex_xpfilter_functions, $strippedValue, $matches);
+        $res = preg_match_all(self::$regex_xpfilter_functions, $value, $matches);
         if ($res === false) {
             throw new Exception("Error in preg_match_all.");
         }
@@ -154,7 +169,19 @@ public static function allowedXPathFilter(
                 ));
             }
         }
+    }
+
 
+    /**
+     * @param string $value
+     * @param array<string> $allowed_axes
+     * @param string $message
+     */
+    public static function validAllowedXPathAxes(
+        string $value,
+        array $allowed_axes = C::DEFAULT_ALLOWED_AXES,
+        string $message = '',
+    ): void {
         /**
          * Check if the $xpath_expression uses an XPath axis that is not in the list of allowed axes
          *
@@ -163,7 +190,7 @@ public static function allowedXPathFilter(
          * All axes must match a string on a list of allowed axis names
          */
         $matches = [];
-        $res = preg_match_all(self::$regex_xpfilter_axes, $strippedValue, $matches);
+        $res = preg_match_all(self::$regex_xpfilter_axes, $value, $matches);
         if ($res === false) {
             throw new Exception("Error in preg_match_all.");
         }

tests/Assert/XPathFilterTest.php

@@ -35,7 +35,7 @@ public function testDefaultAllowedXPathFilter(
         array $functions = C::DEFAULT_ALLOWED_FUNCTIONS,
     ): void {
         try {
-            XMLAssert::allowedXPathFilter($filter, $axes, $functions);
+            XMLAssert::validAllowedXPathFilter($filter, $axes, $functions);
             $this->assertTrue($shouldPass);
         } catch (AssertionFailedException $e) {
             $this->assertFalse($shouldPass);