Text
';
@@ -154,4 +152,35 @@ public function test_wp_text_cant_set_inner_html_in_the_content() {
$new_html = $this->interactivity->process_directives( $html );
$this->assertSame( '
<span>Updated</span>
', $new_html );
}
+
+ /**
+ * Tests it ignores suffixes and unique-ids.
+ *
+ * @ticket 64106
+ *
+ * @covers ::process_directives
+ */
+ public function test_wp_text_ignores_suffixes_and_unique_ids() {
+ $html = '
Text';
+ $new_html = $this->interactivity->process_directives( $html );
+ $this->assertSame( $html, $new_html );
+
+ $html = '
Text';
+ $new_html = $this->interactivity->process_directives( $html );
+ $this->assertSame( $html, $new_html );
+ }
+
+ /**
+ * Tests first `data-wp-text` works even when suffixes and unique-ids are included.
+ *
+ * @ticket 64106
+ *
+ * @covers ::process_directives
+ */
+ public function test_wp_text_works_even_when_suffixes_and_unique_ids_are_included() {
+ $original = '
Text';
+ $expected = '
Updated';
+ $new_html = $this->interactivity->process_directives( $original );
+ $this->assertSame( $expected, $new_html );
+ }
}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index a64f0f0c956bd..8aa70e188ff15 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -369,14 +369,39 @@ function () use ( $returns_whatever, $returns_array ) {
// Multiple evaluations should be serialized only once.
$this->set_internal_namespace_stack( 'pluginWithInvokedDerivedState' );
- $this->evaluate( 'state.derivedProp' );
- $this->evaluate( 'state.derivedProp' );
- $this->evaluate( 'state.nested.derivedProp' );
- $this->evaluate( 'state.nested.derivedProp' );
+ $this->evaluate(
+ array(
+ 'namespace' => 'pluginWithInvokedDerivedState',
+ 'value' => 'state.derivedProp',
+ )
+ );
+ $this->evaluate(
+ array(
+ 'namespace' => 'pluginWithInvokedDerivedState',
+ 'value' => 'state.derivedProp',
+ )
+ );
+ $this->evaluate(
+ array(
+ 'namespace' => 'pluginWithInvokedDerivedState',
+ 'value' => 'state.nested.derivedProp',
+ )
+ );
+ $this->evaluate(
+ array(
+ 'namespace' => 'pluginWithInvokedDerivedState',
+ 'value' => 'state.nested.derivedProp',
+ )
+ );
// Only the path part that points to a derived state prop should be serialized.
$this->set_internal_namespace_stack( 'pluginWithInvokedDerivedStateReturningArray' );
- $this->evaluate( 'state.nested.derivedProp.prop' );
+ $this->evaluate(
+ array(
+ 'namespace' => 'pluginWithInvokedDerivedStateReturningArray',
+ 'value' => 'state.nested.derivedProp',
+ )
+ );
}
);
@@ -810,24 +835,301 @@ public function test_extract_directive_value_invalid_json() {
* Tests the ability to extract prefix and suffix from a directive attribute
* name.
*
- * @ticket 60356
+ * @ticket 64106
+ *
+ * @covers ::parse_directive_name
+ */
+ public function test_parse_directive_name() {
+ $parse_directive_name = new ReflectionMethod( $this->interactivity, 'parse_directive_name' );
+ if ( PHP_VERSION_ID < 80100 ) {
+ $parse_directive_name->setAccessible( true );
+ }
+
+ // Should parse directives without suffix or unique ID.
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertNull( $result['suffix'] );
+ $this->assertNull( $result['unique_id'] );
+
+ // Should parse directives with suffix only.
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test--one' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertSame( 'one', $result['suffix'] );
+ $this->assertNull( $result['unique_id'] );
+
+ // Should parse directives with unique ID only.
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test---unique-id' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertNull( $result['suffix'] );
+ $this->assertSame( 'unique-id', $result['unique_id'] );
+
+ // Should parse directives with suffix and unique ID.
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test--suffix---unique-id' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertSame( 'suffix', $result['suffix'] );
+ $this->assertSame( 'unique-id', $result['unique_id'] );
+
+ // Should handle empty suffix (just two dashes).
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test--' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertNull( $result['suffix'] );
+ $this->assertNull( $result['unique_id'] );
+
+ // Should handle empty unique ID (just three dashes).
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test---' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertNull( $result['suffix'] );
+ $this->assertNull( $result['unique_id'] );
+
+ // Should handle only dashes (4 or more dashes).
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test----' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertSame( '--', $result['suffix'] );
+ $this->assertNull( $result['unique_id'] );
+
+ // Should handle suffix starting with 4 or more dashes but containing valid characters.
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test------custom-suffix' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertSame( '----custom-suffix', $result['suffix'] );
+ $this->assertNull( $result['unique_id'] );
+
+ // Should handle complex pattern with multiple dashes.
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test--complex--suffix---complex--unique---id' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertSame( 'complex--suffix', $result['suffix'] );
+ $this->assertSame( 'complex--unique---id', $result['unique_id'] );
+
+ // Should handle suffix with dashes followed by unique ID.
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test----suffix---unique-id' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertSame( '--suffix', $result['suffix'] );
+ $this->assertSame( 'unique-id', $result['unique_id'] );
+
+ // Should handle unique IDs followed by suffix in wrong order.
+ $result = $parse_directive_name->invoke( $this->interactivity, 'data-wp-test---unique-id--wrong-suffix' );
+ $this->assertSame( 'test', $result['prefix'] );
+ $this->assertNull( $result['suffix'] );
+ $this->assertSame( 'unique-id--wrong-suffix', $result['unique_id'] );
+ }
+
+ /**
+ * Tests the ability to get the valid entries of a specific directive in an HTML element.
*
- * @covers ::extract_prefix_and_suffix
+ * @ticket 64106
+ *
+ * @covers ::get_directive_entries
*/
- public function test_extract_prefix_and_suffix() {
- $extract_prefix_and_suffix = new ReflectionMethod( $this->interactivity, 'extract_prefix_and_suffix' );
+ public function test_get_directive_entries() {
+ $get_directive_entries = new ReflectionMethod( $this->interactivity, 'get_directive_entries' );
if ( PHP_VERSION_ID < 80100 ) {
- $extract_prefix_and_suffix->setAccessible( true );
+ $get_directive_entries->setAccessible( true );
}
+ $this->set_internal_namespace_stack( 'myPlugin' );
+
+ // Should process simple directives.
+ $html = '
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertCount( 1, $results );
+ $result = $results[0];
+ $this->assertSame( 'myPlugin', $result['namespace'] );
+ $this->assertSame( 'test value', $result['value'] );
+ $this->assertNull( $result['suffix'] );
+ $this->assertNull( $result['unique_id'] );
+
+ // Should process directives without value.
+ $html = '
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertNull( $results[0]['value'] );
+
+ // Should parse JSON values in directives.
+ $html = '
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertSame( array( 'key' => 'value' ), $results[0]['value'] );
+
+ // Should handle malformed JSON and keep as string.
+ $html = '
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertSame( '{malformed: json}', $results[0]['value'] );
+
+ // Should process directives with a custom namespace.
+ $html = '
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertSame( 'my-namespace', $results[0]['namespace'] );
+ $this->assertSame( 'test value', $results[0]['value'] );
+
+ // Should parse JSON values with a custom namespace.
+ $html = '
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertSame( 'my-namespace', $results[0]['namespace'] );
+ $this->assertSame( array( 'key' => 'value' ), $results[0]['value'] );
+
+ // Should handle multiple directives with different unique IDs.
+ $html = '
+
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertCount( 3, $results );
+ $this->assertSame(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'value-a',
+ 'suffix' => null,
+ 'unique_id' => 'plugin-a',
+ ),
+ $results[0]
+ );
+ $this->assertSame(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'value-b',
+ 'suffix' => null,
+ 'unique_id' => 'plugin-b',
+ ),
+ $results[1]
+ );
+ $this->assertSame(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'value-c',
+ 'suffix' => null,
+ 'unique_id' => 'plugin-c',
+ ),
+ $results[2]
+ );
- $result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-interactive' );
- $this->assertSame( array( 'data-wp-interactive' ), $result );
+ // Should handle mix of different suffixes and unique IDs.
+ $html = '
+
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertCount( 4, $results );
+ $this->assertSame(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'value1',
+ 'suffix' => 'suffix-a',
+ 'unique_id' => 'id-1',
+ ),
+ $results[0]
+ );
+ $this->assertSame(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'value2',
+ 'suffix' => 'suffix-a',
+ 'unique_id' => 'id-2',
+ ),
+ $results[1]
+ );
+ $this->assertSame(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'value3',
+ 'suffix' => 'suffix-b',
+ 'unique_id' => 'id-1',
+ ),
+ $results[2]
+ );
+ $this->assertSame(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'value4',
+ 'suffix' => 'suffix-c',
+ 'unique_id' => 'id-1',
+ ),
+ $results[3]
+ );
- $result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-bind--src' );
- $this->assertSame( array( 'data-wp-bind', 'src' ), $result );
+ // Should handle unique ID with namespace.
+ $html = '
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertSame( 'my-namespace', $results[0]['namespace'] );
+ $this->assertSame( 'test value', $results[0]['value'] );
+ $this->assertSame( 'unique-id', $results[0]['unique_id'] );
- $result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-foo--and--bar' );
- $this->assertSame( array( 'data-wp-foo', 'and--bar' ), $result );
+ // Should handle multiple directives with different namespaces and unique IDs.
+ $html = '
+
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertCount( 2, $results );
+ $this->assertSame(
+ array(
+ 'namespace' => 'namespace-a',
+ 'value' => 'value1',
+ 'suffix' => null,
+ 'unique_id' => 'id-a',
+ ),
+ $results[0]
+ );
+ $this->assertSame(
+ array(
+ 'namespace' => 'namespace-b',
+ 'value' => 'value2',
+ 'suffix' => null,
+ 'unique_id' => 'id-b',
+ ),
+ $results[1]
+ );
+ // Should sort directives by suffix and uniqueId for stable ordering.
+ $html = '
+
';
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $p->next_tag();
+ $results = $get_directive_entries->invoke( $this->interactivity, $p, 'test' );
+ $this->assertCount( 6, $results );
+ $this->assertEquals(
+ array(
+ array( null, null ),
+ array( null, 'a' ),
+ array( null, 'z' ),
+ array( 'a', null ),
+ array( 'b', 'a' ),
+ array( 'b', 'z' ),
+ ),
+ array_map(
+ function ( $d ) {
+ return array( $d['suffix'], $d['unique_id'] );
+ },
+ $results
+ )
+ );
}
/**
@@ -915,8 +1217,6 @@ public function test_process_directives_process_the_directives_in_the_correct_or
*
* @dataProvider data_html_with_unbalanced_tags
*
- * @expectedIncorrectUsage WP_Interactivity_API::_process_directives
- *
* @param string $html HTML containing unbalanced tags and also a directive.
*/
public function test_process_directives_doesnt_change_html_if_contains_unbalanced_tags( $html ) {
@@ -1078,10 +1378,10 @@ public function test_process_directives_does_not_change_inner_html_in_math() {
/**
* Invokes the private `evaluate` method of WP_Interactivity_API class.
*
- * @param string $directive_value The directive attribute value to evaluate.
+ * @param string $entry The entry array containing namespace, value, suffix, and unique ID.
* @return mixed The result of the evaluate method.
*/
- private function evaluate( $directive_value ) {
+ private function evaluate( $entry ) {
/*
* The global WP_Interactivity_API instance is momentarily replaced to
* make global functions like `wp_interactivity_state` and
@@ -1096,7 +1396,7 @@ private function evaluate( $directive_value ) {
$evaluate->setAccessible( true );
}
- $result = $evaluate->invokeArgs( $this->interactivity, array( $directive_value ) );
+ $result = $evaluate->invokeArgs( $this->interactivity, array( $entry ) );
// Restore the original WP_Interactivity_API instance.
$wp_interactivity = $wp_interactivity_prev;
@@ -1142,24 +1442,55 @@ public function offsetUnset( $offset ): void {}
'otherPlugin' => array( 'key' => 'otherPlugin-context' ),
)
);
- $this->set_internal_namespace_stack( 'myPlugin' );
+ $default_ns = 'myPlugin';
+ $this->set_internal_namespace_stack( $default_ns );
- $result = $this->evaluate( 'state.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => 'state.key',
+ )
+ );
$this->assertSame( 'myPlugin-state', $result );
- $result = $this->evaluate( 'context.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => 'context.key',
+ )
+ );
$this->assertSame( 'myPlugin-context', $result );
- $result = $this->evaluate( 'otherPlugin::state.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => 'state.key',
+ )
+ );
$this->assertSame( 'otherPlugin-state', $result );
- $result = $this->evaluate( 'otherPlugin::context.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => 'context.key',
+ )
+ );
$this->assertSame( 'otherPlugin-context', $result );
- $result = $this->evaluate( 'state.obj.prop' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => 'state.obj.prop',
+ )
+ );
$this->assertSame( 'object property', $result );
- $result = $this->evaluate( 'state.arrAccess.1' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => 'state.arrAccess.1',
+ )
+ );
$this->assertSame( '1', $result );
}
@@ -1180,18 +1511,39 @@ public function test_evaluate_value_negation() {
'otherPlugin' => array( 'key' => 'otherPlugin-context' ),
)
);
- $this->set_internal_namespace_stack( 'myPlugin' );
+ $default_ns = 'myPlugin';
+ $this->set_internal_namespace_stack( $default_ns );
- $result = $this->evaluate( '!state.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => '!state.key',
+ )
+ );
$this->assertFalse( $result );
- $result = $this->evaluate( '!context.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => '!context.key',
+ )
+ );
$this->assertFalse( $result );
- $result = $this->evaluate( 'otherPlugin::!state.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => '!state.key',
+ )
+ );
$this->assertFalse( $result );
- $result = $this->evaluate( 'otherPlugin::!context.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => '!context.key',
+ )
+ );
$this->assertFalse( $result );
}
@@ -1212,18 +1564,39 @@ public function test_evaluate_value_negation_non_existent_path() {
'otherPlugin' => array(),
)
);
- $this->set_internal_namespace_stack( 'myPlugin' );
+ $default_ns = 'myPlugin';
+ $this->set_internal_namespace_stack( $default_ns );
- $result = $this->evaluate( '!state.missing' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => '!state.missing',
+ )
+ );
$this->assertTrue( $result );
- $result = $this->evaluate( '!context.missing' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => '!context.missing',
+ )
+ );
$this->assertTrue( $result );
- $result = $this->evaluate( 'otherPlugin::!state.deeply.nested.missing' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => '!state.deeply.nested.missing',
+ )
+ );
$this->assertTrue( $result );
- $result = $this->evaluate( 'otherPlugin::!context.deeply.nested.missing' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => '!context.deeply.nested.missing',
+ )
+ );
$this->assertTrue( $result );
}
@@ -1243,24 +1616,55 @@ public function test_evaluate_non_existent_path() {
'otherPlugin' => array( 'key' => 'otherPlugin-context' ),
)
);
- $this->set_internal_namespace_stack( 'myPlugin' );
+ $default_ns = 'myPlugin';
+ $this->set_internal_namespace_stack( $default_ns );
- $result = $this->evaluate( 'state.nonExistentKey' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => 'state.nonExistentKey',
+ )
+ );
$this->assertNull( $result );
- $result = $this->evaluate( 'context.nonExistentKey' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => 'context.nonExistentKey',
+ )
+ );
$this->assertNull( $result );
- $result = $this->evaluate( 'otherPlugin::state.nonExistentKey' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => 'state.nonExistentKey',
+ )
+ );
$this->assertNull( $result );
- $result = $this->evaluate( 'otherPlugin::context.nonExistentKey' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => 'context.nonExistentKey',
+ )
+ );
$this->assertNull( $result );
- $result = $this->evaluate( ' state.key' ); // Extra space.
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => ' state.key', // Extra space.
+ )
+ );
$this->assertNull( $result );
- $result = $this->evaluate( 'otherPlugin:: state.key' ); // Extra space.
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => ' state.key', // Extra space.
+ )
+ );
$this->assertNull( $result );
}
@@ -1294,18 +1698,39 @@ public function test_evaluate_nested_value() {
),
)
);
- $this->set_internal_namespace_stack( 'myPlugin' );
+ $default_ns = 'myPlugin';
+ $this->set_internal_namespace_stack( $default_ns );
- $result = $this->evaluate( 'state.nested.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => 'state.nested.key',
+ )
+ );
$this->assertSame( 'myPlugin-state-nested', $result );
- $result = $this->evaluate( 'context.nested.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => $default_ns,
+ 'value' => 'context.nested.key',
+ )
+ );
$this->assertSame( 'myPlugin-context-nested', $result );
- $result = $this->evaluate( 'otherPlugin::state.nested.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => 'state.nested.key',
+ )
+ );
$this->assertSame( 'otherPlugin-state-nested', $result );
- $result = $this->evaluate( 'otherPlugin::context.nested.key' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => 'context.nested.key',
+ )
+ );
$this->assertSame( 'otherPlugin-context-nested', $result );
}
@@ -1321,13 +1746,28 @@ public function test_evaluate_unvalid_namespaces() {
$this->set_internal_context_stack( array() );
$this->set_internal_namespace_stack();
- $result = $this->evaluate( 'path', 'null' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'null',
+ 'value' => 'path',
+ )
+ );
$this->assertNull( $result );
- $result = $this->evaluate( 'path', '' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => '',
+ 'value' => 'path',
+ )
+ );
$this->assertNull( $result );
- $result = $this->evaluate( 'path', '{}' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => '{}',
+ 'value' => 'path',
+ )
+ );
$this->assertNull( $result );
}
@@ -1365,7 +1805,12 @@ public function test_evaluate_derived_state() {
);
$this->set_internal_namespace_stack( 'myPlugin' );
- $result = $this->evaluate( 'state.derived' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'state.derived',
+ )
+ );
$this->assertSame( "Derived state: myPlugin-state\nDerived context: myPlugin-context", $result );
}
@@ -1408,7 +1853,12 @@ public function test_evaluate_derived_state_accessing_different_namespace() {
);
$this->set_internal_namespace_stack( 'myPlugin' );
- $result = $this->evaluate( 'state.derived' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'state.derived',
+ )
+ );
$this->assertSame( "Derived state: otherPlugin-state\nDerived context: otherPlugin-context", $result );
}
@@ -1451,7 +1901,12 @@ public function test_evaluate_derived_state_defined_in_different_namespace() {
);
$this->set_internal_namespace_stack( 'myPlugin' );
- $result = $this->evaluate( 'otherPlugin::state.derived' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'otherPlugin',
+ 'value' => 'state.derived',
+ )
+ );
$this->assertSame( "Derived state: otherPlugin-state\nDerived context: otherPlugin-context", $result );
}
@@ -1475,7 +1930,12 @@ public function test_evaluate_derived_state_that_throws() {
$this->set_internal_context_stack();
$this->set_internal_namespace_stack( 'myPlugin' );
- $result = $this->evaluate( 'state.derivedThatThrows' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'state.derivedThatThrows',
+ )
+ );
$this->assertNull( $result );
}
@@ -1498,7 +1958,12 @@ public function test_evaluate_derived_state_intermediate() {
$this->set_internal_context_stack();
$this->set_internal_namespace_stack( 'myPlugin' );
- $result = $this->evaluate( 'state.derivedState.property' );
+ $result = $this->evaluate(
+ array(
+ 'namespace' => 'myPlugin',
+ 'value' => 'state.derivedState.property',
+ )
+ );
$this->assertSame( 'value', $result );
}