jenkins-bot has submitted this change and it was merged.
Change subject: Use/fix stdClass type hints in …WikiPageEntity… classes
......................................................................
Use/fix stdClass type hints in …WikiPageEntity… classes
The services these classes use return "stdClass", not "object". And the
code that uses the classes in *this* patch also expect "stdClass".
Change-Id: I615e765314dc047c8a56988b990f5b5810c9f735
---
M lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
M lib/includes/store/sql/WikiPageEntityMetaDataAccessor.php
M lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
M lib/includes/store/sql/WikiPageEntityRevisionLookup.php
4 files changed, 15 insertions(+), 11 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
b/lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
index 377ad11..2072c0d 100644
--- a/lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
+++ b/lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
@@ -3,6 +3,7 @@
namespace Wikibase\Lib\Store\Sql;
use MapCacheLRU;
+use stdClass;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityRedirect;
use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
@@ -138,7 +139,7 @@
* @param EntityId[] $entityIds
* @param string $mode (EntityRevisionLookup::LATEST_FROM_SLAVE or
EntityRevisionLookup::LATEST_FROM_MASTER)
*
- * @return array of entity id serialization => object or false if no
such entity exists.
+ * @return stdClass[] Array of entity id serialization => object.
*/
public function loadRevisionInformation( array $entityIds, $mode ) {
if ( $mode === EntityRevisionLookup::LATEST_FROM_MASTER ) {
@@ -174,7 +175,7 @@
* @param EntityId $entityId
* @param int $revisionId
*
- * @return object|bool false if no such entity exists
+ * @return stdClass|bool false if no such entity exists
*/
public function loadRevisionInformationByRevisionId( EntityId
$entityId, $revisionId ) {
// Caching this would have little or no benefit, but would be
rather complex.
diff --git a/lib/includes/store/sql/WikiPageEntityMetaDataAccessor.php
b/lib/includes/store/sql/WikiPageEntityMetaDataAccessor.php
index 79d1870..82a36a0 100644
--- a/lib/includes/store/sql/WikiPageEntityMetaDataAccessor.php
+++ b/lib/includes/store/sql/WikiPageEntityMetaDataAccessor.php
@@ -2,6 +2,7 @@
namespace Wikibase\Lib\Store\Sql;
+use stdClass;
use Wikibase\DataModel\Entity\EntityId;
/**
@@ -24,7 +25,7 @@
* @param EntityId[] $entityIds
* @param string $mode (EntityRevisionLookup::LATEST_FROM_SLAVE or
EntityRevisionLookup::LATEST_FROM_MASTER)
*
- * @return array of entity id serialization => object or false if no
such entity exists.
+ * @return stdClass[] Array of entity id serialization => object.
*/
public function loadRevisionInformation( array $entityIds, $mode );
@@ -37,7 +38,7 @@
* @param EntityId $entityId
* @param int $revisionId Revision id to fetch data about, must be an
integer greater than 0.
*
- * @return object|bool false if no such entity exists
+ * @return stdClass|bool false if no such entity exists
*/
public function loadRevisionInformationByRevisionId( EntityId
$entityId, $revisionId );
diff --git a/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
b/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
index f68c77f..9d9ec26 100644
--- a/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
+++ b/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
@@ -6,6 +6,7 @@
use DBAccessBase;
use DBQueryError;
use ResultWrapper;
+use stdClass;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\Lib\Store\EntityRevisionLookup;
@@ -47,7 +48,7 @@
* @param string $mode (EntityRevisionLookup::LATEST_FROM_SLAVE or
EntityRevisionLookup::LATEST_FROM_MASTER)
*
* @throws DBQueryError
- * @return array of entity id serialization => object or false if no
such entity exists.
+ * @return stdClass[] Array of entity id serialization => object.
*/
public function loadRevisionInformation( array $entityIds, $mode ) {
$rows = array();
@@ -78,7 +79,7 @@
* @param int $revisionId
*
* @throws DBQueryError
- * @return object|bool
+ * @return stdClass|bool
*/
public function loadRevisionInformationByRevisionId( EntityId
$entityId, $revisionId ) {
$row = $this->selectRevisionInformationById( $entityId,
$revisionId, DB_SLAVE );
@@ -120,7 +121,7 @@
* @param int $connType DB_SLAVE or DB_MASTER
*
* @throws DBQueryError If the query fails.
- * @return object|bool a raw database row object, or false if no such
entity revision exists.
+ * @return stdClass|bool a raw database row object, or false if no such
entity revision exists.
*/
private function selectRevisionInformationById( EntityId $entityId,
$revisionId, $connType ) {
$db = $this->getConnection( $connType );
@@ -155,7 +156,7 @@
* @param int $connType DB_SLAVE or DB_MASTER
*
* @throws DBQueryError If the query fails.
- * @return array of entity id serialization => object or false if no
such entity exists.
+ * @return stdClass[] Array of entity id serialization => object.
*/
private function selectRevisionInformationMultiple( array $entityIds,
$connType ) {
$db = $this->getConnection( $connType );
@@ -191,7 +192,7 @@
* @param EntityId[] $entityIds
* @param ResultWrapper $res
*
- * @return array of entity id serialization => object or false if no
such entity exists.
+ * @return stdClass[] Array of entity id serialization => object.
*/
private function indexResultByEntityId( array $entityIds, ResultWrapper
$res ) {
$rows = array();
diff --git a/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
b/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
index 8a23930..7f529bd 100644
--- a/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
+++ b/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
@@ -5,6 +5,7 @@
use DBAccessBase;
use MWContentSerializationException;
use Revision;
+use stdClass;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityRedirect;
use Wikibase\Lib\Store\Sql\WikiPageEntityMetaDataAccessor;
@@ -148,7 +149,7 @@
*
* @see loadEntityBlob()
*
- * @param object $row a row object as expected
Revision::getRevisionText(). That is, it
+ * @param stdClass $row a row object as expected
Revision::getRevisionText(). That is, it
* should contain the relevant fields from the revision and/or
text table.
*
* @throws MWContentSerializationException
@@ -184,7 +185,7 @@
* This calls Revision::getRevisionText to resolve any additional
indirections in getting
* to the actual blob data, like the "External Store" mechanism used by
Wikipedia & co.
*
- * @param object $row a row object as expected
Revision::getRevisionText(). That is, it
+ * @param stdClass $row a row object as expected
Revision::getRevisionText(). That is, it
* should contain the relevant fields from the revision and/or
text table.
*
* @throws MWContentSerializationException
--
To view, visit https://gerrit.wikimedia.org/r/277997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I615e765314dc047c8a56988b990f5b5810c9f735
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
