<!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>[GlotPress][996] trunk: Start switching to anonymous functions.</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://glotpress.trac.wordpress.org/changeset/996">996</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://glotpress.trac.wordpress.org/changeset/996","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>markoheijnen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-29 18:32:54 +0000 (Sat, 29 Nov 2014)</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'>Start switching to anonymous functions.
Props yoavf.
See <a href="http://glotpress.trac.wordpress.org/ticket/305">#305</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludestemplatephp">trunk/gp-includes/template.php</a></li>
<li><a href="#trunkgpincludesthingphp">trunk/gp-includes/thing.php</a></li>
<li><a href="#trunkgpincludesthingsprojectphp">trunk/gp-includes/things/project.php</a></li>
<li><a href="#trunkgpincludesthingstranslationphp">trunk/gp-includes/things/translation.php</a></li>
<li><a href="#trunkgptemplatestranslationsphp">trunk/gp-templates/translations.php</a></li>
<li><a href="#trunktlibtestcaseroutephp">trunk/t/lib/testcase-route.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/template.php 2014-11-28 22:25:29 UTC (rev 995)
+++ trunk/gp-includes/template.php 2014-11-29 18:32:54 UTC (rev 996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,10 +64,13 @@
</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"> function gp_title( $title = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_null( $title ) )
- add_filter( 'gp_title', lambda( '$x', '$title', compact( 'title' ) ), 5 );
- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_null( $title ) ) {
+ add_filter( 'gp_title', function( $x ) use ( $title ) {
+ return $title;
+ }, 5 );
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'gp_title', '' );
</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><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function body_class() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,12 +88,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'breadcrumb-template' => '<span class="breadcrumb">{separator}{breadcrumb}</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_merge( $defaults, $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_null( $breadcrumb ) ) {
- $breadcrumb = gp_array_flatten( $breadcrumb );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! is_null( $breadcrumb ) ) {
+ $breadcrumb = gp_array_flatten( $breadcrumb );
</ins><span class="cx" style="display: block; padding: 0 10px"> $breadcrumb_string = implode( $args['separator'], array_filter( $breadcrumb ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whole_breadcrumb = str_replace( '{separator}', $args['separator'], $args['breadcrumb-template'] );
- $whole_breadcrumb = str_replace( '{breadcrumb}', $breadcrumb_string, $whole_breadcrumb );
- add_filter( 'gp_breadcrumb', lambda( '$x', '$whole_breadcrumb', compact( 'whole_breadcrumb' ) ), 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $whole_breadcrumb = str_replace( '{separator}', $args['separator'], $args['breadcrumb-template'] );
+ $whole_breadcrumb = str_replace( '{breadcrumb}', $breadcrumb_string, $whole_breadcrumb );
+
+ add_filter( 'gp_breadcrumb', function( $x ) use ( $whole_breadcrumb ) {
+ return $whole_breadcrumb;
+ }, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'gp_breadcrumb', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunkgpincludesthingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/thing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/thing.php 2014-11-28 22:25:29 UTC (rev 995)
+++ trunk/gp-includes/thing.php 2014-11-29 18:32:54 UTC (rev 996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,12 +327,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_array( $conditions ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $conditions = array_map( array( &$this, 'sql_condition_from_php_value' ), $conditions );
</span><span class="cx" style="display: block; padding: 0 10px"> $string_conditions = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $conditions as $field => $sql_condition ) {
- if ( is_array( $sql_condition ) )
- $string_conditions[] = '('. implode( ' OR ', array_map( lambda( '$cond', '"$field $cond"', compact('field') ), $sql_condition ) ) . ')';
- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ foreach ( $conditions as $field => $sql_condition ) {
+ if ( is_array( $sql_condition ) ) {
+ $string_conditions[] = '(' . implode( ' OR ', array_map( function( $cond ) use ( $field ) {
+ return "$field $cond";
+ }, $sql_condition ) ) . ')';
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $string_conditions[] = "$field $sql_condition";
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $conditions = implode( ' AND ', $string_conditions );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->apply_default_conditions( $conditions );
</span></span></pre></div>
<a id="trunkgpincludesthingsprojectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/things/project.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/things/project.php 2014-11-28 22:25:29 UTC (rev 995)
+++ trunk/gp-includes/things/project.php 2014-11-29 18:32:54 UTC (rev 996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,23 +153,35 @@
</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"> function set_difference_from( $other_project ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this_sets = (array)GP::$translation_set->by_project_id( $this->id );
- $other_sets = (array)GP::$translation_set->by_project_id( $other_project->id );
- $added = array();
- $removed = array();
- foreach( $other_sets as $other_set ) {
- $vars = array( 'locale' => $other_set->locale, 'slug' => $other_set->slug );
- if ( !gp_array_any( lambda('$set', '$set->locale == $locale && $set->slug == $slug', $vars ), $this_sets ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this_sets = (array) GP::$translation_set->by_project_id( $this->id );
+ $other_sets = (array) GP::$translation_set->by_project_id( $other_project->id );
+ $added = array();
+ $removed = array();
+
+ foreach ( $other_sets as $other_set ) {
+ $found = gp_array_any( function( $set ) use ( $other_set ) {
+ return ( $set->locale == $other_set->locale && $set->slug = $other_set->slug );
+ }, $this_sets );
+
+ if ( ! $found ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $added[] = $other_set;
</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">- foreach( $this_sets as $this_set ) {
- $vars = array( 'locale' => $this_set->locale, 'slug' => $this_set->slug );
- if ( !gp_array_any( lambda('$set', '$set->locale == $locale && $set->slug == $slug', $vars ), $other_sets ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ foreach ( $this_sets as $this_set ) {
+ $found = gp_array_any( function( $set ) use ( $this_set ) {
+ return ( $set->locale == $this_set->locale && $set->slug = $this_set->slug );
+ }, $other_sets );
+
+ if ( ! $found ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $removed[] = $this_set;
</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">- return compact( 'added', 'removed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return array(
+ 'added' => $added,
+ 'removed' => $removed
+ );
</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"> function copy_sets_and_translations_from( $source_project_id ) {
</span></span></pre></div>
<a id="trunkgpincludesthingstranslationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/things/translation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/things/translation.php 2014-11-28 22:25:29 UTC (rev 995)
+++ trunk/gp-includes/things/translation.php 2014-11-29 18:32:54 UTC (rev 996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( gp_array_get( $filters, 'term' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $like = "LIKE '%" . ( $gpdb->escape( like_escape ( gp_array_get( $filters, 'term' ) ) ) ) . "%'";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where[] = '(' . implode( ' OR ', array_map( lambda('$x', '"($x $like)"', compact('like')), array('o.singular', 't.translation_0', 'o.plural', 't.translation_1', 'o.context', 'o.references' ) ) ) . ')';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = '(' . implode( ' OR ', array_map( function( $x ) use ( $like ) { return "($x $like)"; }, array( 'o.singular', 't.translation_0', 'o.plural', 't.translation_1', 'o.context', 'o.references' ) ) ) . ')';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( gp_array_get( $filters, 'before_date_added' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where[] = $gpdb->prepare( 't.date_added > %s', gp_array_get( $filters, 'before_date_added' ) );
</span></span></pre></div>
<a id="trunkgptemplatestranslationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/translations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/translations.php 2014-11-28 22:25:29 UTC (rev 995)
+++ trunk/gp-templates/translations.php 2014-11-29 18:32:54 UTC (rev 996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,8 +13,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_options = compact('can_approve', 'can_write', 'url', 'discard_warning_url', 'set_priority_url', 'set_status_url');
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'editor', '$gp_editor_options', $editor_options );
</span><span class="cx" style="display: block; padding: 0 10px"> $parity = gp_parity_factory();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'gp_head', lambda( '', 'gp_preferred_sans_serif_style_tag($locale);', compact( 'locale' ) ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'gp_head', function() use ( $locale ) {
+ return gp_preferred_sans_serif_style_tag( $locale );
+} );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> gp_tmpl_header();
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunktlibtestcaseroutephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/lib/testcase-route.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/lib/testcase-route.php 2014-11-28 22:25:29 UTC (rev 995)
+++ trunk/t/lib/testcase-route.php 2014-11-29 18:32:54 UTC (rev 996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,8 +49,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function assertThereIsAnArrayElementContaining( $text, $array, $message = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThan( 0, count( $array ), 'The array is empty.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $message? $message : "No array element contains '$text'";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( gp_array_any( lambda( '$e', 'gp_in( $text, $e ); ', compact('text') ), $array ), $message );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( gp_array_any( function( $e ) use ( $text) { return gp_in( $text, $e ); }, $array ), $message );
</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"> function assertNotAllowedRedirect() {
</span></span></pre>
</div>
</div>
</body>
</html>