[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix NewStatement generating invalid statement GUIDs

2017-12-04 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392448 )

Change subject: Fix NewStatement generating invalid statement GUIDs
..


Fix NewStatement generating invalid statement GUIDs

Change-Id: I731312a810bb9d97dd3cf78fb8a7125aecb82340
---
M repo/tests/phpunit/includes/NewStatement.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/repo/tests/phpunit/includes/NewStatement.php 
b/repo/tests/phpunit/includes/NewStatement.php
index 1d5ab56..287a9cc 100644
--- a/repo/tests/phpunit/includes/NewStatement.php
+++ b/repo/tests/phpunit/includes/NewStatement.php
@@ -204,12 +204,12 @@
$result = new Statement( $snack );
$result->setRank( $this->rank );
 
-   if ( $this->guid ) {
-   if ( $this->guid === self::GENERATE_GUID ) {
-   $result->setGuid( $this->generateUuidV4() );
-   } else {
-   $result->setGuid( $this->guid );
-   }
+   if ( $this->guid === self::GENERATE_GUID ) {
+   $result->setGuid(
+   $this->propertyId->getSerialization() . '$' . 
$this->generateUuidV4()
+   );
+   } elseif ( $this->guid ) {
+   $result->setGuid( $this->guid );
}
 
foreach ( $this->qualifiers as $qualifier ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I731312a810bb9d97dd3cf78fb8a7125aecb82340
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix NewStatement generating invalid statement GUIDs

2017-11-20 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392448 )

Change subject: Fix NewStatement generating invalid statement GUIDs
..

Fix NewStatement generating invalid statement GUIDs

Change-Id: I731312a810bb9d97dd3cf78fb8a7125aecb82340
---
M repo/tests/phpunit/includes/NewStatement.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/NewStatement.php 
b/repo/tests/phpunit/includes/NewStatement.php
index 1d5ab56..287a9cc 100644
--- a/repo/tests/phpunit/includes/NewStatement.php
+++ b/repo/tests/phpunit/includes/NewStatement.php
@@ -204,12 +204,12 @@
$result = new Statement( $snack );
$result->setRank( $this->rank );
 
-   if ( $this->guid ) {
-   if ( $this->guid === self::GENERATE_GUID ) {
-   $result->setGuid( $this->generateUuidV4() );
-   } else {
-   $result->setGuid( $this->guid );
-   }
+   if ( $this->guid === self::GENERATE_GUID ) {
+   $result->setGuid(
+   $this->propertyId->getSerialization() . '$' . 
$this->generateUuidV4()
+   );
+   } elseif ( $this->guid ) {
+   $result->setGuid( $this->guid );
}
 
foreach ( $this->qualifiers as $qualifier ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I731312a810bb9d97dd3cf78fb8a7125aecb82340
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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