https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114126
Revision: 114126
Author: qchris
Date: 2012-03-19 11:14:43 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
Sanitizing already existing use of PHP's assert
Modified Paths:
--------------
trunk/phase3/includes/diff/DairikiDiff.php
trunk/phase3/includes/parser/Preprocessor_DOM.php
trunk/phase3/includes/parser/Preprocessor_Hash.php
trunk/phase3/includes/parser/Preprocessor_HipHop.hphp
Modified: trunk/phase3/includes/diff/DairikiDiff.php
===================================================================
--- trunk/phase3/includes/diff/DairikiDiff.php 2012-03-19 10:50:13 UTC (rev
114125)
+++ trunk/phase3/includes/diff/DairikiDiff.php 2012-03-19 11:14:43 UTC (rev
114126)
@@ -185,8 +185,8 @@
$edits = array();
$xi = $yi = 0;
while ( $xi < $n_from || $yi < $n_to ) {
- assert( $yi < $n_to || $this->xchanged[$xi] );
- assert( $xi < $n_from || $this->ychanged[$yi] );
+ assert( '$yi < $n_to || $this->xchanged[$xi]' );
+ assert( '$xi < $n_from || $this->ychanged[$yi]' );
// Skip matching "snake".
$copy = array();
@@ -374,14 +374,14 @@
while ( list( , $y ) = each( $matches ) ) {
if ( empty( $this->in_seq[$y] ) ) {
$k = $this->_lcs_pos( $y );
- assert( $k > 0 );
+ assert( '$k > 0' );
$ymids[$k] = $ymids[$k -1];
break;
}
}
while ( list ( , $y ) = each( $matches ) ) {
if ( $y > $this->seq[$k -1] ) {
- assert( $y < $this->seq[$k] );
+ assert( '$y < $this->seq[$k]' );
// Optimization: this is a
common case:
// next match is just
replacing previous match.
$this->in_seq[$this->seq[$k]] =
false;
@@ -389,7 +389,7 @@
$this->in_seq[$y] = 1;
} elseif ( empty( $this->in_seq[$y] ) )
{
$k = $this->_lcs_pos( $y );
- assert( $k > 0 );
+ assert( '$k > 0' );
$ymids[$k] = $ymids[$k -1];
}
}
@@ -430,7 +430,7 @@
}
}
- assert( $ypos != $this->seq[$end] );
+ assert( '$ypos != $this->seq[$end]' );
$this->in_seq[$this->seq[$end]] = false;
$this->seq[$end] = $ypos;
@@ -814,8 +814,8 @@
$mapped_from_lines, $mapped_to_lines ) {
wfProfileIn( __METHOD__ );
- assert( sizeof( $from_lines ) == sizeof( $mapped_from_lines ) );
- assert( sizeof( $to_lines ) == sizeof( $mapped_to_lines ) );
+ assert( 'sizeof( $from_lines ) == sizeof( $mapped_from_lines )'
);
+ assert( 'sizeof( $to_lines ) == sizeof( $mapped_to_lines )' );
parent::__construct( $mapped_from_lines, $mapped_to_lines );
@@ -1205,7 +1205,7 @@
$this->_flushLine( $tag );
$word = substr( $word, 1 );
}
- assert( !strstr( $word, "\n" ) );
+ assert( '!strstr( $word, "\n" )' );
$this->_group .= $word;
}
}
Modified: trunk/phase3/includes/parser/Preprocessor_DOM.php
===================================================================
--- trunk/phase3/includes/parser/Preprocessor_DOM.php 2012-03-19 10:50:13 UTC
(rev 114125)
+++ trunk/phase3/includes/parser/Preprocessor_DOM.php 2012-03-19 11:14:43 UTC
(rev 114126)
@@ -479,7 +479,7 @@
} elseif ( $found == 'line-end' ) {
$piece = $stack->top;
// A heading must be open, otherwise \n
wouldn't have been in the search list
- assert( $piece->open == "\n" );
+ assert( '$piece->open == "\n"' );
$part = $piece->getCurrentPart();
// Search back through the input to see if it
has a proper close
// Do this using the reversed string since the
other solutions (end anchor, etc.) are inefficient
Modified: trunk/phase3/includes/parser/Preprocessor_Hash.php
===================================================================
--- trunk/phase3/includes/parser/Preprocessor_Hash.php 2012-03-19 10:50:13 UTC
(rev 114125)
+++ trunk/phase3/includes/parser/Preprocessor_Hash.php 2012-03-19 11:14:43 UTC
(rev 114126)
@@ -428,7 +428,7 @@
} elseif ( $found == 'line-end' ) {
$piece = $stack->top;
// A heading must be open, otherwise \n
wouldn't have been in the search list
- assert( $piece->open == "\n" );
+ assert( '$piece->open == "\n"' );
$part = $piece->getCurrentPart();
// Search back through the input to see if it
has a proper close
// Do this using the reversed string since the
other solutions (end anchor, etc.) are inefficient
Modified: trunk/phase3/includes/parser/Preprocessor_HipHop.hphp
===================================================================
--- trunk/phase3/includes/parser/Preprocessor_HipHop.hphp 2012-03-19
10:50:13 UTC (rev 114125)
+++ trunk/phase3/includes/parser/Preprocessor_HipHop.hphp 2012-03-19
11:14:43 UTC (rev 114126)
@@ -444,7 +444,7 @@
} elseif ( $found === 'line-end' ) {
$piece = $stack->getTop();
// A heading must be open, otherwise \n
wouldn't have been in the search list
- assert( $piece->open === "\n" );
+ assert( '$piece->open === "\n"' );
$part = $piece->getCurrentPart();
// Search back through the input to see if it
has a proper close
// Do this using the reversed string since the
other solutions (end anchor, etc.) are inefficient
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
