<!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>[39591] trunk/src/wp-includes: General: Remove most uses of create_function()</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/39591">39591</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/39591","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>rmccue</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-12-13 01:48:41 +0000 (Tue, 13 Dec 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: Remove most uses of create_function()
create_function() is equivalent to eval(), and most of our uses can be refactored. This is simpler, more secure, and slightly more performant.
Props sgolemon.
Fixes <a href="https://core.trac.wordpress.org/ticket/37082">#37082</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesatomlibphp">trunk/src/wp-includes/atomlib.php</a></li>
<li><a href="#trunksrcwpincludespomopophp">trunk/src/wp-includes/pomo/po.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesatomlibphp"></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/atomlib.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/atomlib.php 2016-12-12 23:17:35 UTC (rev 39590)
+++ trunk/src/wp-includes/atomlib.php 2016-12-13 01:48:41 UTC (rev 39591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,8 +94,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->feed = new AtomFeed();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->current = null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";');
- $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->map_attrs_func = array( __CLASS__, 'map_attrs' );
+ $this->map_xmlns_func = array( __CLASS__, 'map_xmlns' );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +105,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::__construct();
</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">+ /**
+ * Map attributes to key="val"
+ *
+ * @param string $k Key
+ * @param string $v Value
+ * @return string
+ */
+ public static function map_attrs($k, $v) {
+ return "$k=\"$v\"";
+ }
+
+ /**
+ * Map XML namespace to string.
+ *
+ * @param indexish $p XML Namespace element index
+ * @param array $n Two-element array pair. [ 0 => {namespace}, 1 => {url} ]
+ * @return string 'xmlns="{url}"' or 'xmlns:{namespace}="{url}"'
+ */
+ public static function map_xmlns($p, $n) {
+ $xd = "xmlns";
+ if( 0 < strlen($n[0]) ) {
+ $xd .= ":{$n[0]}";
+ }
+ return "{$xd}=\"{$n[1]}\"";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function _p($msg) {
</span><span class="cx" style="display: block; padding: 0 10px"> if($this->debug) {
</span><span class="cx" style="display: block; padding: 0 10px"> print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
</span></span></pre></div>
<a id="trunksrcwpincludespomopophp"></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/pomo/po.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/po.php 2016-12-12 23:17:35 UTC (rev 39590)
+++ trunk/src/wp-includes/pomo/po.php 2016-12-13 01:48:41 UTC (rev 39591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,14 +167,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $with prepend lines with this string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function prepend_each_line($string, $with) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $php_with = var_export($with, true);
</del><span class="cx" style="display: block; padding: 0 10px"> $lines = explode("\n", $string);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // do not prepend the string on the last empty line, artefact by explode
- if ("\n" == substr($string, -1)) unset($lines[count($lines) - 1]);
- $res = implode("\n", array_map(create_function('$x', "return $php_with.\$x;"), $lines));
- // give back the empty line, we ignored above
- if ("\n" == substr($string, -1)) $res .= "\n";
- return $res;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $append = '';
+ if ('' === end($lines)) {
+ // Last line might be empty because $string was terminated
+ // with a newline, remove it from the $lines array,
+ // we'll restore state by re-terminating the string at the end
+ array_pop($lines);
+ $append = "\n";
+ }
+ foreach ($lines as &$line) {
+ $line = $with . $line;
+ }
+ unset($line);
+ return implode("\n", $lines) . $append;
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,6 +286,15 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Helper function for read_entry
+ * @param string $context
+ * @return bool
+ */
+ protected static function is_final($context) {
+ return ($context === 'msgstr') || ($context === 'msgstr_plural');
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param resource $f
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $lineno
</span><span class="cx" style="display: block; padding: 0 10px"> * @return null|false|array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,13 +305,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural
</span><span class="cx" style="display: block; padding: 0 10px"> $context = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $msgstr_index = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_final = create_function('$context', 'return $context == "msgstr" || $context == "msgstr_plural";');
</del><span class="cx" style="display: block; padding: 0 10px"> while (true) {
</span><span class="cx" style="display: block; padding: 0 10px"> $lineno++;
</span><span class="cx" style="display: block; padding: 0 10px"> $line = PO::read_line($f);
</span><span class="cx" style="display: block; padding: 0 10px"> if (!$line) {
</span><span class="cx" style="display: block; padding: 0 10px"> if (feof($f)) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($is_final($context))
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (self::is_final($context))
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> elseif (!$context) // we haven't read a line and eof came
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +324,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $line = trim($line);
</span><span class="cx" style="display: block; padding: 0 10px"> if (preg_match('/^#/', $line, $m)) {
</span><span class="cx" style="display: block; padding: 0 10px"> // the comment is the start of a new entry
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($is_final($context)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (self::is_final($context)) {
</ins><span class="cx" style="display: block; padding: 0 10px"> PO::read_line($f, 'put-back');
</span><span class="cx" style="display: block; padding: 0 10px"> $lineno--;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // add comment
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_comment_to_entry($entry, $line);
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($is_final($context)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (self::is_final($context)) {
</ins><span class="cx" style="display: block; padding: 0 10px"> PO::read_line($f, 'put-back');
</span><span class="cx" style="display: block; padding: 0 10px"> $lineno--;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $context = 'msgctxt';
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->context .= PO::unpoify($m[1]);
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif (preg_match('/^msgid\s+(".*")/', $line, $m)) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($is_final($context)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (self::is_final($context)) {
</ins><span class="cx" style="display: block; padding: 0 10px"> PO::read_line($f, 'put-back');
</span><span class="cx" style="display: block; padding: 0 10px"> $lineno--;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,9 +397,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- if (array() == array_filter($entry->translations, create_function('$t', 'return $t || "0" === $t;'))) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $have_translations = false;
+ foreach ( $entry->translations as $t ) {
+ if ( $t || ('0' === $t) ) {
+ $have_translations = true;
+ break;
+ }
+ }
+ if ( false === $have_translations ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry->translations = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array('entry' => $entry, 'lineno' => $lineno);
</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>