Database: Allow selectFieldValues() to accept SQL fragments

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

diff --git a/tests/phpunit/includes/PagePropsTest.php b/tests/phpunit/includes/PagePropsTest.php
index e3d69de..f602cda 100644 (file)
--- a/tests/phpunit/includes/PagePropsTest.php
+++ b/tests/phpunit/includes/PagePropsTest.php
@@ -1,13 +1,15 @@
 <?php
 
 /**
+ * @covers PageProps
+ *
  * @group Database
  *     ^--- tell jenkins this test needs the database
  *
  * @group medium
  *     ^--- tell phpunit that these test cases may take longer than 2 seconds.
  */
-class TestPageProps extends MediaWikiLangTestCase {
+class PagePropsTest extends MediaWikiLangTestCase {
 
        /**
         * @var Title $title1
@@ -35,16 +37,16 @@ class TestPageProps extends MediaWikiLangTestCase {
                $wgNamespaceContentModels[12312] = 'DUMMY';
                $wgContentHandlers['DUMMY'] = 'DummyContentHandlerForTesting';
 
-               MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache
+               MWNamespace::clearCaches();
                $wgContLang->resetNamespaces(); # reset namespace cache
 
                if ( !$this->the_properties ) {
-                       $this->the_properties = array(
+                       $this->the_properties = [
                                "property1" => "value1",
                                "property2" => "value2",
                                "property3" => "value3",
                                "property4" => "value4"
-                       );
+                       ];
                }
 
                if ( !$this->title1 ) {
@@ -81,7 +83,7 @@ class TestPageProps extends MediaWikiLangTestCase {
                unset( $wgNamespaceContentModels[12312] );
                unset( $wgContentHandlers['DUMMY'] );
 
-               MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache
+               MWNamespace::clearCaches();
                $wgContLang->resetNamespaces(); # reset namespace cache
        }
 
@@ -105,10 +107,10 @@ class TestPageProps extends MediaWikiLangTestCase {
                $pageProps = PageProps::getInstance();
                $page1ID = $this->title1->getArticleID();
                $page2ID = $this->title2->getArticleID();
-               $titles = array(
+               $titles = [
                        $this->title1,
                        $this->title2
-               );
+               ];
                $result = $pageProps->getProperties( $titles, "property1" );
                $this->assertArrayHasKey( $page1ID, $result, "Found page 1 property" );
                $this->assertArrayHasKey( $page2ID, $result, "Found page 2 property" );
@@ -124,14 +126,14 @@ class TestPageProps extends MediaWikiLangTestCase {
                $pageProps = PageProps::getInstance();
                $page1ID = $this->title1->getArticleID();
                $page2ID = $this->title2->getArticleID();
-               $titles = array(
+               $titles = [
                        $this->title1,
                        $this->title2
-               );
-               $properties = array(
+               ];
+               $properties = [
                        "property1",
                        "property2"
-               );
+               ];
                $result = $pageProps->getProperties( $titles, $properties );
                $this->assertArrayHasKey( $page1ID, $result, "Found page 1 property" );
                $this->assertArrayHasKey( "property1", $result[$page1ID], "Found page 1 property 1" );
@@ -174,10 +176,10 @@ class TestPageProps extends MediaWikiLangTestCase {
                $pageProps = PageProps::getInstance();
                $page1ID = $this->title1->getArticleID();
                $page2ID = $this->title2->getArticleID();
-               $titles = array(
+               $titles = [
                        $this->title1,
                        $this->title2
-               );
+               ];
                $result = $pageProps->getAllProperties( $titles );
                $this->assertArrayHasKey( $page1ID, $result, "Found page 1 properties" );
                $this->assertArrayHasKey( $page2ID, $result, "Found page 2 properties" );
@@ -266,16 +268,14 @@ class TestPageProps extends MediaWikiLangTestCase {
        }
 
        protected function setProperties( $pageID, $properties ) {
-
-               $rows = array();
+               $rows = [];
 
                foreach ( $properties as $propertyName => $propertyValue ) {
-
-                       $row = array(
+                       $row = [
                                'pp_page' => $pageID,
                                'pp_propname' => $propertyName,
                                'pp_value' => $propertyValue
-                       );
+                       ];
 
                        $rows[] = $row;
                }
@@ -283,23 +283,21 @@ class TestPageProps extends MediaWikiLangTestCase {
                $dbw = wfGetDB( DB_MASTER );
                $dbw->replace(
                        'page_props',
-                       array(
-                               array(
+                       [
+                               [
                                        'pp_page',
                                        'pp_propname'
-                               )
-                       ),
+                               ]
+                       ],
                        $rows,
                        __METHOD__
                );
        }
 
        protected function setProperty( $pageID, $propertyName, $propertyValue ) {
-
-               $properties = array();
+               $properties = [];
                $properties[$propertyName] = $propertyValue;
 
                $this->setProperties( $pageID, $properties );
-
        }
 }