Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Make eval.php try to handle newlines in code"

Browse source 
Completely broke the script for me.

<TimStarling> MaxSem: that was a pretty crazy change
<TimStarling> fancy trying to detect the end of a statement by shelling out to detect parse errors
<TimStarling> maybe just revert that?
<TimStarling> we can probably do a better job with a few regexes
<TimStarling> I wonder how php -a does it

This reverts commit f0ae292da7.

Change-Id: I16c9c200dc3f4db55cecc23aaa0d9ff55504c19d
This commit is contained in:
MaxSem 2015-02-18 22:21:56 +00:00 committed by Tim Starling
parent 31ed405296
commit e97180e5f6
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
maintenance/eval.php
View file

@ -60,11 +60,6 @@ if ( $__useReadline ) {
readline_read_history( $__historyFile );
}
$__phpPath = preg_match( '/Zend Engine|HipHop VM/', wfShellExecWithStderr( 'php --version' ) )
? 'php' //standard system path name
: ''; // not accessible somehow
$__multiLine = '';
$__e = null; // PHP exception
while ( ( $__line = Maintenance::readconsole() ) !== false ) {
if ( $__e && !preg_match( '/^(exit|die);?$/', $__line ) ) {
@ -79,18 +74,8 @@ while ( ( $__line = Maintenance::readconsole() ) !== false ) {
readline_add_history( $__line );
readline_write_history( $__historyFile );
}
// Try to only run PHP once a valid chunk is formed (deals with newlines)
if ( $__phpPath ) {
$res = wfShellExecWithStderr(
"echo " . wfEscapeShellArg( "<?php\n{$__multiLine}{$__line}" ) . " | php -l" );
if ( strpos( $res, 'No syntax errors' ) !== 0 && substr( $__multiLine, -2 ) !== "\n\n" ) {
$__multiLine .= "$__line\n";
continue;
}
}
try {
$__val = eval( $__multiLine . $__line . ";" );
$__multiLine = '';
$__val = eval( $__line . ";" );
} catch ( Exception $__e ) {
echo "Caught exception " . get_class( $__e ) .
": {$__e->getMessage()}\n" . $__e->getTraceAsString() . "\n";