<!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>[53890] trunk/tests/phpunit/tests: Tests: Bring some consistency to serialization tests.</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/53890">53890</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/53890","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-08-13 12:09:41 +0000 (Sat, 13 Aug 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: Bring some consistency to serialization tests.
There were two sets of tests for `is_serialized()`:
* One in the `functions.php` file, based on the same file name in core.
* One in a separate class in the `functions` directory.
To avoid confusion and make it easier to decide where new tests should go in the future, the existing tests are now combined in the latter location.
Includes:
* Moving `is_serialized()` and `maybe_serialize()` tests into their own classes.
* Using named data providers to make test output more descriptive.
* Combining test cases and removing duplicates.
Follow-up to [278/tests], [279/tests], [328/tests], <a href="https://core.trac.wordpress.org/changeset/32631">[32631]</a>, <a href="https://core.trac.wordpress.org/changeset/45754">[45754]</a>, <a href="https://core.trac.wordpress.org/changeset/47452">[47452]</a>, <a href="https://core.trac.wordpress.org/changeset/49382">[49382]</a>, <a href="https://core.trac.wordpress.org/changeset/53886">[53886]</a>, <a href="https://core.trac.wordpress.org/changeset/53889">[53889]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsisSerializedphp">trunk/tests/phpunit/tests/functions/isSerialized.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsisSerializedStringphp">trunk/tests/phpunit/tests/functions/isSerializedString.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsmaybeSerializephp">trunk/tests/phpunit/tests/functions/maybeSerialize.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionsisSerializedphp"></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/functions/isSerialized.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/isSerialized.php 2022-08-12 13:22:25 UTC (rev 53889)
+++ trunk/tests/phpunit/tests/functions/isSerialized.php 2022-08-13 12:09:41 UTC (rev 53890)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,76 +11,197 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Functions_IsSerialized extends WP_UnitTestCase {
</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">- * Run tests on `is_serialized()`.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_is_serialized
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_is_not_serialized
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $data Data value to test.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $expected Expected function result.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_is_serialized_string( $data, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_is_serialized( $data, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, is_serialized( $data ) );
</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">- * Data provider method for testing `is_serialized()`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Data provider for `test_is_serialized()`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_is_serialized() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'an array' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'serialized empty array' => array(
+ 'data' => serialize( array() ),
+ 'expected' => true,
+ ),
+ 'serialized non-empty array' => array(
+ 'data' => serialize( array( 1, 1, 2, 3, 5, 8, 13 ) ),
+ 'expected' => true,
+ ),
+ 'serialized empty object' => array(
+ 'data' => serialize( new stdClass() ),
+ 'expected' => true,
+ ),
+ 'serialized non-empty object' => array(
+ 'data' => serialize(
+ (object) array(
+ 'test' => true,
+ '1',
+ 2,
+ )
+ ),
+ 'expected' => true,
+ ),
+ 'serialized null' => array(
+ 'data' => serialize( null ),
+ 'expected' => true,
+ ),
+ 'serialized boolean true' => array(
+ 'data' => serialize( true ),
+ 'expected' => true,
+ ),
+ 'serialized boolean false' => array(
+ 'data' => serialize( false ),
+ 'expected' => true,
+ ),
+ 'serialized integer -1' => array(
+ 'data' => serialize( -1 ),
+ 'expected' => true,
+ ),
+ 'serialized integer 1' => array(
+ 'data' => serialize( -1 ),
+ 'expected' => true,
+ ),
+ 'serialized float 1.1' => array(
+ 'data' => serialize( 1.1 ),
+ 'expected' => true,
+ ),
+ 'serialized string' => array(
+ 'data' => serialize( 'this string will be serialized' ),
+ 'expected' => true,
+ ),
+ 'serialized string with line break' => array(
+ 'data' => serialize( "a\nb" ),
+ 'expected' => true,
+ ),
+ 'serialized string with leading and trailing spaces' => array(
+ 'data' => ' s:25:"this string is serialized"; ',
+ 'expected' => true,
+ ),
+ 'serialized enum' => array(
+ 'data' => 'E:7:"Foo:bar";',
+ 'expected' => true,
+ ),
+ );
+ }
+
+ /**
+ * Data provider for `test_is_serialized()`.
+ *
+ * @return array
+ */
+ public function data_is_not_serialized() {
+ return array(
+ 'an empty array' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'an object' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a non-empty array' => array(
+ 'data' => array( 1, 1, 2, 3, 5, 8, 13 ),
+ 'expected' => false,
+ ),
+ 'an empty object' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => new stdClass(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a boolean false' => array(
- 'data' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a non-empty object' => array(
+ 'data' => (object) array(
+ 'test' => true,
+ '1',
+ 2,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a boolean true' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'null' => array(
+ 'data' => null,
+ 'expected' => false,
+ ),
+ 'a boolean true' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'an integer 0' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a boolean false' => array(
+ 'data' => false,
+ 'expected' => false,
+ ),
+ 'an integer -1' => array(
+ 'data' => -1,
+ 'expected' => false,
+ ),
+ 'an integer 0' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'an integer 1' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'an integer 1' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a float 0.0' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a float 0.0' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => 0.0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a float 1.0' => array(
- 'data' => 1.0,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a float 1.1' => array(
+ 'data' => 1.1,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'string that is too short' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a string' => array(
+ 'data' => 'a string',
+ 'expected' => false,
+ ),
+ 'a string with line break' => array(
+ 'data' => "a\nb",
+ 'expected' => false,
+ ),
+ 'a string with leading and trailing garbage' => array(
+ 'data' => 'garbage:a:0:garbage;',
+ 'expected' => false,
+ ),
+ 'a string with missing double quotes' => array(
+ 'data' => 's:4:test;',
+ 'expected' => false,
+ ),
+ 'a string that is too short' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => 's:3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'not a colon in second position' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'not a colon in second position' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => 's!3:"foo";',
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'no trailing semicolon (strict check)' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'no trailing semicolon (strict check)' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => 's:3:"foo"',
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'valid serialized null' => array(
- 'data' => 'N;',
- 'expected' => true,
- ),
- 'valid serialized Enum' => array(
- 'data' => 'E:7:"Foo:bar";',
- 'expected' => true,
- ),
</del><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 46570
+ * @dataProvider data_is_serialized_should_return_true_for_large_floats
+ */
+ public function test_is_serialized_should_return_true_for_large_floats( $value ) {
+ $this->assertTrue( is_serialized( $value ) );
+ }
+
+ public function data_is_serialized_should_return_true_for_large_floats() {
+ return array(
+ array( serialize( 1.7976931348623157E+308 ) ),
+ array( serialize( array( 1.7976931348623157E+308, 1.23e50 ) ) ),
+ );
+ }
+
+ /**
+ * @ticket 17375
+ */
+ public function test_no_new_serializable_types() {
+ $this->assertFalse( is_serialized( 'C:16:"Serialized_Class":6:{a:0:{}}' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsisSerializedStringphp"></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/functions/isSerializedString.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/isSerializedString.php 2022-08-12 13:22:25 UTC (rev 53889)
+++ trunk/tests/phpunit/tests/functions/isSerializedString.php 2022-08-13 12:09:41 UTC (rev 53890)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a class' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'an object' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => new stdClass(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsmaybeSerializephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/functions/maybeSerialize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/maybeSerialize.php (rev 0)
+++ trunk/tests/phpunit/tests/functions/maybeSerialize.php 2022-08-13 12:09:41 UTC (rev 53890)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,246 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Tests for `maybe_serialize()` and `maybe_unserialize()`.
+ *
+ * @group functions.php
+ * @covers ::maybe_serialize
+ * @covers ::maybe_unserialize
+ */
+class Tests_Functions_MaybeSerialize extends WP_UnitTestCase {
+
+ /**
+ * @dataProvider data_is_not_serialized
+ */
+ public function test_maybe_serialize( $value ) {
+ if ( is_array( $value ) || is_object( $value ) ) {
+ $expected = serialize( $value );
+ } else {
+ $expected = $value;
+ }
+
+ $this->assertSame( $expected, maybe_serialize( $value ) );
+ }
+
+ /**
+ * @dataProvider data_is_serialized
+ */
+ public function test_maybe_serialize_with_double_serialization( $value ) {
+ $expected = serialize( $value );
+
+ $this->assertSame( $expected, maybe_serialize( $value ) );
+ }
+
+ /**
+ * @dataProvider data_is_serialized
+ * @dataProvider data_is_not_serialized
+ */
+ public function test_maybe_unserialize( $value, $is_serialized ) {
+ if ( $is_serialized ) {
+ $expected = unserialize( trim( $value ) );
+ } else {
+ $expected = $value;
+ }
+
+ if ( is_object( $expected ) ) {
+ $this->assertEquals( $expected, maybe_unserialize( $value ) );
+ } else {
+ $this->assertSame( $expected, maybe_unserialize( $value ) );
+ }
+ }
+
+ /**
+ * Data provider for `test_maybe_unserialize()`.
+ *
+ * @return array
+ */
+ public function data_is_serialized() {
+ return array(
+ 'serialized empty array' => array(
+ 'data' => serialize( array() ),
+ 'expected' => true,
+ ),
+ 'serialized non-empty array' => array(
+ 'data' => serialize( array( 1, 1, 2, 3, 5, 8, 13 ) ),
+ 'expected' => true,
+ ),
+ 'serialized empty object' => array(
+ 'data' => serialize( new stdClass() ),
+ 'expected' => true,
+ ),
+ 'serialized non-empty object' => array(
+ 'data' => serialize(
+ (object) array(
+ 'test' => true,
+ '1',
+ 2,
+ )
+ ),
+ 'expected' => true,
+ ),
+ 'serialized null' => array(
+ 'data' => serialize( null ),
+ 'expected' => true,
+ ),
+ 'serialized boolean true' => array(
+ 'data' => serialize( true ),
+ 'expected' => true,
+ ),
+ 'serialized boolean false' => array(
+ 'data' => serialize( false ),
+ 'expected' => true,
+ ),
+ 'serialized integer -1' => array(
+ 'data' => serialize( -1 ),
+ 'expected' => true,
+ ),
+ 'serialized integer 1' => array(
+ 'data' => serialize( -1 ),
+ 'expected' => true,
+ ),
+ 'serialized float 1.1' => array(
+ 'data' => serialize( 1.1 ),
+ 'expected' => true,
+ ),
+ 'serialized string' => array(
+ 'data' => serialize( 'this string will be serialized' ),
+ 'expected' => true,
+ ),
+ 'serialized string with line break' => array(
+ 'data' => serialize( "a\nb" ),
+ 'expected' => true,
+ ),
+ 'serialized string with leading and trailing spaces' => array(
+ 'data' => ' s:25:"this string is serialized"; ',
+ 'expected' => true,
+ ),
+ );
+ }
+
+ /**
+ * Data provider for `test_maybe_serialize()`.
+ *
+ * @return array
+ */
+ public function data_is_not_serialized() {
+ return array(
+ 'an empty array' => array(
+ 'data' => array(),
+ 'expected' => false,
+ ),
+ 'a non-empty array' => array(
+ 'data' => array( 1, 1, 2, 3, 5, 8, 13 ),
+ 'expected' => false,
+ ),
+ 'an empty object' => array(
+ 'data' => new stdClass(),
+ 'expected' => false,
+ ),
+ 'a non-empty object' => array(
+ 'data' => (object) array(
+ 'test' => true,
+ '1',
+ 2,
+ ),
+ 'expected' => false,
+ ),
+ 'null' => array(
+ 'data' => null,
+ 'expected' => false,
+ ),
+ 'a boolean true' => array(
+ 'data' => true,
+ 'expected' => false,
+ ),
+ 'a boolean false' => array(
+ 'data' => false,
+ 'expected' => false,
+ ),
+ 'an integer -1' => array(
+ 'data' => -1,
+ 'expected' => false,
+ ),
+ 'an integer 0' => array(
+ 'data' => 0,
+ 'expected' => false,
+ ),
+ 'an integer 1' => array(
+ 'data' => 1,
+ 'expected' => false,
+ ),
+ 'a float 0.0' => array(
+ 'data' => 0.0,
+ 'expected' => false,
+ ),
+ 'a float 1.1' => array(
+ 'data' => 1.1,
+ 'expected' => false,
+ ),
+ 'a string' => array(
+ 'data' => 'a string',
+ 'expected' => false,
+ ),
+ 'a string with line break' => array(
+ 'data' => "a\nb",
+ 'expected' => false,
+ ),
+ 'a string with leading and trailing garbage' => array(
+ 'data' => 'garbage:a:0:garbage;',
+ 'expected' => false,
+ ),
+ 'a string with missing double quotes' => array(
+ 'data' => 's:4:test;',
+ 'expected' => false,
+ ),
+ 'a string that is too short' => array(
+ 'data' => 's:3',
+ 'expected' => false,
+ ),
+ 'not a colon in second position' => array(
+ 'data' => 's!3:"foo";',
+ 'expected' => false,
+ ),
+ 'no trailing semicolon (strict check)' => array(
+ 'data' => 's:3:"foo"',
+ 'expected' => false,
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider data_serialize_deserialize_objects
+ */
+ public function test_deserialize_request_utility_filtered_iterator_objects( $value ) {
+ $serialized = maybe_serialize( $value );
+
+ if ( get_class( $value ) === 'Requests_Utility_FilteredIterator' ) {
+ $new_value = unserialize( $serialized );
+ $property = ( new ReflectionClass( 'Requests_Utility_FilteredIterator' ) )->getProperty( 'callback' );
+ $property->setAccessible( true );
+ $callback_value = $property->getValue( $new_value );
+
+ $this->assertSame( null, $callback_value );
+ } else {
+ $this->assertSame( $value->count(), unserialize( $serialized )->count() );
+ }
+ }
+
+ /**
+ * Data provider for test_deserialize_request_utility_filtered_iterator_objects().
+ *
+ * @return array
+ */
+ public function data_serialize_deserialize_objects() {
+ return array(
+ 'filtered iterator using md5' => array(
+ new Requests_Utility_FilteredIterator( array( 1 ), 'md5' ),
+ ),
+ 'filtered iterator using sha1' => array(
+ new Requests_Utility_FilteredIterator( array( 1, 2 ), 'sha1' ),
+ ),
+ 'array iterator' => array(
+ new ArrayIterator( array( 1, 2, 3 ) ),
+ ),
+ );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/functions/maybeSerialize.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunittestsfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2022-08-12 13:22:25 UTC (rev 53889)
+++ trunk/tests/phpunit/tests/functions.php 2022-08-13 12:09:41 UTC (rev 53890)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,152 +374,6 @@
</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">- * @dataProvider data_is_not_serialized
- */
- public function test_maybe_serialize( $value ) {
- if ( is_array( $value ) || is_object( $value ) ) {
- $expected = serialize( $value );
- } else {
- $expected = $value;
- }
-
- $this->assertSame( $expected, maybe_serialize( $value ) );
- }
-
- /**
- * @dataProvider data_is_serialized
- */
- public function test_maybe_serialize_with_double_serialization( $value ) {
- $expected = serialize( $value );
-
- $this->assertSame( $expected, maybe_serialize( $value ) );
- }
-
- /**
- * @dataProvider data_is_serialized
- * @dataProvider data_is_not_serialized
- */
- public function test_maybe_unserialize( $value, $is_serialized ) {
- if ( $is_serialized ) {
- $expected = unserialize( trim( $value ) );
- } else {
- $expected = $value;
- }
-
- if ( is_object( $expected ) ) {
- $this->assertEquals( $expected, maybe_unserialize( $value ) );
- } else {
- $this->assertSame( $expected, maybe_unserialize( $value ) );
- }
- }
-
- /**
- * @dataProvider data_is_serialized
- * @dataProvider data_is_not_serialized
- */
- public function test_is_serialized( $value, $expected ) {
- $this->assertSame( $expected, is_serialized( $value ) );
- }
-
- /**
- * @dataProvider data_serialize_deserialize_objects
- */
- public function test_deserialize_request_utility_filtered_iterator_objects( $value ) {
- $serialized = maybe_serialize( $value );
- if ( get_class( $value ) === 'Requests_Utility_FilteredIterator' ) {
- $new_value = unserialize( $serialized );
- $property = ( new ReflectionClass( 'Requests_Utility_FilteredIterator' ) )->getProperty( 'callback' );
- $property->setAccessible( true );
- $callback_value = $property->getValue( $new_value );
- $this->assertSame( null, $callback_value );
- } else {
- $this->assertSame( $value->count(), unserialize( $serialized )->count() );
- }
- }
-
- public function data_serialize_deserialize_objects() {
- return array(
- array( new Requests_Utility_FilteredIterator( array( 1 ), 'md5' ) ),
- array( new Requests_Utility_FilteredIterator( array( 1, 2 ), 'sha1' ) ),
- array( new ArrayIterator( array( 1, 2, 3 ) ) ),
- );
- }
-
- public function data_is_serialized() {
- return array(
- array( serialize( null ), true ),
- array( serialize( true ), true ),
- array( serialize( false ), true ),
- array( serialize( -25 ), true ),
- array( serialize( 25 ), true ),
- array( serialize( 1.1 ), true ),
- array( serialize( 'this string will be serialized' ), true ),
- array( serialize( "a\nb" ), true ),
- array( serialize( array() ), true ),
- array( serialize( array( 1, 1, 2, 3, 5, 8, 13 ) ), true ),
- array(
- serialize(
- (object) array(
- 'test' => true,
- '3',
- 4,
- )
- ),
- true,
- ),
- array( ' s:25:"this string is serialized"; ', true ),
- );
- }
-
- public function data_is_not_serialized() {
- return array(
- array( null, false ),
- array( true, false ),
- array( false, false ),
- array( -25, false ),
- array( 25, false ),
- array( 1.1, false ),
- array( 'this string will be serialized', false ),
- array( "a\nb", false ),
- array( array(), false ),
- array( array( 1, 1, 2, 3, 5, 8, 13 ), false ),
- array(
- (object) array(
- 'test' => true,
- '3',
- 4,
- ),
- false,
- ),
- array( 'a string', false ),
- array( 'garbage:a:0:garbage;', false ),
- array( 's:4:test;', false ),
- );
- }
-
- /**
- * @ticket 46570
- * @dataProvider data_is_serialized_should_return_true_for_large_floats
- */
- public function test_is_serialized_should_return_true_for_large_floats( $value ) {
- $this->assertTrue( is_serialized( $value ) );
- }
-
- public function data_is_serialized_should_return_true_for_large_floats() {
- return array(
- array( serialize( 1.7976931348623157E+308 ) ),
- array( serialize( array( 1.7976931348623157E+308, 1.23e50 ) ) ),
- );
- }
-
- /**
- * @ticket 17375
- */
- public function test_no_new_serializable_types() {
- $this->assertFalse( is_serialized( 'C:16:"Serialized_Class":6:{a:0:{}}' ) );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @group add_query_arg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_query_arg() {
</span></span></pre>
</div>
</div>
</body>
</html>