SemanticMediaWiki / SemanticApprovedRevs

src/PropertyRegistry.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 	 *
 	 * @param PropertyRegistry $propertyRegistry
 	 */
-	public function register( $propertyRegistry ) {
+	public function register($propertyRegistry) {
 
 		$defs = [
 			self::SAR_PROP_APPROVED_REV => [
@@ -53,7 +53,7 @@ 
 			]
 		];
 
-		foreach ( $defs as $key => $definition ) {
+		foreach ($defs as $key => $definition) {
 
 			$propertyRegistry->registerProperty(
 				$key,
@@ -64,7 +64,7 @@ 
 
 			$propertyRegistry->registerPropertyAlias(
 				$key,
-				wfMessage( $definition['alias'] )->text()
+				wfMessage($definition['alias'])->text()
 			);
 
 			$propertyRegistry->registerPropertyAliasByMsgKey(

src/ApprovedRevsHandler.php

Spacing +20 added lines, -20 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param ApprovedRevsFacade $approvedRevsFacade
 	 * @param RepoGroup|null $repoGroup
 	 */
-	public function __construct( ApprovedRevsFacade $approvedRevsFacade, RepoGroup $repoGroup = null ) {
+	public function __construct(ApprovedRevsFacade $approvedRevsFacade, RepoGroup $repoGroup = null) {
 		$this->approvedRevsFacade = $approvedRevsFacade;
 		$this->repoGroup = $repoGroup;
 	}
@@ -46,13 +46,13 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function isApprovedUpdate( Title $title, $latestRevID ) {
+	public function isApprovedUpdate(Title $title, $latestRevID) {
 
-		if ( !$this->approvedRevsFacade->hasApprovedRevision( $title ) ) {
+		if (!$this->approvedRevsFacade->hasApprovedRevision($title)) {
 			return true;
 		}
 
-		if ( ( $approvedRevID = $this->approvedRevsFacade->getApprovedRevID( $title ) ) !== null ) {
+		if (($approvedRevID = $this->approvedRevsFacade->getApprovedRevID($title)) !== null) {
 			return $approvedRevID == $latestRevID;
 		}
 
@@ -65,14 +65,14 @@ 
 	 * @param Title $title
 	 * @param ?RevisionStoreRecord &$revision
 	 */
-	public function doChangeRevision( Title $title, ?RevisionStoreRecord &$revision ) {
+	public function doChangeRevision(Title $title, ?RevisionStoreRecord &$revision) {
 
 		// Forcibly change the revision to match what ApprovedRevs sees as
 		// approved
-		if ( ( $approvedRevID = $this->approvedRevsFacade->getApprovedRevID( $title ) ) !== null ) {
+		if (($approvedRevID = $this->approvedRevsFacade->getApprovedRevID($title)) !== null) {
 			$approvedRev = MediaWikiServices::getInstance()
-					   ->getRevisionLookup()->getRevisionById( $approvedRevID );
-			if ( $approvedRev instanceof RevisionStoreRecord ) {
+					   ->getRevisionLookup()->getRevisionById($approvedRevID);
+			if ($approvedRev instanceof RevisionStoreRecord) {
 				$revision = $approvedRev;
 			}
 		}
@@ -84,9 +84,9 @@ 
 	 * @param Title $title
 	 * @param integer &$revisionID
 	 */
-	public function doChangeRevisionID( Title $title, &$revisionID ) {
+	public function doChangeRevisionID(Title $title, &$revisionID) {
 
-		if ( ( $approvedRevID = $this->approvedRevsFacade->getApprovedRevID( $title ) ) !== null ) {
+		if (($approvedRevID = $this->approvedRevsFacade->getApprovedRevID($title)) !== null) {
 			$revisionID = $approvedRevID;
 		}
 	}
@@ -97,37 +97,37 @@ 
 	 * @param Title $title
 	 * @param File &$file
 	 */
-	public function doChangeFile( Title $title, &$file ) {
+	public function doChangeFile(Title $title, &$file) {
 
 		// It has been observed that when running `runJobs.php` with `--wait`
 		// the `ApprovedRevs` instance holds an outdated cache entry therefore
 		// clear the static before trying to get the info
-		$this->approvedRevsFacade->clearApprovedFileInfo( $title );
+		$this->approvedRevsFacade->clearApprovedFileInfo($title);
 
-		list( $timestamp, $file_sha1 ) = $this->approvedRevsFacade->getApprovedFileInfo(
+		list($timestamp, $file_sha1) = $this->approvedRevsFacade->getApprovedFileInfo(
 			$title
 		);
 
-		if ( $file_sha1 === false ) {
+		if ($file_sha1 === false) {
 			return true;
 		}
 
-		if ( $this->repoGroup === null ) {
+		if ($this->repoGroup === null) {
 			$this->repoGroup = RepoGroup::singleton();
 		}
 
 		$localRepo = $this->repoGroup->getLocalRepo();
 
 		// Retrievalable from the archive?
-		$file = OldLocalFile::newFromKey( $file_sha1, $localRepo, $timestamp );
+		$file = OldLocalFile::newFromKey($file_sha1, $localRepo, $timestamp);
 
 		// Try the local repo!
-		if ( $file === false ) {
-			$files = $localRepo->findBySha1( $file_sha1 );
-			$file = end( $files );
+		if ($file === false) {
+			$files = $localRepo->findBySha1($file_sha1);
+			$file = end($files);
 		}
 
-		if ( $file instanceof File ) {
+		if ($file instanceof File) {
 			$file->file_sha1 = $file_sha1;
 		}
 	}

src/DatabaseLogReader.php

Spacing +22 added lines, -22 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param Title|null $title
 	 * @param string $type of log (default: approval)
 	 */
-	public function __construct( IDatabase $dbr, Title $title = null , $type = 'approval' ) {
+	public function __construct(IDatabase $dbr, Title $title = null, $type = 'approval') {
 		$this->dbr = $dbr;
 		$this->dbKey = $title instanceof Title ? $title->getDBkey() : null;
 		$this->type = $type;
@@ -80,13 +80,13 @@ 
 	 *
 	 * @return User
 	 */
-	public function getUserForLogEntry( Title $title = null, $type = 'approval' ) {
+	public function getUserForLogEntry(Title $title = null, $type = 'approval') {
 
-		$this->init( $title, $type );
+		$this->init($title, $type);
 		$logLine = $this->getLog()->current();
 
-		if ( $logLine && $logLine->user_id ) {
-			return User::newFromID( $logLine->user_id );
+		if ($logLine && $logLine->user_id) {
+			return User::newFromID($logLine->user_id);
 		}
 	}
 
@@ -98,13 +98,13 @@ 
 	 *
 	 * @return Timestamp
 	 */
-	public function getDateOfLogEntry( Title $title = null, $type = 'approval' ) {
+	public function getDateOfLogEntry(Title $title = null, $type = 'approval') {
 
-		$this->init( $title, $type );
+		$this->init($title, $type);
 		$logLine = $this->getLog()->current();
 
-		if ( $logLine && $logLine->log_timestamp ) {
-			return new MWTimestamp( $logLine->log_timestamp );
+		if ($logLine && $logLine->log_timestamp) {
+			return new MWTimestamp($logLine->log_timestamp);
 		}
 	}
 
@@ -116,12 +116,12 @@ 
 	 *
 	 * @return string
 	 */
-	public function getStatusOfLogEntry( Title $title = null, $type = 'approval' ) {
+	public function getStatusOfLogEntry(Title $title = null, $type = 'approval') {
 
-		$this->init( $title, $type );
+		$this->init($title, $type);
 		$logLine = $this->getLog()->current();
 
-		if ( $logLine && $logLine->log_action ) {
+		if ($logLine && $logLine->log_action) {
 			return $logLine->log_action;
 		}
 	}
@@ -129,26 +129,26 @@ 
 	/**
 	 * Take care of loading from the cache or filling the query.
 	 */
-	private function init( $title, $type ) {
+	private function init($title, $type) {
 
 		$this->dbKey = $title instanceof Title ? $title->getDBkey() : null;
 		$this->type = $type;
 
-		if ( $this->query ) {
+		if ($this->query) {
 			return;
 		}
 
-		if ( !isset( self::$titleCache[ $this->dbKey . '#' . $this->type ] ) ) {
+		if (!isset(self::$titleCache[$this->dbKey . '#' . $this->type])) {
 			$this->query = DatabaseLogEntry::getSelectQueryData();
 
 			$this->query['conds'] = [
 				'log_type' => $this->type,
 				'log_title' => $this->dbKey
 			];
-			$this->query['options'] = [ 'ORDER BY' => 'log_timestamp desc' ];
-			self::$titleCache[ $this->dbKey ] = $this;
+			$this->query['options'] = ['ORDER BY' => 'log_timestamp desc'];
+			self::$titleCache[$this->dbKey] = $this;
 		} else {
-			$cache = self::$titleCache[ $this->dbKey . '#' . $this->type ];
+			$cache = self::$titleCache[$this->dbKey . '#' . $this->type];
 			$this->query = $cache->getQuery();
 			$this->log = $cache->getLog();
 		}
@@ -163,7 +163,7 @@ 
 	 */
 	private function getLog() {
 
-		if ( $this->log !== null ) {
+		if ($this->log !== null) {
 			return $this->log;
 		}
 
@@ -178,13 +178,13 @@ 
 			$query['join_conds']
 		);
 
-		if ( $this->log === null ) {
+		if ($this->log === null) {
 			$this->log = new ArrayIterator(
-				[ (object)[
+				[(object)[
 					'user_id' => null,
 					'log_timestamp' => null,
 					'log_action' => null
-				] ]
+				]]
 			);
 		}
 

src/PropertyAnnotator.php

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
 	 *
 	 * @param ServicesFactory $servicesFactory
 	 */
-	public function __construct( ServicesFactory $servicesFactory ) {
+	public function __construct(ServicesFactory $servicesFactory) {
 		$this->servicesFactory = $servicesFactory;
 	}
 
@@ -46,31 +46,31 @@ 
 	 *
 	 * @param SemanticData $semanticData
 	 */
-	public function addAnnotation( SemanticData $semanticData ) {
+	public function addAnnotation(SemanticData $semanticData) {
 
-		$time = microtime( true );
+		$time = microtime(true);
 
-		if ( !$this->canAnnotate( $semanticData->getSubject() ) ) {
+		if (!$this->canAnnotate($semanticData->getSubject())) {
 			return;
 		}
 
-		if ( $this->propertyAnnotators === [] ) {
+		if ($this->propertyAnnotators === []) {
 			$this->initPropertyAnnotators();
 		}
 
-		foreach ( $this->propertyAnnotators as $propertyAnnotator ) {
-			$propertyAnnotator->addAnnotation( $semanticData );
+		foreach ($this->propertyAnnotators as $propertyAnnotator) {
+			$propertyAnnotator->addAnnotation($semanticData);
 		}
 
 		$this->logger->info(
-			[ 'SemanticApprovedRevs', 'procTime:{procTime}' ],
-			[ 'procTime' => round( ( microtime( true ) - $time ), 5 ) ]
+			['SemanticApprovedRevs', 'procTime:{procTime}'],
+			['procTime' => round((microtime(true) - $time), 5)]
 		);
 	}
 
-	private function canAnnotate( $subject ) {
+	private function canAnnotate($subject) {
 
-		if ( $subject === null || $subject->getTitle() === null || $subject->getTitle()->isSpecialPage() ) {
+		if ($subject === null || $subject->getTitle() === null || $subject->getTitle()->isSpecialPage()) {
 			return false;
 		}
 

src/ServicesFactory.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
 	/**
 	 * @since 1.0
 	 */
-	public function setConnection( \DatabaseBase $connection ) {
+	public function setConnection(\DatabaseBase $connection) {
 		$this->connection = $connection;
 	}
 
@@ -35,8 +35,8 @@ 
 	 */
 	public function getConnection() {
 
-		if ( $this->connection === null ) {
-			$this->connection = wfGetDB( DB_REPLICA );
+		if ($this->connection === null) {
+			$this->connection = wfGetDB(DB_REPLICA);
 		}
 
 		return $this->connection;
@@ -58,8 +58,8 @@ 
 	 * @param string $type which log entries to get (default: approval)
 	 * @return DatabaseLogReader
 	 */
-	public function newDatabaseLogReader( Title $title = null, $type = 'approval' ) {
-		return new DatabaseLogReader( $this->getConnection(), $title, $type );
+	public function newDatabaseLogReader(Title $title = null, $type = 'approval') {
+		return new DatabaseLogReader($this->getConnection(), $title, $type);
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 	 * @return ApprovedByPropertyAnnotator
 	 */
 	public function newApprovedByPropertyAnnotator() {
-		return new ApprovedByPropertyAnnotator( $this->newDatabaseLogReader() );
+		return new ApprovedByPropertyAnnotator($this->newDatabaseLogReader());
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 * @return ApprovedStatusPropertyAnnotator
 	 */
 	public function newApprovedStatusPropertyAnnotator() {
-		return new ApprovedStatusPropertyAnnotator( $this->newDatabaseLogReader() );
+		return new ApprovedStatusPropertyAnnotator($this->newDatabaseLogReader());
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 * @return ApprovedDatePropertyAnnotator
 	 */
 	public function newApprovedDatePropertyAnnotator() {
-		return new ApprovedDatePropertyAnnotator( $this->newDatabaseLogReader() );
+		return new ApprovedDatePropertyAnnotator($this->newDatabaseLogReader());
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 * @return ApprovedRevPropertyAnnotator
 	 */
 	public function newApprovedRevPropertyAnnotator() {
-		return new ApprovedRevPropertyAnnotator( $this->newApprovedRevsFacade() );
+		return new ApprovedRevPropertyAnnotator($this->newApprovedRevsFacade());
 	}
 
 }

src/ApprovedRevsFacade.php

Spacing +8 added lines, -8 removed lines

@@ -24,8 +24,8 @@ 
 	 *
 	 * @return integer|null
 	 */
-	public function getApprovedRevID( Title $title ) {
-		return ApprovedRevs::getApprovedRevID( $title );
+	public function getApprovedRevID(Title $title) {
+		return ApprovedRevs::getApprovedRevID($title);
 	}
 
 	/**
@@ -35,8 +35,8 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function hasApprovedRevision( Title $title ) {
-		return ApprovedRevs::hasApprovedRevision( $title );
+	public function hasApprovedRevision(Title $title) {
+		return ApprovedRevs::hasApprovedRevision($title);
 	}
 
 	/**
@@ -46,8 +46,8 @@ 
 	 *
 	 * @return []
 	 */
-	public function getApprovedFileInfo( Title $title ) {
-		return ApprovedRevs::getApprovedFileInfo( $title );
+	public function getApprovedFileInfo(Title $title) {
+		return ApprovedRevs::getApprovedFileInfo($title);
 	}
 
 	/**
@@ -55,8 +55,8 @@ 
 	 *
 	 * @param Title $title
 	 */
-	public function clearApprovedFileInfo( Title $title ) {
-		ApprovedRevs::clearApprovedFileInfo( $title );
+	public function clearApprovedFileInfo(Title $title) {
+		ApprovedRevs::clearApprovedFileInfo($title);
 	}
 
 }

src/PropertyAnnotators/ApprovedDatePropertyAnnotator.php

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
 
 use SMW\DIProperty;
 use SMW\SemanticData;
-use SMWDITime as DITime;;
+use SMWDITime as DITime; ;
 use SMW\ApprovedRevs\DatabaseLogReader;
 use SMW\ApprovedRevs\PropertyRegistry;
 use User;
@@ -29,7 +29,7 @@ 
 	/**
 	 * @param DatabaseLogReader $databaseLogReader
 	 */
-	public function __construct( DatabaseLogReader $databaseLogReader ) {
+	public function __construct(DatabaseLogReader $databaseLogReader) {
 		$this->databaseLogReader = $databaseLogReader;
 	}
 
@@ -38,7 +38,7 @@ 
 	 *
 	 * @param integer $approvedDate
 	 */
-	public function setApprovedDate( $approvedDate ) {
+	public function setApprovedDate($approvedDate) {
 		$this->approvedDate = $approvedDate;
 	}
 
@@ -48,7 +48,7 @@ 
 	 * @return DIProperty
 	 */
 	public function newDIProperty() {
-		return new DIProperty( PropertyRegistry::SAR_PROP_APPROVED_DATE );
+		return new DIProperty(PropertyRegistry::SAR_PROP_APPROVED_DATE);
 	}
 
 	/**
@@ -56,9 +56,9 @@ 
 	 *
 	 * @param SemanticData $semanticData
 	 */
-	public function addAnnotation( SemanticData $semanticData ) {
+	public function addAnnotation(SemanticData $semanticData) {
 
-		if ( $this->approvedDate === null ) {
+		if ($this->approvedDate === null) {
 			$this->approvedDate = $this->databaseLogReader->getDateOfLogEntry(
 				$semanticData->getSubject()->getTitle(),
 				'approval'
@@ -67,16 +67,16 @@ 
 
 		$property = $this->newDIProperty();
 		$dataItem = $this->newDITime();
-		$semanticData->removeProperty( $property );
+		$semanticData->removeProperty($property);
 
-		if ( $dataItem ) {
-			$semanticData->addPropertyObjectValue( $property, $dataItem );
+		if ($dataItem) {
+			$semanticData->addPropertyObjectValue($property, $dataItem);
 		}
 	}
 
 	private function newDITime() {
 
-		if ( $this->approvedDate === null || is_bool( $this->approvedDate ) ) {
+		if ($this->approvedDate === null || is_bool($this->approvedDate)) {
 			return;
 		}
 
@@ -84,11 +84,11 @@ 
 
 		return new DITime(
 			DITime::CM_GREGORIAN,
-			$date->format( 'Y' ),
-			$date->format( 'm' ),
-			$date->format( 'd' ),
-			$date->format( 'H' ),
-			$date->format( 'i' )
+			$date->format('Y'),
+			$date->format('m'),
+			$date->format('d'),
+			$date->format('H'),
+			$date->format('i')
 		);
 	}
 

src/PropertyAnnotators/ApprovedStatusPropertyAnnotator.php

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
 	/**
 	 * @param DatabaseLogReader $databaseLogReader
 	 */
-	public function __construct( DatabaseLogReader $databaseLogReader ) {
+	public function __construct(DatabaseLogReader $databaseLogReader) {
 		$this->databaseLogReader = $databaseLogReader;
 	}
 
@@ -37,7 +37,7 @@ 
 	 *
 	 * @param string $approvedStatus
 	 */
-	public function setApprovedStatus( $approvedStatus ) {
+	public function setApprovedStatus($approvedStatus) {
 		$this->approvedStatus = $approvedStatus;
 	}
 
@@ -47,7 +47,7 @@ 
 	 * @return DIProperty
 	 */
 	public function newDIProperty() {
-		return new DIProperty( PropertyRegistry::SAR_PROP_APPROVED_STATUS );
+		return new DIProperty(PropertyRegistry::SAR_PROP_APPROVED_STATUS);
 	}
 
 	/**
@@ -55,9 +55,9 @@ 
 	 *
 	 * @param SemanticData $semanticData
 	 */
-	public function addAnnotation( SemanticData $semanticData ) {
+	public function addAnnotation(SemanticData $semanticData) {
 
-		if ( $this->approvedStatus === null ) {
+		if ($this->approvedStatus === null) {
 			$this->approvedStatus = $this->databaseLogReader->getStatusOfLogEntry(
 				$semanticData->getSubject()->getTitle(),
 				'approval'
@@ -65,12 +65,12 @@ 
 		}
 
 		$property = $this->newDIProperty();
-		$semanticData->removeProperty( $property );
+		$semanticData->removeProperty($property);
 
-		if ( is_string( $this->approvedStatus ) && $this->approvedStatus !== '' ) {
+		if (is_string($this->approvedStatus) && $this->approvedStatus !== '') {
 			$semanticData->addPropertyObjectValue(
 				$property,
-				new DIBlob( $this->approvedStatus )
+				new DIBlob($this->approvedStatus)
 			);
 		}
 	}

src/PropertyAnnotators/ApprovedByPropertyAnnotator.php

Spacing +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
 	/**
 	 * @param DatabaseLogReader $databaseLogReader
 	 */
-	public function __construct( DatabaseLogReader $databaseLogReader ) {
+	public function __construct(DatabaseLogReader $databaseLogReader) {
 		$this->databaseLogReader = $databaseLogReader;
 	}
 
@@ -39,7 +39,7 @@ 
 	 *
 	 * @param string $approvedBy
 	 */
-	public function setApprovedBy( $approvedBy ) {
+	public function setApprovedBy($approvedBy) {
 		$this->approvedBy = $approvedBy;
 	}
 
@@ -49,7 +49,7 @@ 
 	 * @return DIProperty
 	 */
 	public function newDIProperty() {
-		return new DIProperty( PropertyRegistry::SAR_PROP_APPROVED_BY );
+		return new DIProperty(PropertyRegistry::SAR_PROP_APPROVED_BY);
 	}
 
 	/**
@@ -57,9 +57,9 @@ 
 	 *
 	 * @param SemanticData $semanticData
 	 */
-	public function addAnnotation( SemanticData $semanticData ) {
+	public function addAnnotation(SemanticData $semanticData) {
 
-		if ( $this->approvedBy === null ) {
+		if ($this->approvedBy === null) {
 			$this->approvedBy = $this->databaseLogReader->getUserForLogEntry(
 				$semanticData->getSubject()->getTitle(),
 				'approval'
@@ -68,23 +68,23 @@ 
 
 		$property = $this->newDIProperty();
 		$dataItem = $this->newDIWikiPage();
-		$semanticData->removeProperty( $property );
+		$semanticData->removeProperty($property);
 
-		if ( $dataItem ) {
-			$semanticData->addPropertyObjectValue( $property, $dataItem );
+		if ($dataItem) {
+			$semanticData->addPropertyObjectValue($property, $dataItem);
 		}
 	}
 
 	private function newDIWikiPage() {
 
-		if ( !$this->approvedBy instanceof User ) {
+		if (!$this->approvedBy instanceof User) {
 			return;
 		}
 
 		$userPage = $this->approvedBy->getUserPage();
 
-		if ( $userPage instanceof Title ) {
-			return DIWikiPage::newFromTitle( $userPage );
+		if ($userPage instanceof Title) {
+			return DIWikiPage::newFromTitle($userPage);
 		}
 	}