[MediaWiki-commits] [Gerrit] Fix conflict between merged commits - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/52202


Change subject: Fix conflict between merged commits
......................................................................

Fix conflict between merged commits

Change-Id: I0489dec2719f02af8927250e078c8ad6f527a970
---
M repo/tests/phpunit/includes/Database/MWDB/ExtendedAbstractionTest.php
M repo/tests/phpunit/includes/Database/MediaWikiQueryInterfaceTest.php
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/02/52202/1

diff --git 
a/repo/tests/phpunit/includes/Database/MWDB/ExtendedAbstractionTest.php 
b/repo/tests/phpunit/includes/Database/MWDB/ExtendedAbstractionTest.php
index 810a71f..d18f2db 100644
--- a/repo/tests/phpunit/includes/Database/MWDB/ExtendedAbstractionTest.php
+++ b/repo/tests/phpunit/includes/Database/MWDB/ExtendedAbstractionTest.php
@@ -66,12 +66,12 @@
                ) );
 
                $tables[] = new TableDefinition( 'defaultfieldvalues', array(
-                       new FieldDefinition( 'intfield', 
FieldDefinition::TYPE_INTEGER, 42 ),
+                       new FieldDefinition( 'intfield', 
FieldDefinition::TYPE_INTEGER, true, 42 ),
                ) );
 
                $tables[] = new TableDefinition( 'notnullfields', array(
-                       new FieldDefinition( 'intfield', 
FieldDefinition::TYPE_INTEGER, null, null, false ),
-                       new FieldDefinition( 'textfield', 
FieldDefinition::TYPE_TEXT, null, null, false ),
+                       new FieldDefinition( 'intfield', 
FieldDefinition::TYPE_INTEGER, false ),
+                       new FieldDefinition( 'textfield', 
FieldDefinition::TYPE_TEXT, false ),
                ) );
 
                return $this->arrayWrap( $tables );
diff --git 
a/repo/tests/phpunit/includes/Database/MediaWikiQueryInterfaceTest.php 
b/repo/tests/phpunit/includes/Database/MediaWikiQueryInterfaceTest.php
index 85603f5..c6557e4 100644
--- a/repo/tests/phpunit/includes/Database/MediaWikiQueryInterfaceTest.php
+++ b/repo/tests/phpunit/includes/Database/MediaWikiQueryInterfaceTest.php
@@ -100,12 +100,12 @@
                ) );
 
                $tables[] = new TableDefinition( 'defaultfieldvalues', array(
-                       new FieldDefinition( 'intfield', 
FieldDefinition::TYPE_INTEGER, 42 ),
+                       new FieldDefinition( 'intfield', 
FieldDefinition::TYPE_INTEGER, true, 42 ),
                ) );
 
                $tables[] = new TableDefinition( 'notnullfields', array(
-                       new FieldDefinition( 'intfield', 
FieldDefinition::TYPE_INTEGER, null, null, false ),
-                       new FieldDefinition( 'textfield', 
FieldDefinition::TYPE_TEXT, null, null, false ),
+                       new FieldDefinition( 'intfield', 
FieldDefinition::TYPE_INTEGER, false ),
+                       new FieldDefinition( 'textfield', 
FieldDefinition::TYPE_TEXT, false ),
                ) );
 
                return $this->arrayWrap( $tables );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0489dec2719f02af8927250e078c8ad6f527a970
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits