<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[49082] trunk: REST API: Support the patternProperties JSON Schema keyword.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/49082">49082</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/49082","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>TimothyBlynJacobs</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-01 02:47:08 +0000 (Thu, 01 Oct 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>REST API: Support the patternProperties JSON Schema keyword.
Props yakimun.
Fixes <a href="https://core.trac.wordpress.org/ticket/51024">#51024</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestcontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestschemasanitizationphp">trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestschemavalidationphp">trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiresttestcontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-test-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiphp">trunk/tests/phpunit/tests/rest-api.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api.php 2020-10-01 01:12:16 UTC (rev 49081)
+++ trunk/src/wp-includes/rest-api.php 2020-10-01 02:47:08 UTC (rev 49082)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,6 +1540,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Validates if the JSON Schema pattern matches a value.
+ *
+ * @since 5.6.0
+ *
+ * @param string $pattern The pattern to match against.
+ * @param string $value The value to check.
+ * @return bool True if the pattern matches the given value, false otherwise.
+ */
+function rest_validate_json_schema_pattern( $pattern, $value ) {
+ $escaped_pattern = str_replace( '#', '\\#', $pattern );
+
+ return 1 === preg_match( '#' . $escaped_pattern . '#u', $value );
+}
+
+/**
+ * Finds the schema for a property using the patternProperties keyword.
+ *
+ * @since 5.6.0
+ *
+ * @param string $property The property name to check.
+ * @param array $args The schema array to use.
+ * @return array|null The schema of matching pattern property, or null if no patterns match.
+ */
+function rest_find_matching_pattern_property_schema( $property, $args ) {
+ if ( isset( $args['patternProperties'] ) ) {
+ foreach ( $args['patternProperties'] as $pattern => $child_schema ) {
+ if ( rest_validate_json_schema_pattern( $pattern, $property ) ) {
+ return $child_schema;
+ }
+ }
+ }
+
+ return null;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Validate a value based on a schema.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1553,6 +1589,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Validate required properties.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0 Support the "minProperties" and "maxProperties" keywords for objects.
</span><span class="cx" style="display: block; padding: 0 10px"> * Support the "multipleOf" keyword for numbers and integers.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Support the "patternProperties" keyword for objects.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to validate.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Schema array to use for validation.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1650,7 +1687,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $is_valid ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $is_valid;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $args['additionalProperties'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ continue;
+ }
+
+ $pattern_property_schema = rest_find_matching_pattern_property_schema( $property, $args );
+ if ( null !== $pattern_property_schema ) {
+ $is_valid = rest_validate_value_from_schema( $v, $pattern_property_schema, $param . '[' . $property . ']' );
+ if ( is_wp_error( $is_valid ) ) {
+ return $is_valid;
+ }
+ continue;
+ }
+
+ if ( isset( $args['additionalProperties'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $args['additionalProperties'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Property of an object. */
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not a valid property of Object.' ), $property ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1744,12 +1793,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $args['pattern'] ) ) {
- $pattern = str_replace( '#', '\\#', $args['pattern'] );
- if ( ! preg_match( '#' . $pattern . '#u', $value ) ) {
- /* translators: 1: Parameter, 2: Pattern. */
- return new WP_Error( 'rest_invalid_pattern', sprintf( __( '%1$s does not match pattern %2$s.' ), $param, $args['pattern'] ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['pattern'] ) && ! rest_validate_json_schema_pattern( $args['pattern'], $value ) ) {
+ /* translators: 1: Parameter, 2: Pattern. */
+ return new WP_Error( 'rest_invalid_pattern', sprintf( __( '%1$s does not match pattern %2$s.' ), $param, $args['pattern'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1897,7 +1943,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $value as $property => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['properties'][ $property ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value[ $property ] = rest_sanitize_value_from_schema( $v, $args['properties'][ $property ], $param . '[' . $property . ']' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $args['additionalProperties'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ continue;
+ }
+
+ $pattern_property_schema = rest_find_matching_pattern_property_schema( $property, $args );
+ if ( null !== $pattern_property_schema ) {
+ $value[ $property ] = rest_sanitize_value_from_schema( $v, $pattern_property_schema, $param . '[' . $property . ']' );
+ continue;
+ }
+
+ if ( isset( $args['additionalProperties'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $args['additionalProperties'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $value[ $property ] );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_array( $args['additionalProperties'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2053,6 +2108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the response to remove any fields not available in the given context.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.6.0 Support the "patternProperties" keyword for objects.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|object $data The response data to modify.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $schema The schema for the endpoint used to filter the response.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2093,8 +2149,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_object_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $schema['properties'][ $key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $check = $schema['properties'][ $key ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $has_additional_properties ) {
- $check = $schema['additionalProperties'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $pattern_property_schema = rest_find_matching_pattern_property_schema( $key, $schema );
+ if ( null !== $pattern_property_schema ) {
+ $check = $pattern_property_schema;
+ } elseif ( $has_additional_properties ) {
+ $check = $schema['additionalProperties'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2132,6 +2193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Sets the "additionalProperties" to false by default for all object definitions in the schema.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.6.0 Support the "patternProperties" keyword.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $schema The schema to modify.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The modified schema.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2146,6 +2208,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $schema['patternProperties'] ) ) {
+ foreach ( $schema['patternProperties'] as $key => $child_schema ) {
+ $schema['patternProperties'][ $key ] = rest_default_additional_properties_to_false( $child_schema );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $schema['additionalProperties'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $schema['additionalProperties'] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2300,6 +2368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'items',
</span><span class="cx" style="display: block; padding: 0 10px"> 'properties',
</span><span class="cx" style="display: block; padding: 0 10px"> 'additionalProperties',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'patternProperties',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'minProperties',
</span><span class="cx" style="display: block; padding: 0 10px"> 'maxProperties',
</span><span class="cx" style="display: block; padding: 0 10px"> 'minimum',
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-controller.php 2020-10-01 01:12:16 UTC (rev 49081)
+++ trunk/tests/phpunit/tests/rest-api/rest-controller.php 2020-10-01 02:47:08 UTC (rev 49082)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $property, $args['somearray'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( array( 'properties', 'additionalProperties', 'minProperties', 'maxProperties' ) as $property ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object_properties = array(
+ 'properties',
+ 'patternProperties',
+ 'additionalProperties',
+ 'minProperties',
+ 'maxProperties',
+ );
+ foreach ( $object_properties as $property ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $property, $args['someobject'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestschemasanitizationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php 2020-10-01 01:12:16 UTC (rev 49081)
+++ trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php 2020-10-01 02:47:08 UTC (rev 49082)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,6 +237,102 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 51024
+ *
+ * @dataProvider data_type_object_pattern_properties
+ *
+ * @param array $pattern_properties
+ * @param array $value
+ * @param array $expected
+ */
+ public function test_type_object_pattern_properties( $pattern_properties, $value, $expected ) {
+ $schema = array(
+ 'type' => 'object',
+ 'properties' => array(
+ 'propA' => array( 'type' => 'string' ),
+ ),
+ 'patternProperties' => $pattern_properties,
+ 'additionalProperties' => false,
+ );
+
+ $this->assertSame( $expected, rest_sanitize_value_from_schema( $value, $schema ) );
+ }
+
+ /**
+ * @return array
+ */
+ public function data_type_object_pattern_properties() {
+ return array(
+ array( array(), array(), array() ),
+ array( array(), array( 'propA' => 'a' ), array( 'propA' => 'a' ) ),
+ array(
+ array(),
+ array(
+ 'propA' => 'a',
+ 'propB' => 'b',
+ ),
+ array( 'propA' => 'a' ),
+ ),
+ array(
+ array(
+ 'propB' => array( 'type' => 'string' ),
+ ),
+ array( 'propA' => 'a' ),
+ array( 'propA' => 'a' ),
+ ),
+ array(
+ array(
+ 'propB' => array( 'type' => 'string' ),
+ ),
+ array(
+ 'propA' => 'a',
+ 'propB' => 'b',
+ ),
+ array(
+ 'propA' => 'a',
+ 'propB' => 'b',
+ ),
+ ),
+ array(
+ array(
+ '.*C' => array( 'type' => 'string' ),
+ ),
+ array(
+ 'propA' => 'a',
+ 'propC' => 'c',
+ ),
+ array(
+ 'propA' => 'a',
+ 'propC' => 'c',
+ ),
+ ),
+ array(
+ array(
+ '[0-9]' => array( 'type' => 'integer' ),
+ ),
+ array(
+ 'propA' => 'a',
+ 'prop0' => '0',
+ ),
+ array(
+ 'propA' => 'a',
+ 'prop0' => 0,
+ ),
+ ),
+ array(
+ array(
+ '.+' => array( 'type' => 'string' ),
+ ),
+ array(
+ '' => '',
+ 'propA' => 'a',
+ ),
+ array( 'propA' => 'a' ),
+ ),
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_type_object_nested() {
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'object',
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestschemavalidationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php 2020-10-01 01:12:16 UTC (rev 49081)
+++ trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php 2020-10-01 02:47:08 UTC (rev 49082)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,6 +288,107 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( rest_validate_value_from_schema( array( 'a' => 'invalid' ), $schema ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 51024
+ *
+ * @dataProvider data_type_object_pattern_properties
+ *
+ * @param array $pattern_properties
+ * @param array $value
+ * @param bool $expected
+ */
+ public function test_type_object_pattern_properties( $pattern_properties, $value, $expected ) {
+ $schema = array(
+ 'type' => 'object',
+ 'properties' => array(
+ 'propA' => array( 'type' => 'string' ),
+ ),
+ 'patternProperties' => $pattern_properties,
+ 'additionalProperties' => false,
+ );
+
+ if ( $expected ) {
+ $this->assertTrue( rest_validate_value_from_schema( $value, $schema ) );
+ } else {
+ $this->assertWPError( rest_validate_value_from_schema( $value, $schema ) );
+ }
+ }
+
+ /**
+ * @return array
+ */
+ public function data_type_object_pattern_properties() {
+ return array(
+ array( array(), array(), true ),
+ array( array(), array( 'propA' => 'a' ), true ),
+ array(
+ array(),
+ array(
+ 'propA' => 'a',
+ 'propB' => 'b',
+ ),
+ false,
+ ),
+ array(
+ array(
+ 'propB' => array( 'type' => 'string' ),
+ ),
+ array( 'propA' => 'a' ),
+ true,
+ ),
+ array(
+ array(
+ 'propB' => array( 'type' => 'string' ),
+ ),
+ array(
+ 'propA' => 'a',
+ 'propB' => 'b',
+ ),
+ true,
+ ),
+ array(
+ array(
+ '.*C' => array( 'type' => 'string' ),
+ ),
+ array(
+ 'propA' => 'a',
+ 'propC' => 'c',
+ ),
+ true,
+ ),
+ array(
+ array(
+ '[0-9]' => array( 'type' => 'integer' ),
+ ),
+ array(
+ 'propA' => 'a',
+ 'prop0' => 0,
+ ),
+ true,
+ ),
+ array(
+ array(
+ '[0-9]' => array( 'type' => 'integer' ),
+ ),
+ array(
+ 'propA' => 'a',
+ 'prop0' => 'notAnInteger',
+ ),
+ false,
+ ),
+ array(
+ array(
+ '.+' => array( 'type' => 'string' ),
+ ),
+ array(
+ '' => '',
+ 'propA' => 'a',
+ ),
+ false,
+ ),
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_type_object_additional_properties_false() {
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'object',
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttestcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-test-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-test-controller.php 2020-10-01 01:12:16 UTC (rev 49081)
+++ trunk/tests/phpunit/tests/rest-api/rest-test-controller.php 2020-10-01 02:47:08 UTC (rev 49082)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,6 +121,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'integer',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'patternProperties' => array(
+ '[0-9]' => array(
+ 'type' => 'string',
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'minProperties' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'maxProperties' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ignored_prop' => 'ignored_prop',
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api.php 2020-10-01 01:12:16 UTC (rev 49081)
+++ trunk/tests/phpunit/tests/rest-api.php 2020-10-01 02:47:08 UTC (rev 49082)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1284,6 +1284,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'additional' => array( 'a' => '1' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'pattern properties' => array(
+ array(
+ '$schema' => 'http://json-schema.org/draft-04/schema#',
+ 'type' => 'object',
+ 'properties' => array(
+ 'a' => array(
+ 'type' => 'string',
+ 'context' => array( 'view', 'edit' ),
+ ),
+ ),
+ 'patternProperties' => array(
+ '[0-9]' => array(
+ 'type' => 'string',
+ 'context' => array( 'view', 'edit' ),
+ ),
+ 'c.*' => array(
+ 'type' => 'string',
+ 'context' => array( 'edit' ),
+ ),
+ ),
+ 'additionalProperties' => array(
+ 'type' => 'string',
+ 'context' => array( 'edit' ),
+ ),
+ ),
+ array(
+ 'a' => '1',
+ 'b' => '2',
+ '0' => '3',
+ 'ca' => '4',
+ ),
+ array(
+ 'a' => '1',
+ '0' => '3',
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'multiple types object' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '$schema' => 'http://json-schema.org/draft-04/schema#',
</span></span></pre>
</div>
</div>
</body>
</html>