<!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>[41722] trunk: I18N: Introduce the `Plural_Forms` class.</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/41722">41722</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/41722","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-04 01:29:59 +0000 (Wed, 04 Oct 2017)</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'>I18N: Introduce the `Plural_Forms` class.
Historically, we've evaluated the plural forms for each language using `create_function()`. This is being deprecated in PHP 7.2, so needs to be replaced.
The `Plural_Forms` class parses the `Plural-Forms` header from the PO file, and internally caches the result of all subsequent plural form tests, allowing it to match the performance of the existing code.
Props rmccue.
Fixes <a href="https://core.trac.wordpress.org/ticket/41562">#41562</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespomotranslationsphp">trunk/src/wp-includes/pomo/translations.php</a></li>
<li><a href="#trunktestsphpunittestspomomophp">trunk/tests/phpunit/tests/pomo/mo.php</a></li>
<li><a href="#trunktestsphpunittestspomonoopTranslationsphp">trunk/tests/phpunit/tests/pomo/noopTranslations.php</a></li>
<li><a href="#trunktestsphpunittestspomopophp">trunk/tests/phpunit/tests/pomo/po.php</a></li>
<li><a href="#trunktestsphpunittestspomotranslationEntryphp">trunk/tests/phpunit/tests/pomo/translationEntry.php</a></li>
<li><a href="#trunktestsphpunittestspomotranslationsphp">trunk/tests/phpunit/tests/pomo/translations.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespomopluralformsphp">trunk/src/wp-includes/pomo/plural-forms.php</a></li>
<li><a href="#trunktestsphpunittestspomopluralFormsphp">trunk/tests/phpunit/tests/pomo/pluralForms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespomopluralformsphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/pomo/plural-forms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/plural-forms.php (rev 0)
+++ trunk/src/wp-includes/pomo/plural-forms.php 2017-10-04 01:29:59 UTC (rev 41722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,343 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * A gettext Plural-Forms parser.
+ *
+ * @since 4.9.0
+ */
+class Plural_Forms {
+ /**
+ * Operator characters.
+ *
+ * @since 4.9.0
+ * @var string OP_CHARS Operator characters.
+ */
+ const OP_CHARS = '|&><!=%?:';
+
+ /**
+ * Valid number characters.
+ *
+ * @since 4.9.0
+ * @var string NUM_CHARS Valid number characters.
+ */
+ const NUM_CHARS = '0123456789';
+
+ /**
+ * Operator precedence.
+ *
+ * Operator precedence from highest to lowest. Higher numbers indicate
+ * higher precedence, and are executed first.
+ *
+ * @see https://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Operator_precedence
+ *
+ * @since 4.9.0
+ * @var array $op_precedence Operator precedence from highest to lowest.
+ */
+ protected static $op_precedence = array(
+ '%' => 6,
+
+ '<' => 5,
+ '<=' => 5,
+ '>' => 5,
+ '>=' => 5,
+
+ '==' => 4,
+ '!=' => 4,
+
+ '&&' => 3,
+
+ '||' => 2,
+
+ '?:' => 1,
+ '?' => 1,
+
+ '(' => 0,
+ ')' => 0,
+ );
+
+ /**
+ * Tokens generated from the string.
+ *
+ * @since 4.9.0
+ * @var array $tokens List of tokens.
+ */
+ protected $tokens = array();
+
+ /**
+ * Cache for repeated calls to the function.
+ *
+ * @since 4.9.0
+ * @var array $cache Map of $n => $result
+ */
+ protected $cache = [];
+
+ /**
+ * Constructor.
+ *
+ * @since 4.9.0
+ *
+ * @param string $str Plural function (just the bit after `plural=` from Plural-Forms)
+ */
+ public function __construct( $str ) {
+ $this->parse( $str );
+ }
+
+ /**
+ * Parse a Plural-Forms string into tokens.
+ *
+ * Uses the shunting-yard algorithm to convert the string to Reverse Polish
+ * Notation tokens.
+ *
+ * @since 4.9.0
+ *
+ * @param string $str String to parse.
+ */
+ protected function parse( $str ) {
+ $pos = 0;
+ $len = strlen( $str );
+
+ // Convert infix operators to postfix using the shunting-yard algorithm.
+ $output = array();
+ $stack = array();
+ while ( $pos < $len ) {
+ $next = substr( $str, $pos, 1 );
+
+ switch ( $next ) {
+ // Ignore whitespace
+ case ' ':
+ case "\t":
+ $pos++;
+ break;
+
+ // Variable (n)
+ case 'n':
+ $output[] = [ 'var' ];
+ $pos++;
+ break;
+
+ // Parentheses
+ case '(':
+ $stack[] = $next;
+ $pos++;
+ break;
+
+ case ')':
+ $found = false;
+ while ( ! empty( $stack ) ) {
+ $o2 = $stack[ count( $stack ) - 1 ];
+ if ( $o2 !== '(' ) {
+ $output[] = [ 'op', array_pop( $stack ) ];
+ continue;
+ }
+
+ // Discard open paren.
+ array_pop( $stack );
+ $found = true;
+ break;
+ }
+
+ if ( ! $found ) {
+ throw new Exception( 'Mismatched parentheses' );
+ }
+
+ $pos++;
+ break;
+
+ // Operators
+ case '|':
+ case '&':
+ case '>':
+ case '<':
+ case '!':
+ case '=':
+ case '%':
+ case '?':
+ $end_operator = strspn( $str, self::OP_CHARS, $pos );
+ $operator = substr( $str, $pos, $end_operator );
+ if ( ! array_key_exists( $operator, self::$op_precedence ) ) {
+ throw new Exception( sprintf( 'Unknown operator "%s"', $operator ) );
+ }
+
+ while ( ! empty( $stack ) ) {
+ $o2 = $stack[ count( $stack ) - 1 ];
+
+ // Ternary is right-associative in C
+ if ( $operator === '?:' || $operator === '?' ) {
+ if ( self::$op_precedence[ $operator ] >= self::$op_precedence[ $o2 ] ) {
+ break;
+ }
+ } elseif ( self::$op_precedence[ $operator ] > self::$op_precedence[ $o2 ] ) {
+ break;
+ }
+
+ $output[] = [ 'op', array_pop( $stack ) ];
+ }
+ $stack[] = $operator;
+
+ $pos += $end_operator;
+ break;
+
+ // Ternary "else"
+ case ':':
+ $found = false;
+ $s_pos = count( $stack ) - 1;
+ while ( $s_pos >= 0 ) {
+ $o2 = $stack[ $s_pos ];
+ if ( $o2 !== '?' ) {
+ $output[] = [ 'op', array_pop( $stack ) ];
+ $s_pos--;
+ continue;
+ }
+
+ // Replace.
+ $stack[ $s_pos ] = '?:';
+ $found = true;
+ break;
+ }
+
+ if ( ! $found ) {
+ throw new Exception( 'Missing starting "?" ternary operator' );
+ }
+ $pos++;
+ break;
+
+ // Default - number or invalid
+ default:
+ if ( $next >= '0' && $next <= '9' ) {
+ $span = strspn( $str, self::NUM_CHARS, $pos );
+ $output[] = [ 'value', intval( substr( $str, $pos, $span ) ) ];
+ $pos += $span;
+ continue;
+ }
+
+ throw new Exception( sprintf( 'Unknown symbol "%s"', $next ) );
+ }
+ }
+
+ while ( ! empty( $stack ) ) {
+ $o2 = array_pop( $stack );
+ if ( $o2 === '(' || $o2 === ')' ) {
+ throw new Exception( 'Mismatched parentheses' );
+ }
+
+ $output[] = [ 'op', $o2 ];
+ }
+
+ $this->tokens = $output;
+ }
+
+ /**
+ * Get the plural form for a number.
+ *
+ * Caches the value for repeated calls.
+ *
+ * @since 4.9.0
+ *
+ * @param int $num Number to get plural form for.
+ * @return int Plural form value.
+ */
+ public function get( $num ) {
+ if ( isset( $this->cache[ $num ] ) ) {
+ return $this->cache[ $num ];
+ }
+ return $this->cache[ $num ] = $this->execute( $num );
+ }
+
+ /**
+ * Execute the plural form function.
+ *
+ * @since 4.9.0
+ *
+ * @param int $n Variable "n" to substitute.
+ * @return int Plural form value.
+ */
+ public function execute( $n ) {
+ $stack = array();
+ $i = 0;
+ $total = count( $this->tokens );
+ while ( $i < $total ) {
+ $next = $this->tokens[$i];
+ $i++;
+ if ( $next[0] === 'var' ) {
+ $stack[] = $n;
+ continue;
+ } elseif ( $next[0] === 'value' ) {
+ $stack[] = $next[1];
+ continue;
+ }
+
+ // Only operators left.
+ switch ( $next[1] ) {
+ case '%':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 % $v2;
+ break;
+
+ case '||':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 || $v2;
+ break;
+
+ case '&&':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 && $v2;
+ break;
+
+ case '<':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 < $v2;
+ break;
+
+ case '<=':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 <= $v2;
+ break;
+
+ case '>':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 > $v2;
+ break;
+
+ case '>=':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 >= $v2;
+ break;
+
+ case '!=':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 != $v2;
+ break;
+
+ case '==':
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 == $v2;
+ break;
+
+ case '?:':
+ $v3 = array_pop( $stack );
+ $v2 = array_pop( $stack );
+ $v1 = array_pop( $stack );
+ $stack[] = $v1 ? $v2 : $v3;
+ break;
+
+ default:
+ throw new Exception( sprintf( 'Unknown operator "%s"', $next[1] ) );
+ }
+ }
+
+ if ( count( $stack ) !== 1 ) {
+ throw new Exception( 'Too many values remaining on the stack' );
+ }
+
+ return (int) $stack[0];
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludespomotranslationsphp"></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/translations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/translations.php 2017-10-04 00:19:16 UTC (rev 41721)
+++ trunk/src/wp-includes/pomo/translations.php 2017-10-04 01:29:59 UTC (rev 41722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage translations
</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">+require_once dirname(__FILE__) . '/plural-forms.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once dirname(__FILE__) . '/entry.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'Translations', false ) ):
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function nplurals_and_expression_from_header($header) {
</span><span class="cx" style="display: block; padding: 0 10px"> if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
</span><span class="cx" style="display: block; padding: 0 10px"> $nplurals = (int)$matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expression = trim($this->parenthesize_plural_exression($matches[2]));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expression = trim( $matches[2] );
</ins><span class="cx" style="display: block; padding: 0 10px"> return array($nplurals, $expression);
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(2, 'n != 1');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,11 +202,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expression
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function make_plural_form_function($nplurals, $expression) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expression = str_replace('n', '$n', $expression);
- $func_body = "
- \$index = (int)($expression);
- return (\$index < $nplurals)? \$index : $nplurals - 1;";
- return create_function('$n', $func_body);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ try {
+ $handler = new Plural_Forms( rtrim( $expression, ';' ) );
+ return array( $handler, 'get' );
+ } catch ( Exception $e ) {
+ // Fall back to default plural-form function.
+ return $this->make_plural_form_function( 2, 'n != 1' );
+ }
</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></pre></div>
<a id="trunktestsphpunittestspomomophp"></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/pomo/mo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/mo.php 2017-10-04 00:19:16 UTC (rev 41721)
+++ trunk/tests/phpunit/tests/pomo/mo.php 2017-10-04 01:29:59 UTC (rev 41722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group pomo
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class Tests_POMO_MO extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_mo_simple() {
</span></span></pre></div>
<a id="trunktestsphpunittestspomonoopTranslationsphp"></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/pomo/noopTranslations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/noopTranslations.php 2017-10-04 00:19:16 UTC (rev 41721)
+++ trunk/tests/phpunit/tests/pomo/noopTranslations.php 2017-10-04 01:29:59 UTC (rev 41722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group pomo
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class Tests_POMO_NOOPTranslations extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span></span></pre></div>
<a id="trunktestsphpunittestspomopluralFormsphp"></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/pomo/pluralForms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/pluralForms.php (rev 0)
+++ trunk/tests/phpunit/tests/pomo/pluralForms.php 2017-10-04 01:29:59 UTC (rev 41722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,232 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group pomo
+ */
+class PluralFormsTest extends WP_UnitTestCase {
+ /**
+ * Legacy plural form function.
+ *
+ * @param int $nplurals
+ * @param string $expression
+ */
+ protected static function make_plural_form_function($nplurals, $expression) {
+ $expression = str_replace('n', '$n', $expression);
+ $func_body = "
+ \$index = (int)($expression);
+ return (\$index < $nplurals)? \$index : $nplurals - 1;";
+ return create_function('$n', $func_body);
+ }
+
+ /**
+ * Parenthesize plural expression.
+ *
+ * Legacy workaround for PHP's flipped precedence order for ternary.
+ *
+ * @param string $expression the expression without parentheses
+ * @return string the expression with parentheses added
+ */
+ protected static function parenthesize_plural_expression($expression) {
+ $expression .= ';';
+ $res = '';
+ $depth = 0;
+ for ($i = 0; $i < strlen($expression); ++$i) {
+ $char = $expression[$i];
+ switch ($char) {
+ case '?':
+ $res .= ' ? (';
+ $depth++;
+ break;
+ case ':':
+ $res .= ') : (';
+ break;
+ case ';':
+ $res .= str_repeat(')', $depth) . ';';
+ $depth= 0;
+ break;
+ default:
+ $res .= $char;
+ }
+ }
+ return rtrim($res, ';');
+ }
+
+ public static function locales_provider() {
+ if ( ! class_exists( 'GP_Locales' ) ) {
+ $filename = download_url( 'https://raw.githubusercontent.com/GlotPress/GlotPress-WP/develop/locales/locales.php' );
+ if ( is_wp_error( $filename ) ) {
+ self::markTestSkipped( 'Unable to retrieve GP_Locales file' );
+ }
+ require_once $filename;
+ }
+
+ $locales = GP_Locales::locales();
+ $plural_expressions = array();
+ foreach ( $locales as $slug => $locale ) {
+ $plural_expression = $locale->plural_expression;
+ if ( $plural_expression !== 'n != 1' ) {
+ $plural_expressions[] = array( $slug, $locale->nplurals, $plural_expression );
+ }
+ }
+
+ return $plural_expressions;
+ }
+
+ /**
+ * @dataProvider locales_provider
+ * @group external-http
+ */
+ public function test_regression( $lang, $nplurals, $expression ) {
+ $parenthesized = self::parenthesize_plural_expression( $expression );
+ $old_style = self::make_plural_form_function( $nplurals, $parenthesized );
+ $pluralForms = new Plural_Forms( $expression );
+
+ $generated_old = array();
+ $generated_new = array();
+
+ foreach ( range( 0, 200 ) as $i ) {
+ $generated_old[] = $old_style( $i );
+ $generated_new[] = $pluralForms->get( $i );
+ }
+
+ $this->assertSame( $generated_old, $generated_new );
+ }
+
+ public static function simple_provider() {
+ return array(
+ array(
+ // Simple equivalence.
+ 'n != 1',
+ array(
+ -1 => 1,
+ 0 => 1,
+ 1 => 0,
+ 2 => 1,
+ 5 => 1,
+ 10 => 1,
+ ),
+ ),
+ array(
+ // Ternary
+ 'n ? 1 : 2',
+ array(
+ -1 => 1,
+ 0 => 2,
+ 1 => 1,
+ 2 => 1,
+ ),
+ ),
+ array(
+ // Comparison
+ 'n > 1 ? 1 : 2',
+ array(
+ -2 => 2,
+ -1 => 2,
+ 0 => 2,
+ 1 => 2,
+ 2 => 1,
+ 3 => 1,
+ ),
+ ),
+ array(
+ 'n > 1 ? n > 2 ? 1 : 2 : 3',
+ array(
+ -2 => 3,
+ -1 => 3,
+ 0 => 3,
+ 1 => 3,
+ 2 => 2,
+ 3 => 1,
+ 4 => 1,
+ ),
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider simple_provider
+ */
+ public function test_simple( $expression, $expected ) {
+ $pluralForms = new Plural_Forms( $expression );
+ $actual = array();
+ foreach ( array_keys( $expected ) as $num ) {
+ $actual[ $num ] = $pluralForms->get( $num );
+ }
+
+ $this->assertSame( $expected, $actual );
+ }
+
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Unknown symbol "#"
+ */
+ public function test_invalid_operator() {
+ $pluralForms = new Plural_Forms( 'n # 2' );
+ }
+
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Unknown operator "&"
+ */
+ public function test_partial_operator() {
+ $pluralForms = new Plural_Forms( 'n & 1' );
+ }
+
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Mismatched parentheses
+ */
+ public function test_mismatched_open_paren() {
+ $pluralForms = new Plural_Forms( '((n)' );
+ }
+
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Mismatched parentheses
+ */
+ public function test_mismatched_close_paren() {
+ $pluralForms = new Plural_Forms( '(n))' );
+ }
+
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Missing starting "?" ternary operator
+ */
+ public function test_missing_ternary_operator() {
+ $pluralForms = new Plural_Forms( 'n : 2' );
+ }
+
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Unknown operator "?"
+ */
+ public function test_missing_ternary_else() {
+ $pluralForms = new Plural_Forms( 'n ? 1' );
+ $pluralForms->get( 1 );
+ }
+
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Too many values remaining on the stack
+ */
+ public function test_overflow_stack() {
+ $pluralForms = new Plural_Forms( 'n n' );
+ $pluralForms->get( 1 );
+ }
+
+ public function test_cache() {
+ $mock = $this->getMockBuilder( 'Plural_Forms' )
+ ->setMethods(array('execute'))
+ ->setConstructorArgs(array('n != 1'))
+ ->getMock();
+
+ $mock->expects($this->once())
+ ->method('execute')
+ ->with($this->identicalTo(2))
+ ->willReturn(1);
+
+ $first = $mock->get( 2 );
+ $second = $mock->get( 2 );
+ $this->assertEquals( $first, $second );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestspomopophp"></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/pomo/po.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/po.php 2017-10-04 00:19:16 UTC (rev 41721)
+++ trunk/tests/phpunit/tests/pomo/po.php 2017-10-04 01:29:59 UTC (rev 41722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group pomo
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class Tests_POMO_PO extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . '/wp-includes/pomo/po.php';
</span></span></pre></div>
<a id="trunktestsphpunittestspomotranslationEntryphp"></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/pomo/translationEntry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/translationEntry.php 2017-10-04 00:19:16 UTC (rev 41721)
+++ trunk/tests/phpunit/tests/pomo/translationEntry.php 2017-10-04 01:29:59 UTC (rev 41722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group pomo
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class Tests_POMO_TranslationEntry extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_create_entry() {
</span></span></pre></div>
<a id="trunktestsphpunittestspomotranslationsphp"></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/pomo/translations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/translations.php 2017-10-04 00:19:16 UTC (rev 41721)
+++ trunk/tests/phpunit/tests/pomo/translations.php 2017-10-04 01:29:59 UTC (rev 41722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * @group pomo
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class Tests_POMO_Translations extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_add_entry() {
</span></span></pre>
</div>
</div>
</body>
</html>