<!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>[37962] trunk: General: Return "O B" when passing 0 to `size_format()`.</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 { 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/37962">37962</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/37962","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-07-05 10:35:24 +0000 (Tue, 05 Jul 2016)</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'>General: Return "O B" when passing 0 to `size_format()`.
Props swissspidy.
Fixes <a href="https://core.trac.wordpress.org/ticket/36635">#36635</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionssizeFormatphp">trunk/tests/phpunit/tests/functions/sizeFormat.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2016-07-04 22:44:10 UTC (rev 37961)
+++ trunk/src/wp-includes/functions.php 2016-07-05 10:35:24 UTC (rev 37962)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,6 +263,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'B' => 1,
</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 ( 0 === $bytes ) {
+ return number_format_i18n( 0, $decimals ) . ' B';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $quant as $unit => $mag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( doubleval( $bytes ) >= $mag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit;
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionssizeFormatphp"></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/sizeFormat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/sizeFormat.php (rev 0)
+++ trunk/tests/phpunit/tests/functions/sizeFormat.php 2016-07-05 10:35:24 UTC (rev 37962)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,52 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Tests for size_format()
+ *
+ * @group functions.php
+ * @ticket 36635
+ */
+class Tests_Functions_Size_Format extends WP_UnitTestCase {
+ public function _data_size_format() {
+ return array(
+ array( array(), 0, false ),
+ array( 'baba', 0, false ),
+ array( '', 0, false ),
+ array( '-1', 0, false ),
+ array( -1, 0, false ),
+ array( 0, 0, '0 B' ),
+ array( 1, 0, '1 B' ),
+ array( 1023, 0, '1,023 B' ),
+ array( KB_IN_BYTES, 0, '1 KB' ),
+ array( KB_IN_BYTES, 2, '1.00 KB' ),
+ array( 2.5 * KB_IN_BYTES, 0, '3 KB' ),
+ array( 2.5 * KB_IN_BYTES, 2, '2.50 KB' ),
+ array( 10 * KB_IN_BYTES, 0, '10 KB' ),
+ array( (string) 1024 * KB_IN_BYTES, 2, '1.00 MB' ),
+ array( MB_IN_BYTES, 0, '1 MB' ),
+ array( 2.5 * MB_IN_BYTES, 0, '3 MB' ),
+ array( 2.5 * MB_IN_BYTES, 2, '2.50 MB' ),
+ array( (string) 1024 * MB_IN_BYTES, 2, '1.00 GB' ),
+ array( GB_IN_BYTES, 0, '1 GB' ),
+ array( 2.5 * GB_IN_BYTES, 0, '3 GB' ),
+ array( 2.5 * GB_IN_BYTES, 2, '2.50 GB' ),
+ array( (string) 1024 * GB_IN_BYTES, 2, '1.00 TB' ),
+ array( TB_IN_BYTES, 0, '1 TB' ),
+ array( 2.5 * TB_IN_BYTES, 0, '3 TB' ),
+ array( 2.5 * TB_IN_BYTES, 2, '2.50 TB' ),
+ array( TB_IN_BYTES + (TB_IN_BYTES/2) + MB_IN_BYTES, 1, '1.5 TB' ),
+ array( TB_IN_BYTES - MB_IN_BYTES - KB_IN_BYTES, 3, '1,023.999 GB' ),
+ );
+ }
+
+ /**
+ * @dataProvider _data_size_format
+ *
+ * @param $bytes
+ * @param $decimals
+ * @param $expected
+ */
+ public function test_size_format( $bytes, $decimals, $expected ) {
+ $this->assertSame( $expected, size_format( $bytes, $decimals ) );
+ }
+}
</ins></span></pre></div>
<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 2016-07-04 22:44:10 UTC (rev 37961)
+++ trunk/tests/phpunit/tests/functions.php 2016-07-05 10:35:24 UTC (rev 37962)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,28 +51,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'string', $args['bar'] );
</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">- function test_size_format() {
- $b = 1;
- $kb = 1024;
- $mb = $kb*1024;
- $gb = $mb*1024;
- $tb = $gb*1024;
- // test if boundaries are correct
- $this->assertEquals('1 GB', size_format($gb, 0));
- $this->assertEquals('1 MB', size_format($mb, 0));
- $this->assertEquals('1 KB', size_format($kb, 0));
- $this->assertEquals('1 B', size_format($b, 0));
- // now some values around
- // add some bytes to make sure the result isn't 1.4999999
- $this->assertEquals('1.5 TB', size_format($tb + $tb/2 + $mb, 1));
- $this->assertEquals('1,023.999 GB', size_format($tb-$mb-$kb, 3));
- // edge
- $this->assertFalse(size_format(-1));
- $this->assertFalse(size_format(0));
- $this->assertFalse(size_format('baba'));
- $this->assertFalse(size_format(array()));
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35972
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>