From: Thiemo Kreuz <thiemo.kreuz@wikimedia.de>
Date: Wed, 9 Jan 2019 15:49:25 +0000 (+0100)
Subject: Use shorter ?: syntax in Revision class
X-Git-Tag: 1.34.0-rc.0~2947
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=960a1acd5adee9395a0930f05695636263cbda02;p=lhc%2Fweb%2Fwiklou.git

Use shorter ?: syntax in Revision class

This is semantically the same because the returned object can't be
anything but an object (which can never be false), or null. Personlly,
I find the more expressive "=== null" check does not help here, but
makes the code a little harder to read.

Change-Id: Ib7390a7680f24fec7f5b9cea716603c14ad3f2dd
---

diff --git a/includes/Revision.php b/includes/Revision.php
index e48d4a5058..bf3751896e 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -117,7 +117,7 @@ class Revision implements IDBAccessObject {
 	 */
 	public static function newFromId( $id, $flags = 0 ) {
 		$rec = self::getRevisionLookup()->getRevisionById( $id, $flags );
-		return $rec === null ? null : new Revision( $rec, $flags );
+		return $rec ? new Revision( $rec, $flags ) : null;
 	}
 
 	/**
@@ -136,7 +136,7 @@ class Revision implements IDBAccessObject {
 	 */
 	public static function newFromTitle( LinkTarget $linkTarget, $id = 0, $flags = 0 ) {
 		$rec = self::getRevisionLookup()->getRevisionByTitle( $linkTarget, $id, $flags );
-		return $rec === null ? null : new Revision( $rec, $flags );
+		return $rec ? new Revision( $rec, $flags ) : null;
 	}
 
 	/**
@@ -155,7 +155,7 @@ class Revision implements IDBAccessObject {
 	 */
 	public static function newFromPageId( $pageId, $revId = 0, $flags = 0 ) {
 		$rec = self::getRevisionLookup()->getRevisionByPageId( $pageId, $revId, $flags );
-		return $rec === null ? null : new Revision( $rec, $flags );
+		return $rec ? new Revision( $rec, $flags ) : null;
 	}
 
 	/**
@@ -242,7 +242,7 @@ class Revision implements IDBAccessObject {
 	public static function loadFromId( $db, $id ) {
 		wfDeprecated( __METHOD__, '1.31' ); // no known callers
 		$rec = self::getRevisionStore()->loadRevisionFromId( $db, $id );
-		return $rec === null ? null : new Revision( $rec );
+		return $rec ? new Revision( $rec ) : null;
 	}
 
 	/**
@@ -259,7 +259,7 @@ class Revision implements IDBAccessObject {
 	 */
 	public static function loadFromPageId( $db, $pageid, $id = 0 ) {
 		$rec = self::getRevisionStore()->loadRevisionFromPageId( $db, $pageid, $id );
-		return $rec === null ? null : new Revision( $rec );
+		return $rec ? new Revision( $rec ) : null;
 	}
 
 	/**
@@ -276,7 +276,7 @@ class Revision implements IDBAccessObject {
 	 */
 	public static function loadFromTitle( $db, $title, $id = 0 ) {
 		$rec = self::getRevisionStore()->loadRevisionFromTitle( $db, $title, $id );
-		return $rec === null ? null : new Revision( $rec );
+		return $rec ? new Revision( $rec ) : null;
 	}
 
 	/**
@@ -294,7 +294,7 @@ class Revision implements IDBAccessObject {
 	 */
 	public static function loadFromTimestamp( $db, $title, $timestamp ) {
 		$rec = self::getRevisionStore()->loadRevisionFromTimestamp( $db, $title, $timestamp );
-		return $rec === null ? null : new Revision( $rec );
+		return $rec ? new Revision( $rec ) : null;
 	}
 
 	/**
@@ -1012,7 +1012,7 @@ class Revision implements IDBAccessObject {
 	public function getPrevious() {
 		$title = $this->getTitle();
 		$rec = self::getRevisionLookup()->getPreviousRevision( $this->mRecord, $title );
-		return $rec === null ? null : new Revision( $rec, self::READ_NORMAL, $title );
+		return $rec ? new Revision( $rec, self::READ_NORMAL, $title ) : null;
 	}
 
 	/**
@@ -1023,7 +1023,7 @@ class Revision implements IDBAccessObject {
 	public function getNext() {
 		$title = $this->getTitle();
 		$rec = self::getRevisionLookup()->getNextRevision( $this->mRecord, $title );
-		return $rec === null ? null : new Revision( $rec, self::READ_NORMAL, $title );
+		return $rec ? new Revision( $rec, self::READ_NORMAL, $title ) : null;
 	}
 
 	/**