[MediaWiki-commits] [Gerrit] Remove NewClaim dependancy on Lib - change (mediawiki...WikibaseDataModel)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Remove NewClaim dependancy on Lib
......................................................................


Remove NewClaim dependancy on Lib

This change remove the guidgenerator dependancy and
switches the logic used in newClaim with that which
was previously in newClaimBase.

REQUIRES: Ibd4a56196af8 & I6fd508aa3941b3a in WB

Change-Id: Ibfae2f3de188430186ec59692595df061764401b
---
M DataModel/Entity/Entity.php
M DataModel/Entity/Item.php
2 files changed, 3 insertions(+), 25 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/DataModel/Entity/Entity.php b/DataModel/Entity/Entity.php
index 54bfa2b..4692f4f 100644
--- a/DataModel/Entity/Entity.php
+++ b/DataModel/Entity/Entity.php
@@ -793,35 +793,13 @@
        }
 
        /**
-        * Returns a new Claim with the provided Snak as main snak.
-        *
-        * @since 0.3
-        *
-        * @param Snak $mainSnak
-        * @param GuidGenerator|null $guidGenerator
-        *
-        * @return Claim
-        */
-       public final function newClaim( Snak $mainSnak, GuidGenerator 
$guidGenerator = null ) {
-               $claim = $this->newClaimBase( $mainSnak );
-
-               if ( $guidGenerator === null ) {
-                       $guidGenerator = new \Wikibase\Lib\ClaimGuidGenerator( 
$this->getId() );
-               }
-
-               $claim->setGuid( $guidGenerator->newGuid() );
-
-               return $claim;
-       }
-
-       /**
         * @since 0.3
         *
         * @param Snak $mainSnak
         *
         * @return Claim
         */
-       protected function newClaimBase( Snak $mainSnak ) {
+       public function newClaim( Snak $mainSnak ) {
                return new Claim( $mainSnak );
        }
 
diff --git a/DataModel/Entity/Item.php b/DataModel/Entity/Item.php
index a0e391b..2dc2945 100644
--- a/DataModel/Entity/Item.php
+++ b/DataModel/Entity/Item.php
@@ -251,7 +251,7 @@
        }
 
        /**
-        * @see Entity::newClaimBase
+        * @see Entity::newClaim
         *
         * @since 0.3
         *
@@ -259,7 +259,7 @@
         *
         * @return Statement
         */
-       protected function newClaimBase( Snak $mainSnak ) {
+       public function newClaim( Snak $mainSnak ) {
                return new Statement( $mainSnak );
        }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfae2f3de188430186ec59692595df061764401b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikibaseDataModel
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Daniel Werner <daniel.wer...@wikimedia.de>
Gerrit-Reviewer: Denny Vrandecic <denny.vrande...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot

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