Merge "(bug 56849) Deprecate dangerous edittime-based content update functions"

[lhc/web/wiklou.git] / tests / phpunit / includes / db / DatabaseTest.php

diff --git a/tests/phpunit/includes/db/DatabaseTest.php b/tests/phpunit/includes/db/DatabaseTest.php
index 35a8e4c..7e70439 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseTest.php
@@ -8,8 +8,9 @@ class DatabaseTest extends MediaWikiTestCase {
        /**
         * @var DatabaseBase
         */
-       var $db;
-       var $functionTest = false;
+       protected $db;
+
+       private $functionTest = false;
 
        protected function setUp() {
                parent::setUp();
@@ -215,7 +216,9 @@ class DatabaseTest extends MediaWikiTestCase {
                global $IP;
                $this->dropFunctions();
                $this->functionTest = true;
-               $this->assertTrue( $this->db->sourceFile( "$IP/tests/phpunit/data/db/{$this->db->getType()}/functions.sql" ) );
+               $this->assertTrue(
+                       $this->db->sourceFile( "$IP/tests/phpunit/data/db/{$this->db->getType()}/functions.sql" )
+               );
                $res = $this->db->query( 'SELECT mw_test_function() AS test', __METHOD__ );
                $this->assertEquals( 42, $res->fetchObject()->test );
        }