| Index: trunk/phase3/maintenance/parserTests.inc |
| — | — | @@ -117,7 +117,7 @@ |
| 118 | 118 | public function setupRecorder ( $options ) { |
| 119 | 119 | if ( isset( $options['record'] ) ) { |
| 120 | 120 | $this->recorder = new DbTestRecorder( $this ); |
| 121 | | - $this->recorder->version = isset( $options['setversion'] ) ? |
| | 121 | + $this->recorder->version = isset( $options['setversion'] ) ? |
| 122 | 122 | $options['setversion'] : SpecialVersion::getVersion(); |
| 123 | 123 | } elseif ( isset( $options['compare'] ) ) { |
| 124 | 124 | $this->recorder = new DbTestPreviewer( $this ); |
| — | — | @@ -1015,7 +1015,7 @@ |
| 1016 | 1016 | return preg_replace( |
| 1017 | 1017 | array( '/^(-.*)$/m', '/^(\+.*)$/m' ), |
| 1018 | 1018 | array( $this->term->color( 34 ) . '$1' . $this->term->reset(), |
| 1019 | | - $this->term->color( 31 ) . '$1' . $this->term->reset() ), |
| | 1019 | + $this->term->color( 31 ) . '$1' . $this->term->reset() ), |
| 1020 | 1020 | $text ); |
| 1021 | 1021 | } |
| 1022 | 1022 | |
| — | — | @@ -1376,8 +1376,8 @@ |
| 1377 | 1377 | array( 'tr_id' => $changedRun ), |
| 1378 | 1378 | __METHOD__ ); |
| 1379 | 1379 | return "First recorded appearance: " |
| 1380 | | - . date( "d-M-Y H:i:s", strtotime ( $appear->tr_date ) ) |
| 1381 | | - . ", " . $appear->tr_mw_version; |
| | 1380 | + . date( "d-M-Y H:i:s", strtotime ( $appear->tr_date ) ) |
| | 1381 | + . ", " . $appear->tr_mw_version; |
| 1382 | 1382 | } |
| 1383 | 1383 | |
| 1384 | 1384 | // Otherwise, this test has previous recorded results. |
| — | — | @@ -1582,11 +1582,11 @@ |
| 1583 | 1583 | } |
| 1584 | 1584 | |
| 1585 | 1585 | class TestFileIterator implements Iterator { |
| 1586 | | - private $file; |
| 1587 | | - private $fh; |
| 1588 | | - private $parser; |
| 1589 | | - private $index = 0; |
| 1590 | | - private $test; |
| | 1586 | + private $file; |
| | 1587 | + private $fh; |
| | 1588 | + private $parser; |
| | 1589 | + private $index = 0; |
| | 1590 | + private $test; |
| 1591 | 1591 | private $lineNum; |
| 1592 | 1592 | private $eof; |
| 1593 | 1593 | |
| — | — | @@ -1594,8 +1594,8 @@ |
| 1595 | 1595 | global $IP; |
| 1596 | 1596 | |
| 1597 | 1597 | $this->file = $file; |
| 1598 | | - $this->fh = fopen( $this->file, "rt" ); |
| 1599 | | - if ( !$this->fh ) { |
| | 1598 | + $this->fh = fopen( $this->file, "rt" ); |
| | 1599 | + if ( !$this->fh ) { |
| 1600 | 1600 | wfDie( "Couldn't open file '$file'\n" ); |
| 1601 | 1601 | } |
| 1602 | 1602 | |
| — | — | @@ -1619,28 +1619,28 @@ |
| 1620 | 1620 | $this->next(); |
| 1621 | 1621 | |
| 1622 | 1622 | return true; |
| 1623 | | - } |
| | 1623 | + } |
| 1624 | 1624 | |
| 1625 | | - function current() { |
| | 1625 | + function current() { |
| 1626 | 1626 | return $this->test; |
| 1627 | | - } |
| | 1627 | + } |
| 1628 | 1628 | |
| 1629 | | - function key() { |
| | 1629 | + function key() { |
| 1630 | 1630 | return $this->index; |
| 1631 | | - } |
| | 1631 | + } |
| 1632 | 1632 | |
| 1633 | | - function next() { |
| 1634 | | - if ( $this->readNextTest() ) { |
| | 1633 | + function next() { |
| | 1634 | + if ( $this->readNextTest() ) { |
| 1635 | 1635 | $this->index++; |
| 1636 | 1636 | return true; |
| 1637 | 1637 | } else { |
| 1638 | 1638 | $this->eof = true; |
| 1639 | 1639 | } |
| 1640 | | - } |
| | 1640 | + } |
| 1641 | 1641 | |
| 1642 | | - function valid() { |
| | 1642 | + function valid() { |
| 1643 | 1643 | return $this->eof != true; |
| 1644 | | - } |
| | 1644 | + } |
| 1645 | 1645 | |
| 1646 | 1646 | function readNextTest() { |
| 1647 | 1647 | $data = array(); |