jenkins-bot has submitted this change and it was merged.

Change subject: New Wikidata Build - 2015-07-04T10:00:01+0000
......................................................................


New Wikidata Build - 2015-07-04T10:00:01+0000

Change-Id: Ia36998e00a824d2648dd88853d7ed83e534abab9
---
M composer.lock
M extensions/Wikibase/client/ExampleSettings.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/tests/phpunit/ClientDefaultsTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
M extensions/Wikibase/lib/WikibaseLib.hooks.php
M extensions/Wikibase/lib/WikibaseLib.php
M extensions/Wikibase/lib/maintenance/dispatchChanges.php
M extensions/Wikibase/lib/resources/Resources.php
M extensions/Wikibase/lib/tests/phpunit/entity/EntityFactoryTest.php
M 
extensions/Wikibase/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php
M 
extensions/Wikibase/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
M extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php
M extensions/Wikibase/lib/tests/qunit/resources.php
M extensions/Wikibase/repo/ExampleSettings.php
M extensions/Wikibase/repo/Wikibase.hooks.php
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/includes/ChangeDispatcher.php
M extensions/Wikibase/repo/includes/ChangePruner.php
M extensions/Wikibase/repo/includes/Diff/EntityDiffVisualizer.php
M extensions/Wikibase/repo/includes/api/AvailableBadges.php
M extensions/Wikibase/repo/includes/rdf/RdfVocabulary.php
M extensions/Wikibase/repo/includes/store/sql/DispatchStats.php
M extensions/Wikibase/repo/resources/Resources.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/HttpAcceptNegotiatorTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/GetEntitiesTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/ItemByTitleHelperTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/content/EntityHandlerTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
M extensions/Wikibase/view/resources/jquery/wikibase/resources.php
M extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php
M extensions/Wikibase/view/resources/resources.php
M extensions/Wikibase/view/src/Template/TemplateFactory.php
M extensions/Wikibase/view/tests/phpunit/ClaimHtmlGeneratorTest.php
M extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
M extensions/Wikibase/view/tests/qunit/resources.php
M vendor/composer/installed.json
61 files changed, 181 insertions(+), 172 deletions(-)

Approvals:
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index f38b6b9..48275c7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-                "reference": "a574bd67745de9276cf15b96077b5a6223c15e56"
+                "reference": "92b3d75c7fb5567164e97ce5cb38cbe00a59d084"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a574bd67745de9276cf15b96077b5a6223c15e56";,
-                "reference": "a574bd67745de9276cf15b96077b5a6223c15e56",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/92b3d75c7fb5567164e97ce5cb38cbe00a59d084";,
+                "reference": "92b3d75c7fb5567164e97ce5cb38cbe00a59d084",
                 "shasum": ""
             },
             "require": {
@@ -1399,7 +1399,7 @@
                 "wikibaserepo",
                 "wikidata"
             ],
-            "time": "2015-07-02 20:36:42"
+            "time": "2015-07-03 14:38:51"
         },
         {
             "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/ExampleSettings.php 
b/extensions/Wikibase/client/ExampleSettings.php
index dd9aa91..c31ddfc 100644
--- a/extensions/Wikibase/client/ExampleSettings.php
+++ b/extensions/Wikibase/client/ExampleSettings.php
@@ -2,4 +2,4 @@
 
 define( 'WB_CLIENT_EXAMPLE_ENTRY', 1 );
 
-include_once( __DIR__ . '/config/WikibaseClient.example.php' );
+include_once __DIR__ . '/config/WikibaseClient.example.php';
diff --git a/extensions/Wikibase/client/WikibaseClient.php 
b/extensions/Wikibase/client/WikibaseClient.php
index 4c48108..449582f 100644
--- a/extensions/Wikibase/client/WikibaseClient.php
+++ b/extensions/Wikibase/client/WikibaseClient.php
@@ -56,7 +56,7 @@
 
 // Include the WikibaseLib extension if that hasn't been done yet, since it's 
required for WikibaseClient to work.
 if ( !defined( 'WBL_VERSION' ) ) {
-       include_once( __DIR__ . '/../lib/WikibaseLib.php' );
+       include_once __DIR__ . '/../lib/WikibaseLib.php';
 }
 
 if ( !defined( 'WBL_VERSION' ) ) {
@@ -79,12 +79,10 @@
                'descriptionmsg' => 'wikibase-client-desc'
        );
 
-       $dir = __DIR__ . '/';
-
        // i18n
        $wgMessagesDirs['wikibaseclient']                   = __DIR__ . '/i18n';
-       $wgExtensionMessagesFiles['Wikibaseclientalias']        = $dir . 
'WikibaseClient.i18n.alias.php';
-       $wgExtensionMessagesFiles['wikibaseclientmagic']        = $dir . 
'WikibaseClient.i18n.magic.php';
+       $wgExtensionMessagesFiles['Wikibaseclientalias'] = __DIR__ . 
'/WikibaseClient.i18n.alias.php';
+       $wgExtensionMessagesFiles['wikibaseclientmagic'] = __DIR__ . 
'/WikibaseClient.i18n.magic.php';
 
        // Hooks
        $wgHooks['UnitTestsList'][]                             = 
'\Wikibase\ClientHooks::registerUnitTests';
@@ -152,15 +150,18 @@
        $wgSpecialPages['UnconnectedPages']                                     
        = 'Wikibase\Client\Specials\SpecialUnconnectedPages';
 
        // Resource loader modules
-       $wgResourceModules = array_merge( $wgResourceModules, include( 
"$dir/resources/Resources.php" ) );
+       $wgResourceModules = array_merge(
+               $wgResourceModules,
+               include __DIR__ . '/resources/Resources.php'
+       );
 
        $wgWBClientSettings = array_merge(
-               require( __DIR__ . '/../lib/config/WikibaseLib.default.php' ),
-               require( __DIR__ . '/config/WikibaseClient.default.php' )
+               require __DIR__ . '/../lib/config/WikibaseLib.default.php',
+               require __DIR__ . '/config/WikibaseClient.default.php'
        );
 
        if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES 
) {
-               include_once( $dir . 'config/WikibaseClient.experimental.php' );
+               include_once __DIR__ . 
'/config/WikibaseClient.experimental.php';
        }
 
        $wgRecentChangesFlags['wikibase-edit'] = array(
diff --git a/extensions/Wikibase/client/tests/phpunit/ClientDefaultsTest.php 
b/extensions/Wikibase/client/tests/phpunit/ClientDefaultsTest.php
index dc7adfd..a139d40 100644
--- a/extensions/Wikibase/client/tests/phpunit/ClientDefaultsTest.php
+++ b/extensions/Wikibase/client/tests/phpunit/ClientDefaultsTest.php
@@ -157,7 +157,7 @@
        public function testDefaults( array $settings, array $wg, $repoIsLocal, 
$expected ) {
                $this->setMwGlobals( $wg );
 
-               $defaults = include( WBC_DIR . 
'/config/WikibaseClient.default.php' );
+               $defaults = include WBC_DIR . 
'/config/WikibaseClient.default.php';
 
                $settings = array_merge( $defaults, $settings );
                $settings = new SettingsArray( $settings );
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
index a7c56ba..c2eed75 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
@@ -60,7 +60,7 @@
                        array(
                                
'-{zh:mooooo;zh-hans:mooooo;zh-hant:mooooo;zh-cn:mooooo;zh-hk:mooooo;}-',
                                $itemId,
-                               array ( 'zh', 'zh-hans', 'zh-hant', 'zh-cn', 
'zh-hk' ),
+                               array( 'zh', 'zh-hans', 'zh-hant', 'zh-cn', 
'zh-hk' ),
                                'cat'
                        ),
                        // Don't create "-{}-" for empty input,
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
index 2d08b95..d3f6ee1 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
@@ -74,7 +74,7 @@
                                                'language' => 'ku-latn',
                                                'value' => 'Pisîk'
                                        ),
-                                       'ku-arab' => array (
+                                       'ku-arab' => array(
                                                'language' => 'ku-arab',
                                                'value' => 'پسیک',
                                                'source-language' => 'ku-latn',
diff --git a/extensions/Wikibase/lib/WikibaseLib.hooks.php 
b/extensions/Wikibase/lib/WikibaseLib.hooks.php
index 7d3c3a1..674332a 100644
--- a/extensions/Wikibase/lib/WikibaseLib.hooks.php
+++ b/extensions/Wikibase/lib/WikibaseLib.hooks.php
@@ -43,7 +43,7 @@
        public static function registerQUnitTests( array &$testModules, 
\ResourceLoader &$resourceLoader ) {
                $testModules['qunit'] = array_merge(
                        $testModules['qunit'],
-                       include( __DIR__ . '/tests/qunit/resources.php' )
+                       include __DIR__ . '/tests/qunit/resources.php'
                );
 
                return true;
diff --git a/extensions/Wikibase/lib/WikibaseLib.php 
b/extensions/Wikibase/lib/WikibaseLib.php
index 543c842..c0cd8d2 100644
--- a/extensions/Wikibase/lib/WikibaseLib.php
+++ b/extensions/Wikibase/lib/WikibaseLib.php
@@ -49,7 +49,7 @@
 // This is the path to the autoloader generated by composer in case of a 
composer install.
 if ( ( !defined( 'WIKIBASE_DATAMODEL_VERSION' ) || !defined( 'Diff_VERSION' ) 
|| !defined( 'DATAVALUES_VERSION' ) )
        && file_exists( __DIR__ . '/../vendor/autoload.php' ) ) {
-       include_once( __DIR__ . '/../vendor/autoload.php' );
+       include_once __DIR__ . '/../vendor/autoload.php';
 }
 
 call_user_func( function() {
@@ -96,10 +96,13 @@
        };
 
        // Resource Loader Modules:
-       $wgResourceModules = array_merge( $wgResourceModules, include( __DIR__ 
. "/resources/Resources.php" ) );
+       $wgResourceModules = array_merge(
+               $wgResourceModules,
+               include __DIR__ . '/resources/Resources.php'
+       );
 
        if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES 
) {
-               include_once( __DIR__ . '/config/WikibaseLib.experimental.php' 
);
+               include_once __DIR__ . '/config/WikibaseLib.experimental.php';
        }
 } );
 
diff --git a/extensions/Wikibase/lib/maintenance/dispatchChanges.php 
b/extensions/Wikibase/lib/maintenance/dispatchChanges.php
index bef6bfa..5e5746e 100644
--- a/extensions/Wikibase/lib/maintenance/dispatchChanges.php
+++ b/extensions/Wikibase/lib/maintenance/dispatchChanges.php
@@ -2,4 +2,4 @@
 
 // Placeholder for backwards compatibility.
 // Remove once all scripts and cron jobs have been updated accordingly.
-require( __DIR__ . '/../../repo/maintenance/dispatchChanges.php' );
+require __DIR__ . '/../../repo/maintenance/dispatchChanges.php';
diff --git a/extensions/Wikibase/lib/resources/Resources.php 
b/extensions/Wikibase/lib/resources/Resources.php
index e2cce40..9c85474 100644
--- a/extensions/Wikibase/lib/resources/Resources.php
+++ b/extensions/Wikibase/lib/resources/Resources.php
@@ -30,8 +30,6 @@
                        'scripts' => array(
                                'wikibase.js',
                        ),
-                       'dependencies' => array(
-                       ),
                ),
 
                'wikibase.buildErrorOutput' => $moduleTemplate + array(
@@ -73,8 +71,8 @@
 
        $modules = array_merge(
                $modules,
-               include( __DIR__ . '/deprecated/resources.php' ),
-               include( __DIR__ . '/jquery.wikibase/resources.php' )
+               include __DIR__ . '/deprecated/resources.php',
+               include __DIR__ . '/jquery.wikibase/resources.php'
        );
 
        if ( defined( 'ULS_VERSION' ) ) {
diff --git a/extensions/Wikibase/lib/tests/phpunit/entity/EntityFactoryTest.php 
b/extensions/Wikibase/lib/tests/phpunit/entity/EntityFactoryTest.php
index c8f783e..c7b5aab 100644
--- a/extensions/Wikibase/lib/tests/phpunit/entity/EntityFactoryTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/entity/EntityFactoryTest.php
@@ -35,10 +35,10 @@
                $tests = array();
 
                foreach ( $this->getEntityFactory()->getEntityTypes() as $type 
) {
-                       $tests[] = array ( $type, true );
+                       $tests[] = array( $type, true );
                }
 
-               $tests[] = array ( 'this-does-not-exist', false );
+               $tests[] = array( 'this-does-not-exist', false );
 
                return $tests;
        }
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php
index 424d558..eb63c01 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php
@@ -124,7 +124,7 @@
                                ) ),
                        ),
                        'no options' => array(
-                               new FormatterOptions( array( ) ),
+                               new FormatterOptions( array() ),
                        ),
                );
        }
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
index 4e71f93..de059b7 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
@@ -630,7 +630,7 @@
 
                return array(
                        'empty' => array(
-                               new FormatterOptions( array( ) ),
+                               new FormatterOptions( array() ),
                                'en', // determined in 
WikibaseValueFormatterBuildersTest::newBuilder()
                                'en'  // derived from language code
                        ),
diff --git a/extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php 
b/extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php
index e2bf15a..b5514eb 100644
--- a/extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php
@@ -461,14 +461,17 @@
                $lookup->saveTermsOfEntity( $item );
 
                // modify the item and save new set of terms
+               $item = new Item( new ItemId( 'Q568431314' ) );
                $item->setLabel( 'en', 'abc' );
-               $item->removeLabel( 'de' );
                $item->setLabel( 'nl', 'jke' );
-               $item->setDescription( 'it', '-xyz-' );
+               $item->setDescription( 'en', '-abc-' );
+               $item->setDescription( 'de', '-def-' );
+               $item->setDescription( 'nl', '-ghi-' );
+               $item->setDescription( 'it', 'ABC' );
                $item->setAliases( 'en', array( 'ABC', 'X', '_' ) );
                $item->setAliases( 'de', array( 'DEF', 'Y' ) );
                $item->setAliases( 'nl', array( '_', 'Z', 'foo' ) );
-               $item->setDescription( 'it', 'ABC' );
+
                $lookup->saveTermsOfEntity( $item );
 
                // check that the stored terms are the ones in the modified 
items
diff --git a/extensions/Wikibase/lib/tests/qunit/resources.php 
b/extensions/Wikibase/lib/tests/qunit/resources.php
index 5437c21..eff7e42 100644
--- a/extensions/Wikibase/lib/tests/qunit/resources.php
+++ b/extensions/Wikibase/lib/tests/qunit/resources.php
@@ -59,7 +59,7 @@
 
        return array_merge(
                $modules,
-               include( __DIR__ . '/jquery.wikibase/resources.php' )
+               include __DIR__ . '/jquery.wikibase/resources.php'
        );
 
 } );
diff --git a/extensions/Wikibase/repo/ExampleSettings.php 
b/extensions/Wikibase/repo/ExampleSettings.php
index 6310835..99765e0 100644
--- a/extensions/Wikibase/repo/ExampleSettings.php
+++ b/extensions/Wikibase/repo/ExampleSettings.php
@@ -2,4 +2,4 @@
 
 define( 'WB_REPO_EXAMPLE_ENTRY', 1 );
 
-include_once( __DIR__ . '/config/Wikibase.example.php' );
+include_once __DIR__ . '/config/Wikibase.example.php';
diff --git a/extensions/Wikibase/repo/Wikibase.hooks.php 
b/extensions/Wikibase/repo/Wikibase.hooks.php
index 3557c36..1f3cce6 100644
--- a/extensions/Wikibase/repo/Wikibase.hooks.php
+++ b/extensions/Wikibase/repo/Wikibase.hooks.php
@@ -170,7 +170,7 @@
        public static function registerQUnitTests( array &$testModules, 
ResourceLoader &$resourceLoader ) {
                $testModules['qunit'] = array_merge(
                        $testModules['qunit'],
-                       include( __DIR__ . '/tests/qunit/resources.php' )
+                       include __DIR__ . '/tests/qunit/resources.php'
                );
 
                return true;
diff --git a/extensions/Wikibase/repo/Wikibase.php 
b/extensions/Wikibase/repo/Wikibase.php
index c361c12..8bb8f05 100644
--- a/extensions/Wikibase/repo/Wikibase.php
+++ b/extensions/Wikibase/repo/Wikibase.php
@@ -55,7 +55,7 @@
 
 // Include the WikibaseLib extension if that hasn't been done yet, since it's 
required for Wikibase to work.
 if ( !defined( 'WBL_VERSION' ) ) {
-       include_once( __DIR__ . '/../lib/WikibaseLib.php' );
+       include_once __DIR__ . '/../lib/WikibaseLib.php';
 }
 
 if ( !defined( 'WBL_VERSION' ) ) {
@@ -63,7 +63,7 @@
 }
 
 if ( !defined( 'WIKIBASE_VIEW_VERSION' ) ) {
-       include_once( __DIR__ . '/../view/WikibaseView.php' );
+       include_once __DIR__ . '/../view/WikibaseView.php';
 }
 
 if ( !defined( 'WIKIBASE_VIEW_VERSION' ) ) {
@@ -71,7 +71,7 @@
 }
 
 if ( !defined( 'PURTLE_VERSION' ) ) {
-       include_once( __DIR__ . '/../purtle/Purtle.php' );
+       include_once __DIR__ . '/../purtle/Purtle.php';
 }
 
 if ( !defined( 'PURTLE_VERSION' ) ) {
@@ -234,15 +234,18 @@
        $wgHooks['LoadExtensionSchemaUpdates'][] = 
'\Wikibase\Repo\Store\Sql\ChangesSubscriptionSchemaUpdater::onSchemaUpdate';
 
        // Resource Loader Modules:
-       $wgResourceModules = array_merge( $wgResourceModules, include( __DIR__ 
. "/resources/Resources.php" ) );
+       $wgResourceModules = array_merge(
+               $wgResourceModules,
+               include __DIR__ . '/resources/Resources.php'
+       );
 
        $wgWBRepoSettings = array_merge(
-               require( __DIR__ . '/../lib/config/WikibaseLib.default.php' ),
-               require( __DIR__ . '/config/Wikibase.default.php' )
+               require __DIR__ . '/../lib/config/WikibaseLib.default.php',
+               require __DIR__ . '/config/Wikibase.default.php'
        );
 
        if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES 
) {
-               include_once( __DIR__ . '/config/Wikibase.experimental.php' );
+               include_once __DIR__ . '/config/Wikibase.experimental.php';
        }
 
 } );
diff --git a/extensions/Wikibase/repo/includes/ChangeDispatcher.php 
b/extensions/Wikibase/repo/includes/ChangeDispatcher.php
index 5a94659..64fe338 100644
--- a/extensions/Wikibase/repo/includes/ChangeDispatcher.php
+++ b/extensions/Wikibase/repo/includes/ChangeDispatcher.php
@@ -261,7 +261,7 @@
         * @param int $after:  The last change ID processed by a previous run. 
All changes returned
         *                     will have an ID greater than $after.
         *
-        * @return array ( $batch, $seen ), where $batch is a list of Change 
objects, and $seen
+        * @return array( $batch, $seen ), where $batch is a list of Change 
objects, and $seen
         *         if the ID of the last change considered for the batch (even 
if that was filtered out),
         *         for use as a continuation marker.
         */
@@ -346,7 +346,7 @@
         * @param Change[] $changes: The list of changes to filter.
         * @param int      $limit:   The max number of changes to return
         *
-        * @return array ( $batch, $seen ), where $batch is the filtered list 
of Change objects,
+        * @return array( $batch, $seen ), where $batch is the filtered list of 
Change objects,
         *         and $seen if the ID of the last change considered for the 
batch
         *         (even if that was filtered out), for use as a continuation 
marker.
         */
diff --git a/extensions/Wikibase/repo/includes/ChangePruner.php 
b/extensions/Wikibase/repo/includes/ChangePruner.php
index 91946e2..8a3e438 100644
--- a/extensions/Wikibase/repo/includes/ChangePruner.php
+++ b/extensions/Wikibase/repo/includes/ChangePruner.php
@@ -89,7 +89,7 @@
                if ( !$this->ignoreDispatch ) {
                        $dbr = wfGetDB( DB_SLAVE );
                        $row = $dbr->selectRow(
-                               array ( 'wb_changes_dispatch', 'wb_changes' ),
+                               array( 'wb_changes_dispatch', 'wb_changes' ),
                                'min(change_time) as timestamp',
                                array(
                                        'chd_disabled' => 0,
diff --git a/extensions/Wikibase/repo/includes/Diff/EntityDiffVisualizer.php 
b/extensions/Wikibase/repo/includes/Diff/EntityDiffVisualizer.php
index 49a85dd..f8fdc4e 100644
--- a/extensions/Wikibase/repo/includes/Diff/EntityDiffVisualizer.php
+++ b/extensions/Wikibase/repo/includes/Diff/EntityDiffVisualizer.php
@@ -109,7 +109,7 @@
                $termDiffVisualizer = new DiffView(
                        array(),
                        new Diff(
-                               array (
+                               array(
                                        
$this->context->getLanguage()->getMessage( 'wikibase-diffview-label' ) => 
$diff->getLabelsDiff(),
                                        
$this->context->getLanguage()->getMessage( 'wikibase-diffview-alias' ) => 
$diff->getAliasesDiff(),
                                        
$this->context->getLanguage()->getMessage( 'wikibase-diffview-description' ) => 
$diff->getDescriptionsDiff(),
@@ -132,7 +132,7 @@
                        $linkDiffVisualizer = new DiffView(
                                array(),
                                new Diff(
-                                       array (
+                                       array(
                                                
$this->context->getLanguage()->getMessage( 'wikibase-diffview-link' ) => 
$diff->getSiteLinkDiff(),
                                        ),
                                        true
diff --git a/extensions/Wikibase/repo/includes/api/AvailableBadges.php 
b/extensions/Wikibase/repo/includes/api/AvailableBadges.php
index 90d6cd9..ebcf05b 100644
--- a/extensions/Wikibase/repo/includes/api/AvailableBadges.php
+++ b/extensions/Wikibase/repo/includes/api/AvailableBadges.php
@@ -9,8 +9,6 @@
 /**
  * API module to query available badge items.
  *
- * @todo this might also be useful to find badges suggestions based on labels
- *
  * @since 0.5
  * @licence GNU GPL v2+
  * @author Bene* < [email protected] >
diff --git a/extensions/Wikibase/repo/includes/rdf/RdfVocabulary.php 
b/extensions/Wikibase/repo/includes/rdf/RdfVocabulary.php
index 7ed998d..5bc5d06 100644
--- a/extensions/Wikibase/repo/includes/rdf/RdfVocabulary.php
+++ b/extensions/Wikibase/repo/includes/rdf/RdfVocabulary.php
@@ -81,7 +81,7 @@
         *
         * @var array
         */
-       private $namespaces = array ();
+       private $namespaces = array();
 
        /**
         * @var string
@@ -107,7 +107,7 @@
                }
                $propUri = $topUri."prop/";
 
-               $this->namespaces = array (
+               $this->namespaces = array(
                                'rdf' => 
'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
                                'rdfs' => 
'http://www.w3.org/2000/01/rdf-schema#',
                                'xsd' => 'http://www.w3.org/2001/XMLSchema#',
diff --git a/extensions/Wikibase/repo/includes/store/sql/DispatchStats.php 
b/extensions/Wikibase/repo/includes/store/sql/DispatchStats.php
index 2046c47..763a781 100644
--- a/extensions/Wikibase/repo/includes/store/sql/DispatchStats.php
+++ b/extensions/Wikibase/repo/includes/store/sql/DispatchStats.php
@@ -55,7 +55,7 @@
                );
 
                $res = $db->select(
-                       array (
+                       array(
                                'wb_changes_dispatch',
                                'wb_changes'
                        ),
diff --git a/extensions/Wikibase/repo/resources/Resources.php 
b/extensions/Wikibase/repo/resources/Resources.php
index 205a3ca..3df97f5 100644
--- a/extensions/Wikibase/repo/resources/Resources.php
+++ b/extensions/Wikibase/repo/resources/Resources.php
@@ -201,8 +201,8 @@
 
        return array_merge(
                $modules,
-               include( __DIR__ . '/experts/resources.php' ),
-               include( __DIR__ . '/formatters/resources.php' ),
-               include( __DIR__ . '/parsers/resources.php' )
+               include __DIR__ . '/experts/resources.php',
+               include __DIR__ . '/formatters/resources.php',
+               include __DIR__ . '/parsers/resources.php'
        );
 } );
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
index 8f7ecef..811aaaa 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
@@ -54,7 +54,7 @@
                $validatorFactory = $this->getTermValidatorFactory();
 
                $enAliases = array( 'en-alias1', 'en-alias2', 'en-alias3' );
-               $existingEnAliases = array ( 'en-existingAlias1', 
'en-existingAlias2' );
+               $existingEnAliases = array( 'en-existingAlias1', 
'en-existingAlias2' );
                $item = ItemContent::newEmpty();
                $entity = $item->getEntity();
                $entity->setAliases( 'en', $existingEnAliases );
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
index ab7e69c..4f062ca 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
@@ -43,8 +43,8 @@
                $validatorFactory = $this->getTermValidatorFactory();
 
                $args = array();
-               $args['update'] = array ( new ChangeOpDescription( 'en', 
'myNew', $validatorFactory ), 'myNew' );
-               $args['set to null'] = array ( new ChangeOpDescription( 'en', 
null, $validatorFactory ), '' );
+               $args['update'] = array( new ChangeOpDescription( 'en', 
'myNew', $validatorFactory ), 'myNew' );
+               $args['set to null'] = array( new ChangeOpDescription( 'en', 
null, $validatorFactory ), '' );
 
                return $args;
        }
@@ -69,11 +69,11 @@
                $validatorFactory = $this->getTermValidatorFactory();
 
                $args = array();
-               $args['valid description'] = array ( new ChangeOpDescription( 
'fr', 'valid', $validatorFactory ), true );
-               $args['invalid description'] = array ( new ChangeOpDescription( 
'fr', 'INVALID', $validatorFactory ), false );
-               $args['duplicate description'] = array ( new 
ChangeOpDescription( 'fr', 'DUPE', $validatorFactory ), false );
-               $args['invalid language'] = array ( new ChangeOpDescription( 
'INVALID', 'valid', $validatorFactory ), false );
-               $args['set bad language to null'] = array ( new 
ChangeOpDescription( 'INVALID', null, $validatorFactory ), false );
+               $args['valid description'] = array( new ChangeOpDescription( 
'fr', 'valid', $validatorFactory ), true );
+               $args['invalid description'] = array( new ChangeOpDescription( 
'fr', 'INVALID', $validatorFactory ), false );
+               $args['duplicate description'] = array( new 
ChangeOpDescription( 'fr', 'DUPE', $validatorFactory ), false );
+               $args['invalid language'] = array( new ChangeOpDescription( 
'INVALID', 'valid', $validatorFactory ), false );
+               $args['set bad language to null'] = array( new 
ChangeOpDescription( 'INVALID', null, $validatorFactory ), false );
 
                return $args;
        }
@@ -115,15 +115,14 @@
 
                $entity = $this->provideNewEntity();
                $entity->setDescription( 'de', 'Test' );
-               $args[] = array ( $entity, new ChangeOpDescription( 'de', 
'Zusammenfassung', $validatorFactory ), 'set', 'de' );
+               $args[] = array( $entity, new ChangeOpDescription( 'de', 
'Zusammenfassung', $validatorFactory ), 'set', 'de' );
 
                $entity = $this->provideNewEntity();
                $entity->setDescription( 'de', 'Test' );
-               $args[] = array ( $entity, new ChangeOpDescription( 'de', null, 
$validatorFactory ), 'remove', 'de' );
+               $args[] = array( $entity, new ChangeOpDescription( 'de', null, 
$validatorFactory ), 'remove', 'de' );
 
                $entity = $this->provideNewEntity();
-               $entity->removeDescription( 'de' );
-               $args[] = array ( $entity, new ChangeOpDescription( 'de', 
'Zusammenfassung', $validatorFactory ), 'add', 'de' );
+               $args[] = array( $entity, new ChangeOpDescription( 'de', 
'Zusammenfassung', $validatorFactory ), 'add', 'de' );
 
                return $args;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
index b3319f5..9de6652 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
@@ -43,8 +43,8 @@
                $validatorFactory = $this->getTermValidatorFactory();
 
                $args = array();
-               $args['update'] = array ( new ChangeOpLabel( 'en', 'myNew', 
$validatorFactory ), 'myNew' );
-               $args['set to null'] = array ( new ChangeOpLabel( 'en', null, 
$validatorFactory ), '' );
+               $args['update'] = array( new ChangeOpLabel( 'en', 'myNew', 
$validatorFactory ), 'myNew' );
+               $args['set to null'] = array( new ChangeOpLabel( 'en', null, 
$validatorFactory ), '' );
 
                return $args;
        }
@@ -69,11 +69,11 @@
                $validatorFactory = $this->getTermValidatorFactory();
 
                $args = array();
-               $args['valid label'] = array ( new ChangeOpLabel( 'fr', 
'valid', $validatorFactory ), true );
-               $args['invalid label'] = array ( new ChangeOpLabel( 'fr', 
'INVALID', $validatorFactory ), false );
-               $args['duplicate label'] = array ( new ChangeOpLabel( 'fr', 
'DUPE', $validatorFactory ), false );
-               $args['invalid language'] = array ( new ChangeOpLabel( 
'INVALID', 'valid', $validatorFactory ), false );
-               $args['set bad language to null'] = array ( new ChangeOpLabel( 
'INVALID', null, $validatorFactory ), false );
+               $args['valid label'] = array( new ChangeOpLabel( 'fr', 'valid', 
$validatorFactory ), true );
+               $args['invalid label'] = array( new ChangeOpLabel( 'fr', 
'INVALID', $validatorFactory ), false );
+               $args['duplicate label'] = array( new ChangeOpLabel( 'fr', 
'DUPE', $validatorFactory ), false );
+               $args['invalid language'] = array( new ChangeOpLabel( 
'INVALID', 'valid', $validatorFactory ), false );
+               $args['set bad language to null'] = array( new ChangeOpLabel( 
'INVALID', null, $validatorFactory ), false );
 
                return $args;
        }
@@ -115,15 +115,15 @@
 
                $entity = $this->provideNewEntity();
                $entity->getFingerprint()->setLabel( 'de', 'Test' );
-               $args[] = array ( $entity, new ChangeOpLabel( 'de', 
'Zusammenfassung', $validatorFactory ), 'set', 'de' );
+               $args[] = array( $entity, new ChangeOpLabel( 'de', 
'Zusammenfassung', $validatorFactory ), 'set', 'de' );
 
                $entity = $this->provideNewEntity();
                $entity->getFingerprint()->setLabel( 'de', 'Test' );
-               $args[] = array ( $entity, new ChangeOpLabel( 'de', null, 
$validatorFactory ), 'remove', 'de' );
+               $args[] = array( $entity, new ChangeOpLabel( 'de', null, 
$validatorFactory ), 'remove', 'de' );
 
                $entity = $this->provideNewEntity();
                $entity->removeLabel( 'de' );
-               $args[] = array ( $entity, new ChangeOpLabel( 'de', 
'Zusammenfassung', $validatorFactory
+               $args[] = array( $entity, new ChangeOpLabel( 'de', 
'Zusammenfassung', $validatorFactory
                ), 'add', 'de' );
 
                return $args;
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
index 80154d6..b9658a4 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
@@ -99,7 +99,7 @@
                $guid = '';
                $changeOp = $this->newChangeOpMainSnak( $guid, $newSnak );
                $expected = $newSnak->getDataValue();
-               $args['add new claim'] = array ( $item, $changeOp, $expected );
+               $args['add new claim'] = array( $item, $changeOp, $expected );
 
                // update an existing claim with a new main snak value
                $item = $this->makeNewItemWithClaim( 'Q234', $snak );
@@ -110,7 +110,7 @@
                $guid = $claim->getGuid();
                $changeOp = $this->newChangeOpMainSnak( $guid, $newSnak );
                $expected = $newSnak->getDataValue();
-               $args['update claim by guid'] = array ( $item, $changeOp, 
$expected );
+               $args['update claim by guid'] = array( $item, $changeOp, 
$expected );
 
                return $args;
        }
@@ -140,11 +140,11 @@
                // apply change to the wrong item
                $wrongItem = new Item( new ItemId( 'Q888' ) );
                $newSnak =  $this->makeSnak( 'P12', 'newww' );
-               $args['wrong entity'] = array ( $wrongItem, 
$this->newChangeOpMainSnak( $guid, $newSnak ) );
+               $args['wrong entity'] = array( $wrongItem, 
$this->newChangeOpMainSnak( $guid, $newSnak ) );
 
                // apply change to an unknown claim
                $wrongClaimId = $item->getId()->getSerialization() . 
'$DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF';
-               $args['unknown claim'] = array ( $item, 
$this->newChangeOpMainSnak( $wrongClaimId, $newSnak ) );
+               $args['unknown claim'] = array( $item, 
$this->newChangeOpMainSnak( $wrongClaimId, $newSnak ) );
 
                // update an existing claim with wrong main snak property
                $newSnak =  $this->makeSnak( 'P13', 'changedSnak' );
@@ -154,16 +154,16 @@
 
                $guid = $statement->getGuid();
                $changeOp = $this->newChangeOpMainSnak( $guid, $newSnak );
-               $args['wrong main snak property'] = array ( $item, $changeOp );
+               $args['wrong main snak property'] = array( $item, $changeOp );
 
                // apply invalid main snak
                $badSnak =  $this->makeSnak( 'P12', new NumberValue( 5 ) );
-               $args['bad value type'] = array ( $wrongItem, 
$this->newChangeOpMainSnak( $guid, $badSnak ) );
+               $args['bad value type'] = array( $wrongItem, 
$this->newChangeOpMainSnak( $guid, $badSnak ) );
 
                // apply invalid main snak
                // NOTE: the mock validator considers "INVALID" to be invalid.
                $badSnak = $this->makeSnak( 'P12', 'INVALID' );
-               $args['invalid value'] = array ( $wrongItem, 
$this->newChangeOpMainSnak( $guid, $badSnak ) );
+               $args['invalid value'] = array( $wrongItem, 
$this->newChangeOpMainSnak( $guid, $badSnak ) );
 
                return $args;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
index 63838f3..02c0e15 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
@@ -51,7 +51,7 @@
                $statement->getQualifiers()->addSnak( $newQualifier );
                $snakHash = $newQualifier->getHash();
                $changeOp = new ChangeOpQualifierRemove( $guid, $snakHash );
-               $args[] = array ( $item, $changeOp, $snakHash );
+               $args[] = array( $item, $changeOp, $snakHash );
 
                return $args;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
index 47db407..8fac099 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
@@ -83,7 +83,7 @@
                $newQualifier = new PropertyValueSnak( 78462378, new 
StringValue( 'newQualifier' ) );
                $changeOp = new ChangeOpQualifier( $guid, $newQualifier, '', 
$this->mockProvider->getMockSnakValidator() );
                $snakHash = $newQualifier->getHash();
-               $args[] = array ( $item, $changeOp, $snakHash );
+               $args[] = array( $item, $changeOp, $snakHash );
 
                return $args;
        }
@@ -114,7 +114,7 @@
                $snakHash = $newQualifier->getHash();
                $changedQualifier = new PropertyValueSnak( 78462378, new 
StringValue( 'changedQualifier' ) );
                $changeOp = new ChangeOpQualifier( $guid, $changedQualifier, 
$snakHash, $this->mockProvider->getMockSnakValidator() );
-               $args[] = array ( $item, $changeOp, 
$changedQualifier->getHash() );
+               $args[] = array( $item, $changeOp, $changedQualifier->getHash() 
);
 
                return $args;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
index 81b7b82..64b3642 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
@@ -55,7 +55,7 @@
                $statement->getReferences()->addReference( $newReference );
                $referenceHash = $newReference->getHash();
                $changeOp = new ChangeOpReferenceRemove( $guid, $referenceHash 
);
-               $args[ 'Removing a single reference' ] = array ( $item, 
$changeOp, $referenceHash );
+               $args[ 'Removing a single reference' ] = array( $item, 
$changeOp, $referenceHash );
 
                $item = $this->newItemWithClaim( 'q346', $snak );
                $statements = $item->getStatements()->toArray();
@@ -70,7 +70,7 @@
                $references->addReference( $newReference );
                $referenceHash = $newReference->getHash();
                $changeOp = new ChangeOpReferenceRemove( $guid, $referenceHash 
);
-               $args[ 'Removing references that have the same hash' ] = array 
( $item, $changeOp, $referenceHash );
+               $args[ 'Removing references that have the same hash' ] = array( 
$item, $changeOp, $referenceHash );
 
                return $args;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
index 276b5b2..73d8bb7 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
@@ -88,7 +88,7 @@
                $newReference = new Reference( $snaks );
                $changeOp = new ChangeOpReference( $guid, $newReference, '', 
$this->mockProvider->getMockSnakValidator() );
                $referenceHash = $newReference->getHash();
-               $args[] = array ( $item, $changeOp, $referenceHash );
+               $args[] = array( $item, $changeOp, $referenceHash );
 
                return $args;
        }
@@ -134,7 +134,7 @@
                        $newReferenceIndex
                );
 
-               $args[] = array ( $item, $changeOp, $newReference, 
$newReferenceIndex );
+               $args[] = array( $item, $changeOp, $newReference, 
$newReferenceIndex );
 
                return $args;
        }
@@ -174,7 +174,7 @@
                $snaks[] = new PropertyValueSnak( 78462378, new StringValue( 
'changedQualifier' ) );
                $changedReference = new Reference( $snaks );
                $changeOp = new ChangeOpReference( $guid, $changedReference, 
$referenceHash, $this->mockProvider->getMockSnakValidator() );
-               $args[] = array ( $item, $changeOp, 
$changedReference->getHash() );
+               $args[] = array( $item, $changeOp, $changedReference->getHash() 
);
 
                // Just change a reference's index:
                $item = $this->newItemWithClaim( $snak );
@@ -199,7 +199,7 @@
                        $this->mockProvider->getMockSnakValidator(),
                        0
                );
-               $args[] = array ( $item, $changeOp, $references[1]->getHash() );
+               $args[] = array( $item, $changeOp, $references[1]->getHash() );
 
                return $args;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
index 975546a..5e693c2 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
@@ -56,7 +56,7 @@
                $guid = $statement->getGuid();
                $changeOp = new ChangeOpRemoveStatement( $guid );
                $expected = null;
-               $args[] = array ( $item, $changeOp, $expected );
+               $args[] = array( $item, $changeOp, $expected );
 
                return $args;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
index 287ab0e..7dfb8be 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
@@ -81,7 +81,7 @@
                $args[] = array(
                        $item->copy(),
                        new ChangeOpSiteLink( 'enwiki', 'Berlin', array( new 
ItemId( 'Q149' ) ) ),
-                       array_merge( $existingSiteLinks, array ( $enSiteLink ) )
+                       array_merge( $existingSiteLinks, array( $enSiteLink ) )
                );
 
                // deleting sitelink
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
index a0f6678..3863d78 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
@@ -59,7 +59,7 @@
 
                $changeOp = new ChangeOpStatementRank( $guid, $rank );
 
-               $args[] = array ( $item, $changeOp, $rank );
+               $args[] = array( $item, $changeOp, $rank );
 
                return $args;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
index e90ec95..137edb8 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
@@ -46,9 +46,9 @@
                $validatorFactory = $this->getTermValidatorFactory();
 
                $ops = array();
-               $ops[] = array ( new ChangeOpLabel( 'en', 'myNewLabel', 
$validatorFactory ) );
-               $ops[] = array ( new ChangeOpDescription( 'de', 
'myNewDescription', $validatorFactory ) );
-               $ops[] = array ( new ChangeOpLabel( 'en', null, 
$validatorFactory ) );
+               $ops[] = array( new ChangeOpLabel( 'en', 'myNewLabel', 
$validatorFactory ) );
+               $ops[] = array( new ChangeOpDescription( 'de', 
'myNewDescription', $validatorFactory ) );
+               $ops[] = array( new ChangeOpLabel( 'en', null, 
$validatorFactory ) );
 
                return $ops;
        }
@@ -68,7 +68,7 @@
                $validatorFactory = $this->getTermValidatorFactory();
 
                $ops = array();
-               $ops[] = array (
+               $ops[] = array(
                                        array(
                                                new ChangeOpLabel( 'en', 
'enLabel', $validatorFactory ),
                                                new ChangeOpLabel( 'de', 
'deLabel', $validatorFactory ),
@@ -94,8 +94,8 @@
                $validatorFactory = $this->getTermValidatorFactory();
 
                $ops = array();
-               $ops[] = array ( 1234 );
-               $ops[] = array ( array( new ChangeOpLabel( 'en', 'test', 
$validatorFactory ), 123 ) );
+               $ops[] = array( 1234 );
+               $ops[] = array( array( new ChangeOpLabel( 'en', 'test', 
$validatorFactory ), 123 ) );
 
                return $ops;
        }
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php
index 3b41f9b..fcd102f 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php
@@ -80,7 +80,7 @@
        public function atomicClaimDifferenceProvider() {
                $claimDifferenceObjects = array();
                $changeOp = new DiffOpChange( "old", "new" );
-               $diff = new Diff( array ( $changeOp ) );
+               $diff = new Diff( array( $changeOp ) );
 
                $claimDifferenceObjects[] = new ClaimDifference( $changeOp );
                $claimDifferenceObjects[] = new ClaimDifference( null, $diff );
@@ -93,7 +93,7 @@
        public function nonAtomicClaimDifferenceProvider() {
                $claimDifferenceObjects = array();
                $changeOp = new DiffOpChange( "old", "new" );
-               $diff = new Diff( array ( $changeOp ) );
+               $diff = new Diff( array( $changeOp ) );
 
                $claimDifferenceObjects[] = new ClaimDifference();
                $claimDifferenceObjects[] = new ClaimDifference( $changeOp, 
$diff, null, null );
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
index c77ea40..e8e0b9f 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
@@ -37,13 +37,12 @@
                $item = new Item( new ItemId( 'Q11' ) );
                $item->setDescription( 'en', 'ohi there' );
                $item->setLabel( 'de', 'o_O' );
-               $item->addAliases( 'nl', array( 'foo', 'bar' ) );
+               $item->setAliases( 'nl', array( 'foo', 'bar' ) );
 
-               $item2 = $item->copy();
-               $item->setId( new ItemId( 'Q12' ) );
-               $item2->setAliases( 'nl', array( 'daaaah' ) );
+               $item2 = new Item( new ItemId( 'Q12' ) );
+               $item2->setLabel( 'de', 'o_O' );
                $item2->setLabel( 'en', 'O_o' );
-               $item2->removeDescription( 'en' );
+               $item2->setAliases( 'nl', array( 'daaaah' ) );
 
                $redirect = new EntityRedirect( new ItemId( 'Q11' ), new 
ItemId( 'Q21' ) );
                $redirect2 = new EntityRedirect( new ItemId( 'Q11' ), new 
ItemId( 'Q22' ) );
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/IO/EntityIdReaderTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
index 8086c12..5237903 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
@@ -107,7 +107,7 @@
                                'EntityIdReaderTest.txt',
                                null,
                                2,
-                               array (
+                               array(
                                        array( $q1, $p2 ),
                                        array( $q3, $p4 ),
                                        array(),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
index da036ba..d524c95 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
@@ -154,7 +154,7 @@
                                'de' => array( 'language' => 'de', 'value' => 
'berlin' )
                        ) ),
                        array( 'labels' => array( 'en' => array( 'language' => 
'en', 'value' => 'bar' ) ) ),
-                       array( ),
+                       array(),
                        array(
                                'labels' => array(
                                'en' => array( 'language' => 'en', 'value' => 
'bar' ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/HttpAcceptNegotiatorTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/HttpAcceptNegotiatorTest.php
index c5cc90b..37a36ae 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/HttpAcceptNegotiatorTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/HttpAcceptNegotiatorTest.php
@@ -18,8 +18,8 @@
        public function provideGetFirstSupportedValue() {
                return array(
                        array( // #0: empty
-                               array( ), // supported
-                               array( ), // accepted
+                               array(), // supported
+                               array(), // accepted
                                null, // default
                                null,  // expected
                        ),
@@ -75,8 +75,8 @@
        public function provideGetBestSupportedKey() {
                return array(
                        array( // #0: empty
-                               array( ), // supported
-                               array( ), // accepted
+                               array(), // supported
+                               array(), // accepted
                                null, // default
                                null,  // expected
                        ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
index 9c48357..256bd01 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
@@ -99,7 +99,7 @@
                $claim->setQualifiers( new SnakList( array(
                        new PropertyValueSnak( $p2, new StringValue( 'abc' ) )
                ) ) );
-               $claim->setReferences( new ReferenceList( array (
+               $claim->setReferences( new ReferenceList( array(
                        new Reference( new SnakList( array(
                                new PropertyValueSnak( $p2, new StringValue( 
'xyz' ) )
                        ) ) )
@@ -119,7 +119,7 @@
                $cases[] = array( $brokenClaim, 'error in qualifier', false );
 
                $brokenClaim = clone $claim;
-               $brokenClaim->setReferences( new ReferenceList( array (
+               $brokenClaim->setReferences( new ReferenceList( array(
                        new Reference( new SnakList( array(
                                new PropertyValueSnak( $p1, new StringValue( 
'xyz' ) )
                        ) ) )
@@ -149,7 +149,7 @@
                $references = new ReferenceList();
                $cases[] = array( $references, 'empty reference list', true );
 
-               $references = new ReferenceList( array (
+               $references = new ReferenceList( array(
                        new Reference( new SnakList( array(
                                new PropertyValueSnak( $p1, new StringValue( 
'123' ) )
                        ) ) ),
@@ -159,7 +159,7 @@
                ) );
                $cases[] = array( $references, 'conforming reference list', 
true );
 
-               $references = new ReferenceList( array (
+               $references = new ReferenceList( array(
                        new Reference( new SnakList( array(
                                new PropertyValueSnak( $p1, new StringValue( 
'123' ) )
                        ) ) ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
index f6b4a8f..6267b78 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/EditEntityTest.php
@@ -244,14 +244,14 @@
                                                'rank' => 'normal' ) ) ) ),
 
                        'change the claim' => array(
-                               'p' => array( 'data' => array (
-                                       'claims' => array (
-                                                       array (
+                               'p' => array( 'data' => array(
+                                       'claims' => array(
+                                                       array(
                                                                'id' => 
'%lastClaimId%',
-                                                               'mainsnak' => 
array (
+                                                               'mainsnak' => 
array(
                                                                                
'snaktype' => 'value',
                                                                                
'property' => '%P56%',
-                                                                               
'datavalue' => array ( 'value' => 'diffstring', 'type' => 'string' ),
+                                                                               
'datavalue' => array( 'value' => 'diffstring', 'type' => 'string' ),
                                                                        ),
                                                                'type' => 
'statement',
                                                                'rank' => 
'normal',
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/api/GetEntitiesTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/api/GetEntitiesTest.php
index 453a8a8..322a54c 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/GetEntitiesTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/GetEntitiesTest.php
@@ -412,7 +412,7 @@
                //todo more exception checks should be added once Bug:53038 is 
resolved
                return array(
                        array( //0 no params
-                               'p' => array( ),
+                               'p' => array(),
                                'e' => array( 'exception' => array( 'type' => 
'UsageException', 'code' => 'param-missing' ) ) ),
                        array( //1 bad id
                                'p' => array( 'ids' => 'ABCD' ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ItemByTitleHelperTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ItemByTitleHelperTest.php
index 402e0e0..7144698 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ItemByTitleHelperTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ItemByTitleHelperTest.php
@@ -189,14 +189,14 @@
                return array(
                        array(
                                // Request with no sites
-                               array( ),
+                               array(),
                                array( 'barfoo' ),
                                false
                        ),
                        array(
                                // Request with no titles
                                array( 'enwiki' ),
-                               array( ),
+                               array(),
                                false
                        ),
                );
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
index e9c1ae3..c187f6e 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -154,7 +154,7 @@
                                'type' => 'statement', 'rank' => 'normal', 'id' 
=> 'deadbeefdeadbeefdeadbeefdeadbeef' ) ) ) ),
                        array(),
                        array(),
-                       array( 'claims' => array( 'P1' => array ( array( 
'mainsnak' => array(
+                       array( 'claims' => array( 'P1' => array( array( 
'mainsnak' => array(
                                'snaktype' => 'value', 'property' => 'P1', 
'datavalue' => array( 'value' => 'imastring', 'type' => 'string' ) ),
                                'type' => 'statement', 'rank' => 'normal' ) ) ) 
),
                );
@@ -214,7 +214,7 @@
        public function provideExceptionParamsData() {
                return array(
                        array( //0 no ids given
-                               'p' => array( ),
+                               'p' => array(),
                                'e' => array( 'exception' => array( 'type' => 
'UsageException', 'code' => 'param-missing' ) ) ),
                        array( //1 only from id
                                'p' => array( 'fromid' => 'Q1' ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
index 9701227..b605142 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
@@ -51,7 +51,7 @@
                                'e' => array( 'value' => array( 'bat-smg' => 
'V?sata' ) ) ),
                        array( //7
                                'p' => array( 'language' => 'bat-smg', 'value' 
=> '' ),
-                               'e' => array( ) ),
+                               'e' => array() ),
                        array( //8
                                'p' => array( 'language' => 'en', 'value' => "  
x\nx  " ),
                                'e' => array( 'value' => array( 'en' => 'x x' ) 
) ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 322049c..1f50432 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -294,7 +294,7 @@
                                'zh_classicalwiki' => array(
                                        'site' => 'zh_classicalwiki',
                                        'title' => 'User:Addshore',
-                                       'badges' => array( )
+                                       'badges' => array()
                                ),
                        ),
                ) ) );
@@ -354,8 +354,7 @@
                                        'enwiki' => array(
                                                'site' => 'enwiki',
                                                'title' => 'Berlin',
-                                               'badges' => array(
-                                               )
+                                               'badges' => array()
                                        ),
                                ),
                        ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
index 590333f..aa0c0db 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/SetAliasesTest.php
@@ -75,7 +75,7 @@
                                'e' => array( 'value' => array( 'en' => array( 
'ohi' ) ) ) ),
                        array( //12
                                'p' => array( 'language' => 'en', 'remove' => 
'ohi' ),
-                               'e' => array(  ) ),
+                               'e' => array() ),
                        array( //13
                                'p' => array( 'language' => 'en', 'set' => "  
Foo\nBar  " ),
                                'e' => array( 'value' => array( 'en' => array( 
'Foo Bar' ) ) ) ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/content/EntityHandlerTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/content/EntityHandlerTest.php
index 72deef9..ee399cd 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/content/EntityHandlerTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/content/EntityHandlerTest.php
@@ -232,27 +232,33 @@
                $e1 = $this->newEntity();
                $r1 = $this->fakeRevision( $this->newEntityContent( $e1 ), 1 );
 
-               $e2 = $e1->copy();
+               $e2 = $this->newEntity();
                $e2->setLabel( 'en', 'Foo' );
                $r2 = $this->fakeRevision( $this->newEntityContent( $e2 ), 2 );
 
-               $e3 = $e2->copy();
+               $e3 = $this->newEntity();
+               $e3->setLabel( 'en', 'Foo' );
                $e3->setLabel( 'de', 'Fuh' );
                $r3 = $this->fakeRevision( $this->newEntityContent( $e3 ), 3 );
 
-               $e4 = $e3->copy();
+               $e4 = $this->newEntity();
+               $e4->setLabel( 'en', 'Foo' );
+               $e4->setLabel( 'de', 'Fuh' );
                $e4->setLabel( 'fr', 'Fu' );
                $r4 = $this->fakeRevision( $this->newEntityContent( $e4 ), 4 );
 
-               $e5 = $e4->copy();
+               $e5 = $this->newEntity();
                $e5->setLabel( 'en', 'F00' );
+               $e5->setLabel( 'de', 'Fuh' );
+               $e5->setLabel( 'fr', 'Fu' );
                $r5 = $this->fakeRevision( $this->newEntityContent( $e5 ), 5 );
 
-               $e5u4 = $e5->copy();
-               $e5u4->removeLabel( 'fr' );
+               $e5u4 = $this->newEntity();
+               $e5u4->setLabel( 'en', 'F00' );
+               $e5u4->setLabel( 'de', 'Fuh' );
 
-               $e5u4u3 = $e5u4->copy();
-               $e5u4u3->removeLabel( 'de' );
+               $e5u4u3 = $this->newEntity();
+               $e5u4u3->setLabel( 'en', 'F00' );
 
                return array(
                        array( $r5, $r5, $r4, $this->newEntityContent( $e4 ), 
"undo last edit" ),
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
index de241f7..54f9371 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
@@ -280,7 +280,7 @@
                                                    //       gregorian an 
output as an XSD date.
                                new PropertyId( 'P8' ),
                                new TimeValue( '+1492-10-12T00:00:00Z', 0, 0, 
0, TimeValue::PRECISION_DAY, RdfVocabulary::JULIAN_CALENDAR ),
-                               array (
+                               array(
                                        // Julian-to-Gregorian conversion 
applies.
                                        '<http://acme.test/Q11> 
<http://acme.test/prop/statement/P8> 
"1492-10-21T00:00:00Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> .',
                                        '<http://acme.test/Q11> 
<http://acme.test/prop/statement/value/P8> 
<http://acme.test/value/23a636870974bab8f1771b34aa994936> .',
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
index 3810a98..22dd128 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
@@ -257,7 +257,7 @@
                        array( 'claims' => array( 'P1' => array( $statement ) ) 
),
                        array(),
                        array(),
-                       array( 'claims' => array( 'P1' => array ( 
$statementWithoutId ) ) ),
+                       array( 'claims' => array( 'P1' => array( 
$statementWithoutId ) ) ),
                );
 
                return $testCases;
diff --git a/extensions/Wikibase/view/resources/jquery/wikibase/resources.php 
b/extensions/Wikibase/view/resources/jquery/wikibase/resources.php
index d49bb6e..17a500b 100644
--- a/extensions/Wikibase/view/resources/jquery/wikibase/resources.php
+++ b/extensions/Wikibase/view/resources/jquery/wikibase/resources.php
@@ -474,8 +474,8 @@
 
        return array_merge(
                $modules,
-               include( __DIR__ . '/snakview/resources.php' ),
-               include( __DIR__ . '/toolbar/resources.php' )
+               include __DIR__ . '/snakview/resources.php',
+               include __DIR__ . '/toolbar/resources.php'
        );
 
 } );
diff --git 
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php 
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php
index 53f415c..469b108 100644
--- a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php
+++ b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php
@@ -135,6 +135,6 @@
 
        return array_merge(
                $modules,
-               include( __DIR__ . '/controller/resources.php' )
+               include __DIR__ . '/controller/resources.php'
        );
 } );
diff --git a/extensions/Wikibase/view/resources/resources.php 
b/extensions/Wikibase/view/resources/resources.php
index e4a0c75..1ead957 100644
--- a/extensions/Wikibase/view/resources/resources.php
+++ b/extensions/Wikibase/view/resources/resources.php
@@ -6,13 +6,13 @@
  */
 return call_user_func( function() {
        return array_merge(
-               include( __DIR__ . '/jquery/resources.php' ),
-               include( __DIR__ . '/jquery/ui/resources.php' ),
-               include( __DIR__ . '/jquery/wikibase/resources.php' ),
-               include( __DIR__ . '/wikibase/resources.php' ),
-               include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
-               include( __DIR__ . '/wikibase/store/resources.php' ),
-               include( __DIR__ . '/wikibase/utilities/resources.php' ),
-               include( __DIR__ . '/wikibase/view/resources.php' )
+               include __DIR__ . '/jquery/resources.php',
+               include __DIR__ . '/jquery/ui/resources.php',
+               include __DIR__ . '/jquery/wikibase/resources.php',
+               include __DIR__ . '/wikibase/resources.php',
+               include __DIR__ . '/wikibase/entityChangers/resources.php',
+               include __DIR__ . '/wikibase/store/resources.php',
+               include __DIR__ . '/wikibase/utilities/resources.php',
+               include __DIR__ . '/wikibase/view/resources.php'
        );
 } );
diff --git a/extensions/Wikibase/view/src/Template/TemplateFactory.php 
b/extensions/Wikibase/view/src/Template/TemplateFactory.php
index 191ce99..bc83352 100644
--- a/extensions/Wikibase/view/src/Template/TemplateFactory.php
+++ b/extensions/Wikibase/view/src/Template/TemplateFactory.php
@@ -22,7 +22,7 @@
        public static function getDefaultInstance() {
                if ( self::$instance === null ) {
                        self::$instance = new self(
-                               new TemplateRegistry( include( __DIR__ . 
'/../../resources/templates.php' ) )
+                               new TemplateRegistry( include __DIR__ . 
'/../../resources/templates.php' )
                        );
                }
 
diff --git a/extensions/Wikibase/view/tests/phpunit/ClaimHtmlGeneratorTest.php 
b/extensions/Wikibase/view/tests/phpunit/ClaimHtmlGeneratorTest.php
index 4360712..10a6804 100644
--- a/extensions/Wikibase/view/tests/phpunit/ClaimHtmlGeneratorTest.php
+++ b/extensions/Wikibase/view/tests/phpunit/ClaimHtmlGeneratorTest.php
@@ -120,7 +120,7 @@
                        new Statement(
                                new PropertyValueSnak( 50, new StringValue( 
'chocolate!' ) ),
                                new SnakList(),
-                               new ReferenceList( array( new Reference( new 
SnakList( array (
+                               new ReferenceList( array( new Reference( new 
SnakList( array(
                                        new PropertyValueSnak( 50, new 
StringValue( 'second snak' ) )
                                ) ) ) ) )
                        ),
diff --git a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php 
b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
index 5492573..c4a3b3a 100644
--- a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
+++ b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/resources.php
@@ -308,8 +308,8 @@
 
        return array_merge(
                $modules,
-               include( __DIR__ . '/snakview/resources.php' ),
-               include( __DIR__ . '/toolbar/resources.php' )
+               include __DIR__ . '/snakview/resources.php',
+               include __DIR__ . '/toolbar/resources.php'
        );
 
 } );
diff --git a/extensions/Wikibase/view/tests/qunit/resources.php 
b/extensions/Wikibase/view/tests/qunit/resources.php
index 5d09c1d..269fa54 100644
--- a/extensions/Wikibase/view/tests/qunit/resources.php
+++ b/extensions/Wikibase/view/tests/qunit/resources.php
@@ -5,12 +5,12 @@
  * @author Adrian Heine < [email protected] >
  */
 return array_merge(
-       include( __DIR__ . '/jquery/resources.php' ),
-       include( __DIR__ . '/jquery/ui/resources.php' ),
-       include( __DIR__ . '/jquery/wikibase/resources.php' ),
-       include( __DIR__ . '/wikibase/resources.php' ),
-       include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
-       include( __DIR__ . '/wikibase/store/resources.php' ),
-       include( __DIR__ . '/wikibase/utilities/resources.php' ),
-       include( __DIR__ . '/wikibase/view/resources.php' )
+       include __DIR__ . '/jquery/resources.php',
+       include __DIR__ . '/jquery/ui/resources.php',
+       include __DIR__ . '/jquery/wikibase/resources.php',
+       include __DIR__ . '/wikibase/resources.php',
+       include __DIR__ . '/wikibase/entityChangers/resources.php',
+       include __DIR__ . '/wikibase/store/resources.php',
+       include __DIR__ . '/wikibase/utilities/resources.php',
+       include __DIR__ . '/wikibase/view/resources.php'
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3f8c605..17b913d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1212,12 +1212,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-            "reference": "a574bd67745de9276cf15b96077b5a6223c15e56"
+            "reference": "92b3d75c7fb5567164e97ce5cb38cbe00a59d084"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a574bd67745de9276cf15b96077b5a6223c15e56";,
-            "reference": "a574bd67745de9276cf15b96077b5a6223c15e56",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/92b3d75c7fb5567164e97ce5cb38cbe00a59d084";,
+            "reference": "92b3d75c7fb5567164e97ce5cb38cbe00a59d084",
             "shasum": ""
         },
         "require": {
@@ -1247,7 +1247,7 @@
         "require-dev": {
             "squizlabs/php_codesniffer": "~2.1"
         },
-        "time": "2015-07-02 20:36:42",
+        "time": "2015-07-03 14:38:51",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {

-- 
To view, visit https://gerrit.wikimedia.org/r/222746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia36998e00a824d2648dd88853d7ed83e534abab9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to