From: daniel <dkinzler@wikimedia.org>
Date: Thu, 20 Dec 2018 18:26:42 +0000 (+0100)
Subject: Revision: Assert that $mRecord is never null in Revision
X-Git-Tag: 1.34.0-rc.0~3195^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=f4f66368e43a235e020dd9af0fa79c1a7c3ae4b7;p=lhc%2Fweb%2Fwiklou.git

Revision: Assert that $mRecord is never null in Revision

Bug: T187153
Change-Id: I828954855aa24114ec756e45d4dfe1468b2efa27
---

diff --git a/includes/Revision.php b/includes/Revision.php
index 6d1812a98e..b0a3ba35f2 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -29,6 +29,7 @@ use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\RevisionStoreRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Storage\SqlBlobStore;
+use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\IDatabase;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
@@ -589,6 +590,8 @@ class Revision implements IDBAccessObject {
 				'$row must be a row object, an associative array, or a RevisionRecord'
 			);
 		}
+
+		Assert::postcondition( $this->mRecord !== null, 'Failed to construct a RevisionRecord' );
 	}
 
 	/**
@@ -1180,9 +1183,7 @@ class Revision implements IDBAccessObject {
 		$rec = self::getRevisionStore()->insertRevisionOn( $this->mRecord, $dbw );
 
 		$this->mRecord = $rec;
-
-		// Avoid PHP 7.1 warning of passing $this by reference
-		$revision = $this;
+		Assert::postcondition( $this->mRecord !== null, 'Failed to acquire a RevisionRecord' );
 
 		return $rec->getId();
 	}