<!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>[53806] trunk/tests/phpunit/tests: Tests: Move the test for actions using closures to the general action tests file.</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/53806">53806</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/53806","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-07-31 16:41:53 +0000 (Sun, 31 Jul 2022)</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'>Tests: Move the test for actions using closures to the general action tests file.
This was previously moved to a separate file to be excluded when running the tests on PHP 5.2.x.
Now that WordPress supports PHP 5.6.x or later, this can be moved back with the other action tests.
Follow-up to [299/tests], [301/tests], [862/tests], [866/tests], [963/tests].
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsactionsphp">trunk/tests/phpunit/tests/actions.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsactionsclosuresphp">trunk/tests/phpunit/tests/actions/closures.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsactionsclosuresphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/actions/closures.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/actions/closures.php 2022-07-31 16:25:27 UTC (rev 53805)
+++ trunk/tests/phpunit/tests/actions/closures.php 2022-07-31 16:41:53 UTC (rev 53806)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,46 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Test do_action() and related functions
- *
- * @group hooks
- */
-class Tests_Actions_Closures extends WP_UnitTestCase {
-
- /**
- * @ticket 10493
- *
- * @covers ::add_action
- * @covers ::has_action
- * @covers ::do_action
- */
- public function test_action_closure() {
- $hook_name = 'test_action_closure';
- $closure = static function( $a, $b ) {
- $GLOBALS[ $a ] = $b;
- };
- add_action( $hook_name, $closure, 10, 2 );
-
- $this->assertSame( 10, has_action( $hook_name, $closure ) );
-
- $context = array( 'val1', 'val2' );
- do_action( $hook_name, $context[0], $context[1] );
-
- $this->assertSame( $GLOBALS[ $context[0] ], $context[1] );
-
- $hook_name2 = 'test_action_closure_2';
- $closure2 = static function() {
- $GLOBALS['closure_no_args'] = true;
- };
- add_action( $hook_name2, $closure2 );
-
- $this->assertSame( 10, has_action( $hook_name2, $closure2 ) );
-
- do_action( $hook_name2 );
-
- $this->assertTrue( $GLOBALS['closure_no_args'] );
-
- remove_action( $hook_name, $closure );
- remove_action( $hook_name2, $closure2 );
- }
-}
</del></span></pre></div>
<a id="trunktestsphpunittestsactionsphp"></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/actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/actions.php 2022-07-31 16:25:27 UTC (rev 53805)
+++ trunk/tests/phpunit/tests/actions.php 2022-07-31 16:41:53 UTC (rev 53806)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +351,43 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = $a->get_args();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $args[1][0], $context2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 10493
+ *
+ * @covers ::add_action
+ * @covers ::has_action
+ * @covers ::do_action
+ */
+ public function test_action_closure() {
+ $hook_name = 'test_action_closure';
+ $closure = static function( $a, $b ) {
+ $GLOBALS[ $a ] = $b;
+ };
+ add_action( $hook_name, $closure, 10, 2 );
+
+ $this->assertSame( 10, has_action( $hook_name, $closure ) );
+
+ $context = array( 'val1', 'val2' );
+ do_action( $hook_name, $context[0], $context[1] );
+
+ $this->assertSame( $GLOBALS[ $context[0] ], $context[1] );
+
+ $hook_name2 = 'test_action_closure_2';
+ $closure2 = static function() {
+ $GLOBALS['closure_no_args'] = true;
+ };
+ add_action( $hook_name2, $closure2 );
+
+ $this->assertSame( 10, has_action( $hook_name2, $closure2 ) );
+
+ do_action( $hook_name2 );
+
+ $this->assertTrue( $GLOBALS['closure_no_args'] );
+
+ remove_action( $hook_name, $closure );
+ remove_action( $hook_name2, $closure2 );
</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></pre>
</div>
</div>
</body>
</html>