<!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>[26500] trunk: Fix strict notices in Tests_POMO_PO.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26500">26500</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-12-01 12:47:35 +0000 (Sun, 01 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix strict notices in Tests_POMO_PO.
props markoheijnen for initial patch.
fixes <a href="http://core.trac.wordpress.org/ticket/25631">#25631</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespomopophp">trunk/src/wp-includes/pomo/po.php</a></li>
<li><a href="#trunktestsphpunittestspomopophp">trunk/tests/phpunit/tests/pomo/po.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespomopophp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/pomo/po.php (26499 => 26500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/pomo/po.php 2013-12-01 11:57:31 UTC (rev 26499)
+++ trunk/src/wp-includes/pomo/po.php 2013-12-01 12:47:35 UTC (rev 26500)
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> // add comment
</span><del>- $this->add_comment_to_entry($entry, $line);;
</del><ins>+ $this->add_comment_to_entry($entry, $line);
</ins><span class="cx"> } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
</span><span class="cx"> if ($is_final($context)) {
</span><span class="cx"> PO::read_line($f, 'put-back');
</span></span></pre></div>
<a id="trunktestsphpunittestspomopophp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/pomo/po.php (26499 => 26500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/pomo/po.php 2013-12-01 11:57:31 UTC (rev 26499)
+++ trunk/tests/phpunit/tests/pomo/po.php 2013-12-01 12:47:35 UTC (rev 26500)
</span><span class="lines">@@ -37,57 +37,61 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_prepend_each_line() {
</span><del>- $this->assertEquals('baba_', @PO::prepend_each_line('', 'baba_'));
- $this->assertEquals('baba_dyado', @PO::prepend_each_line('dyado', 'baba_'));
- $this->assertEquals("# baba\n# dyado\n# \n", @PO::prepend_each_line("baba\ndyado\n\n", '# '));
</del><ins>+ $po = new PO();
+ $this->assertEquals('baba_', $po->prepend_each_line('', 'baba_'));
+ $this->assertEquals('baba_dyado', $po->prepend_each_line('dyado', 'baba_'));
+ $this->assertEquals("# baba\n# dyado\n# \n", $po->prepend_each_line("baba\ndyado\n\n", '# '));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_poify() {
</span><ins>+ $po = new PO();
</ins><span class="cx"> //simple
</span><del>- $this->assertEquals('"baba"', @PO::poify('baba'));
</del><ins>+ $this->assertEquals('"baba"', $po->poify('baba'));
</ins><span class="cx"> //long word
</span><del>- $this->assertEquals($this->po_a90, @PO::poify($this->a90));
</del><ins>+ $this->assertEquals($this->po_a90, $po->poify($this->a90));
</ins><span class="cx"> // tab
</span><del>- $this->assertEquals('"ba\tba"', @PO::poify("ba\tba"));
</del><ins>+ $this->assertEquals('"ba\tba"', $po->poify("ba\tba"));
</ins><span class="cx"> // do not add leading empty string of one-line string ending on a newline
</span><del>- $this->assertEquals('"\\\\a\\\\n\\n"', @PO::poify("\a\\n\n"));
</del><ins>+ $this->assertEquals('"\\\\a\\\\n\\n"', $po->poify("\a\\n\n"));
</ins><span class="cx"> // backslash
</span><del>- $this->assertEquals('"ba\\\\ba"', @PO::poify('ba\\ba'));
</del><ins>+ $this->assertEquals('"ba\\\\ba"', $po->poify('ba\\ba'));
</ins><span class="cx"> // random wordpress.pot string
</span><span class="cx"> $src = 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.';
</span><del>- $this->assertEquals("\"Categories can be selectively converted to tags using the <a href=\\\"%s\\\">category to tag converter</a>.\"", @PO::poify($src));
</del><ins>+ $this->assertEquals("\"Categories can be selectively converted to tags using the <a href=\\\"%s\\\">category to tag converter</a>.\"", $po->poify($src));
</ins><span class="cx">
</span><del>- $this->assertEquals($this->po_mail, @PO::poify($this->mail));
</del><ins>+ $this->assertEquals($this->po_mail, $po->poify($this->mail));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_unpoify() {
</span><del>- $this->assertEquals('baba', @PO::unpoify('"baba"'));
- $this->assertEquals("baba\ngugu", @PO::unpoify('"baba\n"'."\t\t\t\n".'"gugu"'));
- $this->assertEquals($this->a90, @PO::unpoify($this->po_a90));
- $this->assertEquals('\\t\\n', @PO::unpoify('"\\\\t\\\\n"'));
</del><ins>+ $po = new PO();
+ $this->assertEquals('baba', $po->unpoify('"baba"'));
+ $this->assertEquals("baba\ngugu", $po->unpoify('"baba\n"'."\t\t\t\n".'"gugu"'));
+ $this->assertEquals($this->a90, $po->unpoify($this->po_a90));
+ $this->assertEquals('\\t\\n', $po->unpoify('"\\\\t\\\\n"'));
</ins><span class="cx"> // wordwrapped
</span><del>- $this->assertEquals('babadyado', @PO::unpoify("\"\"\n\"baba\"\n\"dyado\""));
- $this->assertEquals($this->mail, @PO::unpoify($this->po_mail));
</del><ins>+ $this->assertEquals('babadyado', $po->unpoify("\"\"\n\"baba\"\n\"dyado\""));
+ $this->assertEquals($this->mail, $po->unpoify($this->po_mail));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_export_entry() {
</span><ins>+ $po = new PO();
</ins><span class="cx"> $entry = new Translation_Entry(array('singular' => 'baba'));
</span><del>- $this->assertEquals("msgid \"baba\"\nmsgstr \"\"", @PO::export_entry($entry));
</del><ins>+ $this->assertEquals("msgid \"baba\"\nmsgstr \"\"", $po->export_entry($entry));
</ins><span class="cx"> // plural
</span><span class="cx"> $entry = new Translation_Entry(array('singular' => 'baba', 'plural' => 'babas'));
</span><span class="cx"> $this->assertEquals('msgid "baba"
</span><span class="cx"> msgid_plural "babas"
</span><span class="cx"> msgstr[0] ""
</span><del>-msgstr[1] ""', @PO::export_entry($entry));
</del><ins>+msgstr[1] ""', $po->export_entry($entry));
</ins><span class="cx"> $entry = new Translation_Entry(array('singular' => 'baba', 'translator_comments' => "baba\ndyado"));
</span><span class="cx"> $this->assertEquals('# baba
</span><span class="cx"> # dyado
</span><span class="cx"> msgid "baba"
</span><del>-msgstr ""', @PO::export_entry($entry));
</del><ins>+msgstr ""', $po->export_entry($entry));
</ins><span class="cx"> $entry = new Translation_Entry(array('singular' => 'baba', 'extracted_comments' => "baba"));
</span><span class="cx"> $this->assertEquals('#. baba
</span><span class="cx"> msgid "baba"
</span><del>-msgstr ""', @PO::export_entry($entry));
</del><ins>+msgstr ""', $po->export_entry($entry));
</ins><span class="cx"> $entry = new Translation_Entry(array(
</span><span class="cx"> 'singular' => 'baba',
</span><span class="cx"> 'extracted_comments' => "baba",
</span><span class="lines">@@ -96,24 +100,24 @@
</span><span class="cx"> #: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
</span><span class="cx"> #: 29
</span><span class="cx"> msgid "baba"
</span><del>-msgstr ""', @PO::export_entry($entry));
</del><ins>+msgstr ""', $po->export_entry($entry));
</ins><span class="cx"> $entry = new Translation_Entry(array('singular' => 'baba', 'translations' => array()));
</span><del>- $this->assertEquals("msgid \"baba\"\nmsgstr \"\"", @PO::export_entry($entry));
</del><ins>+ $this->assertEquals("msgid \"baba\"\nmsgstr \"\"", $po->export_entry($entry));
</ins><span class="cx">
</span><span class="cx"> $entry = new Translation_Entry(array('singular' => 'baba', 'translations' => array('куку', 'буку')));
</span><del>- $this->assertEquals("msgid \"baba\"\nmsgstr \"куку\"", @PO::export_entry($entry));
</del><ins>+ $this->assertEquals("msgid \"baba\"\nmsgstr \"куку\"", $po->export_entry($entry));
</ins><span class="cx">
</span><span class="cx"> $entry = new Translation_Entry(array('singular' => 'baba', 'plural' => 'babas', 'translations' => array('кукубуку')));
</span><span class="cx"> $this->assertEquals('msgid "baba"
</span><span class="cx"> msgid_plural "babas"
</span><del>-msgstr[0] "кукубуку"', @PO::export_entry($entry));
</del><ins>+msgstr[0] "кукубуку"', $po->export_entry($entry));
</ins><span class="cx">
</span><span class="cx"> $entry = new Translation_Entry(array('singular' => 'baba', 'plural' => 'babas', 'translations' => array('кукубуку', 'кукуруку', 'бабаяга')));
</span><span class="cx"> $this->assertEquals('msgid "baba"
</span><span class="cx"> msgid_plural "babas"
</span><span class="cx"> msgstr[0] "кукубуку"
</span><span class="cx"> msgstr[1] "кукуруку"
</span><del>-msgstr[2] "бабаяга"', @PO::export_entry($entry));
</del><ins>+msgstr[2] "бабаяга"', $po->export_entry($entry));
</ins><span class="cx"> // context
</span><span class="cx"> $entry = new Translation_Entry(array('context' => 'ctxt', 'singular' => 'baba', 'plural' => 'babas', 'translations' => array('кукубуку', 'кукуруку', 'бабаяга'), 'flags' => array('fuzzy', 'php-format')));
</span><span class="cx"> $this->assertEquals('#, fuzzy, php-format
</span><span class="lines">@@ -122,7 +126,7 @@
</span><span class="cx"> msgid_plural "babas"
</span><span class="cx"> msgstr[0] "кукубуку"
</span><span class="cx"> msgstr[1] "кукуруку"
</span><del>-msgstr[2] "бабаяга"', @PO::export_entry($entry));
</del><ins>+msgstr[2] "бабаяга"', $po->export_entry($entry));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_export_entries() {
</span></span></pre>
</div>
</div>
</body>
</html>