[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use EntityIdComposer instead of sending numeric id to Entity...

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

Change subject: Use EntityIdComposer instead of sending numeric id to 
EntityId::setId()
..


Use EntityIdComposer instead of sending numeric id to EntityId::setId()

Bug: T151577
Change-Id: Ia9e4bcca2d55c3684507e465f455b91df5a11835
---
M repo/includes/Store/Sql/SqlStore.php
M repo/includes/Store/Sql/WikiPageEntityStore.php
M repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
3 files changed, 15 insertions(+), 5 deletions(-)

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



diff --git a/repo/includes/Store/Sql/SqlStore.php 
b/repo/includes/Store/Sql/SqlStore.php
index 837706d..4cc5508 100644
--- a/repo/includes/Store/Sql/SqlStore.php
+++ b/repo/includes/Store/Sql/SqlStore.php
@@ -434,7 +434,7 @@
$contentFactory = 
WikibaseRepo::getDefaultInstance()->getEntityContentFactory();
$idGenerator = $this->newIdGenerator();
 
-   $store = new WikiPageEntityStore( $contentFactory, $idGenerator 
);
+   $store = new WikiPageEntityStore( $contentFactory, 
$idGenerator, $this->entityIdComposer );
$store->registerWatcher( $this->getEntityStoreWatcher() );
return $store;
}
diff --git a/repo/includes/Store/Sql/WikiPageEntityStore.php 
b/repo/includes/Store/Sql/WikiPageEntityStore.php
index cdcfddd..5fbd30a 100644
--- a/repo/includes/Store/Sql/WikiPageEntityStore.php
+++ b/repo/includes/Store/Sql/WikiPageEntityStore.php
@@ -15,6 +15,7 @@
 use Wikibase\EntityContent;
 use Wikibase\EntityRevision;
 use Wikibase\IdGenerator;
+use Wikibase\Lib\EntityIdComposer;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Lib\Store\EntityStoreWatcher;
 use Wikibase\Lib\Store\StorageException;
@@ -47,14 +48,22 @@
 */
private $dispatcher;
 
+   /**
+* @var EntityIdComposer
+*/
+   private $entityIdComposer;
+
public function __construct(
EntityContentFactory $contentFactory,
-   IdGenerator $idGenerator
+   IdGenerator $idGenerator,
+   EntityIdComposer $entityIdComposer
) {
$this->contentFactory = $contentFactory;
$this->idGenerator = $idGenerator;
 
$this->dispatcher = new GenericEventDispatcher( 
EntityStoreWatcher::class );
+
+   $this->entityIdComposer = $entityIdComposer;
}
 
/**
@@ -92,8 +101,8 @@
$contentModelId = $handler->getModelID();
$numericId = $this->idGenerator->getNewId( $contentModelId );
 
-   // FIXME: this relies on setId() accepting numeric IDs! Use an 
EntityIdComposer instead.
-   $entity->setId( $numericId );
+   $entityId = $this->entityIdComposer->composeEntityId( '', 
$type, $numericId );
+   $entity->setId( $entityId );
}
 
/**
diff --git a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php 
b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
index 9343d4c..8687262 100644
--- a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
@@ -108,7 +108,8 @@
},
]
),
-   new SqlIdGenerator( wfGetLB() )
+   new SqlIdGenerator( wfGetLB() ),
+   $wikibaseRepo->getEntityIdComposer()
);
 
return [ $store, $lookup ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9e4bcca2d55c3684507e465f455b91df5a11835
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: AnotherLadsgroup 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
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]: Use EntityIdComposer instead of sending numeric id to Entity...

2017-07-22 Thread AnotherLadsgroup (Code Review) 
AnotherLadsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367024 )

Change subject: Use EntityIdComposer instead of sending numeric id to 
EntityId::setId()
..

Use EntityIdComposer instead of sending numeric id to EntityId::setId()

Bug: T151577
Change-Id: Ia9e4bcca2d55c3684507e465f455b91df5a11835
---
M repo/includes/Store/Sql/SqlStore.php
M repo/includes/Store/Sql/WikiPageEntityStore.php
M repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
3 files changed, 15 insertions(+), 5 deletions(-)


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

diff --git a/repo/includes/Store/Sql/SqlStore.php 
b/repo/includes/Store/Sql/SqlStore.php
index 837706d..4cc5508 100644
--- a/repo/includes/Store/Sql/SqlStore.php
+++ b/repo/includes/Store/Sql/SqlStore.php
@@ -434,7 +434,7 @@
$contentFactory = 
WikibaseRepo::getDefaultInstance()->getEntityContentFactory();
$idGenerator = $this->newIdGenerator();
 
-   $store = new WikiPageEntityStore( $contentFactory, $idGenerator 
);
+   $store = new WikiPageEntityStore( $contentFactory, 
$idGenerator, $this->entityIdComposer );
$store->registerWatcher( $this->getEntityStoreWatcher() );
return $store;
}
diff --git a/repo/includes/Store/Sql/WikiPageEntityStore.php 
b/repo/includes/Store/Sql/WikiPageEntityStore.php
index cdcfddd..5fbd30a 100644
--- a/repo/includes/Store/Sql/WikiPageEntityStore.php
+++ b/repo/includes/Store/Sql/WikiPageEntityStore.php
@@ -15,6 +15,7 @@
 use Wikibase\EntityContent;
 use Wikibase\EntityRevision;
 use Wikibase\IdGenerator;
+use Wikibase\Lib\EntityIdComposer;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Lib\Store\EntityStoreWatcher;
 use Wikibase\Lib\Store\StorageException;
@@ -47,14 +48,22 @@
 */
private $dispatcher;
 
+   /**
+* @var EntityIdComposer
+*/
+   private $entityIdComposer;
+
public function __construct(
EntityContentFactory $contentFactory,
-   IdGenerator $idGenerator
+   IdGenerator $idGenerator,
+   EntityIdComposer $entityIdComposer
) {
$this->contentFactory = $contentFactory;
$this->idGenerator = $idGenerator;
 
$this->dispatcher = new GenericEventDispatcher( 
EntityStoreWatcher::class );
+
+   $this->entityIdComposer = $entityIdComposer;
}
 
/**
@@ -92,8 +101,8 @@
$contentModelId = $handler->getModelID();
$numericId = $this->idGenerator->getNewId( $contentModelId );
 
-   // FIXME: this relies on setId() accepting numeric IDs! Use an 
EntityIdComposer instead.
-   $entity->setId( $numericId );
+   $entityId = $this->entityIdComposer->composeEntityId( '', 
$type, $numericId );
+   $entity->setId( $entityId );
}
 
/**
diff --git a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php 
b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
index 9343d4c..8687262 100644
--- a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityStoreTest.php
@@ -108,7 +108,8 @@
},
]
),
-   new SqlIdGenerator( wfGetLB() )
+   new SqlIdGenerator( wfGetLB() ),
+   $wikibaseRepo->getEntityIdComposer()
);
 
return [ $store, $lookup ];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9e4bcca2d55c3684507e465f455b91df5a11835
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: AnotherLadsgroup 

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