ProfessionalWiki / ModernTimeline

src/ModernTimelineSetup.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline;
 
@@ -13,10 +13,10 @@ 
 	}
 
 	private static function doSmwCheck() {
-		if ( !defined( 'SMW_VERSION' ) ) {
+		if (!defined('SMW_VERSION')) {
 
-			if ( PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg' ) {
-				die( "\nThe 'Modern Timeline' extension requires 'Semantic MediaWiki' to be installed and enabled.\n" );
+			if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+				die("\nThe 'Modern Timeline' extension requires 'Semantic MediaWiki' to be installed and enabled.\n");
 			}
 
 			die(

src/ModernTimelinePrinter.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline;
 
@@ -28,23 +28,23 @@ 
 		$registry = new ResultFormatRegistry();
 
 		$registry->newFormat()
-			->withName( 'moderntimeline' )
-			->andMessageKey( 'modern-timeline-format-name' )
-			->andParameterDefinitions( TimelineOptions::getTimelineParameterDefinitions() )
-			->andPresenterBuilder( function() {
+			->withName('moderntimeline')
+			->andMessageKey('modern-timeline-format-name')
+			->andParameterDefinitions(TimelineOptions::getTimelineParameterDefinitions())
+			->andPresenterBuilder(function() {
 				return new TimelinePresenter();
 			} )
 			->register();
 
-		$this->format = $registry->getFormatByName( 'moderntimeline' );
+		$this->format = $registry->getFormatByName('moderntimeline');
 	}
 
 	public function getName(): string {
-		return wfMessage( $this->format->getNameMessageKey() )->text();
+		return wfMessage($this->format->getNameMessageKey())->text();
 	}
 
-	public function getParamDefinitions( array $definitions ) {
-		return array_merge( $definitions, $this->format->getParameterDefinitions() );
+	public function getParamDefinitions(array $definitions) {
+		return array_merge($definitions, $this->format->getParameterDefinitions());
 	}
 
 	/**
@@ -54,36 +54,36 @@ 
 	 *
 	 * @return string
 	 */
-	public function getResult( QueryResult $result, array $parameters, $outputMode ): string {
+	public function getResult(QueryResult $result, array $parameters, $outputMode): string {
 		return $this->format->buildPresenter()->presentResult(
 			new SimpleQueryResult(
-				$this->simplifyResult( $result ),
-				$this->newProcessingResultFromParams( $parameters )
+				$this->simplifyResult($result),
+				$this->newProcessingResultFromParams($parameters)
 			)
 		);
 	}
 
-	private function simplifyResult( QueryResult $result ): SubjectCollection {
-		return ( new ResultSimplifier() )->newSubjectCollection( $result );
+	private function simplifyResult(QueryResult $result): SubjectCollection {
+		return (new ResultSimplifier())->newSubjectCollection($result);
 	}
 
 	/**
 	 * This is code copied over from ParamProcessor to go from the deprecated Param[] to ProcessingResult.
 	 * Once the main ResultPrinter interface has been migrated away from Param this can be removed.
 	 */
-	private function newProcessingResultFromParams( array $params ): ProcessingResult {
+	private function newProcessingResultFromParams(array $params): ProcessingResult {
 		$parameters = [];
 
-		foreach ( $params as $param ) {
+		foreach ($params as $param) {
 			$processedParam = new ProcessedParam(
 				$param->getName(),
 				$param->getValue(),
 				$param->wasSetToDefault()
 			);
 
-			if ( !$param->wasSetToDefault() ) {
-				$processedParam->setOriginalName( $param->getOriginalName() );
-				$processedParam->setOriginalValue( $param->getOriginalValue() );
+			if (!$param->wasSetToDefault()) {
+				$processedParam->setOriginalName($param->getOriginalName());
+				$processedParam->setOriginalValue($param->getOriginalValue());
 			}
 
 			$parameters[$processedParam->getName()] = $processedParam;
@@ -95,11 +95,11 @@ 
 		);
 	}
 
-	public function getQueryMode( $context ): int {
+	public function getQueryMode($context): int {
 		return SMWQuery::MODE_INSTANCES;
 	}
 
-	public function setShowErrors( $show ) {
+	public function setShowErrors($show) {
 	}
 
 	public function isExportFormat(): bool {
@@ -118,6 +118,6 @@ 
 		return false;
 	}
 
-	public function setRecursiveTextProcessor( RecursiveTextProcessor $recursiveTextProcessor ) {
+	public function setRecursiveTextProcessor(RecursiveTextProcessor $recursiveTextProcessor) {
 	}
 }

src/Event.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline;
 
@@ -14,7 +14,7 @@ 
 	private $endDate;
 	private $imageUrl;
 
-	public function __construct( Subject $subject, SMWDITime $startDate, ?SMWDITime $endDate ) {
+	public function __construct(Subject $subject, SMWDITime $startDate, ?SMWDITime $endDate) {
 		$this->subject = $subject;
 		$this->startDate = $startDate;
 		$this->endDate = $endDate;
@@ -40,7 +40,7 @@ 
 		return $this->imageUrl;
 	}
 
-	public function setImageUrl( string $url ) {
+	public function setImageUrl(string $url) {
 		$this->imageUrl = $url;
 	}
 

src/EventExtractor.php

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline;
 
@@ -16,7 +16,7 @@ 
 
 	private $parameters;
 
-	public function __construct( array $parameters ) {
+	public function __construct(array $parameters) {
 		$this->parameters = $parameters;
 	}
 
@@ -24,20 +24,20 @@ 
 	 * @param SubjectCollection $pages
 	 * @return Event[]
 	 */
-	public function extractEvents( SubjectCollection $pages ): array {
+	public function extractEvents(SubjectCollection $pages): array {
 		$events = [];
 
-		foreach ( $pages->getSubjects() as $subject ) {
-			[ $startDate, $endDate ] = $this->getDates( $subject );
+		foreach ($pages->getSubjects() as $subject) {
+			[$startDate, $endDate] = $this->getDates($subject);
 
-			if ( $startDate !== null ) {
-				$event = new Event( $subject, $startDate, $endDate );
+			if ($startDate !== null) {
+				$event = new Event($subject, $startDate, $endDate);
 
-				foreach ( $subject->getPropertyValueCollections() as $propertyValues ) {
-					if ( $propertyValues->getPrintRequest()->getText( null ) === $this->parameters['image property'] ) {
-						foreach ( $propertyValues->getDataItems() as $dataItem ) {
-							if ( $this->isImageValue( $dataItem ) ) {
-								$event->setImageUrl( $this->getUrlForFileTitle( $dataItem->getTitle() ) );
+				foreach ($subject->getPropertyValueCollections() as $propertyValues) {
+					if ($propertyValues->getPrintRequest()->getText(null) === $this->parameters['image property']) {
+						foreach ($propertyValues->getDataItems() as $dataItem) {
+							if ($this->isImageValue($dataItem)) {
+								$event->setImageUrl($this->getUrlForFileTitle($dataItem->getTitle()));
 							}
 						}
 					}
@@ -50,50 +50,50 @@ 
 		return $events;
 	}
 
-	private function isImageValue( \SMWDataItem $dataItem ) {
+	private function isImageValue(\SMWDataItem $dataItem) {
 		return $dataItem instanceof DIWikiPage
 			&& $dataItem->getTitle() instanceof \Title
 			&& $dataItem->getTitle()->getNamespace() === NS_FILE
 			&& $dataItem->getTitle()->exists();
 	}
 
-	public function getUrlForFileTitle( \Title $existingTitle ): string {
-		if ( method_exists( MediaWikiServices::class, 'getRepoGroup' ) ) {
+	public function getUrlForFileTitle(\Title $existingTitle): string {
+		if (method_exists(MediaWikiServices::class, 'getRepoGroup')) {
 			// MediaWiki 1.34+
-			return MediaWikiServices::getInstance()->getRepoGroup()->findFile( $existingTitle )->getURL();
+			return MediaWikiServices::getInstance()->getRepoGroup()->findFile($existingTitle)->getURL();
 		} else {
-			return RepoGroup::singleton()->findFile( $existingTitle )->getURL();
+			return RepoGroup::singleton()->findFile($existingTitle)->getURL();
 		}
 	}
 
-	private function getDates( Subject $subject ): array {
+	private function getDates(Subject $subject): array {
 		$startDate = null;
 		$endDate = null;
 
-		foreach ( $this->getPropertyValueCollectionsWithDates( $subject ) as $propertyValues ) {
+		foreach ($this->getPropertyValueCollectionsWithDates($subject) as $propertyValues) {
 			$dataItem = $propertyValues->getDataItems()[0];
 
-			if ( $dataItem instanceof SMWDITime ) {
-				if ( $startDate === null ) {
+			if ($dataItem instanceof SMWDITime) {
+				if ($startDate === null) {
 					$startDate = $dataItem;
 				}
-				else if ( $endDate === null ) {
+				else if ($endDate === null) {
 					$endDate = $dataItem;
 					break;
 				}
 			}
 		}
 
-		return [ $startDate, $endDate ];
+		return [$startDate, $endDate];
 	}
 
 	/**
 	 * @return PropertyValueCollection[]
 	 */
-	private function getPropertyValueCollectionsWithDates( Subject $subject ) {
+	private function getPropertyValueCollectionsWithDates(Subject $subject) {
 		return array_filter(
 			$subject->getPropertyValueCollections()->toArray(),
-			function( PropertyValueCollection $pvc ) {
+			function(PropertyValueCollection $pvc) {
 				return $pvc->getPrintRequest()->getTypeID() === '_dat'
 					&& $pvc->getDataItems() !== [];
 			}

Braces +1 added lines, -2 removed lines

@@ -76,8 +76,7 @@
 			if ( $dataItem instanceof SMWDITime ) {
 				if ( $startDate === null ) {
 					$startDate = $dataItem;
-				}
-				else if ( $endDate === null ) {
+				} else if ( $endDate === null ) {
 					$endDate = $dataItem;
 					break;
 				}

src/TimelineOptions.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline;
 
@@ -29,13 +29,13 @@ 
 		$definitions[self::PARAM_WIDTH] = [
 			'type' => ParameterTypes::DIMENSION,
 			'allowauto' => true,
-			'units' => [ 'px', 'ex', 'em', '%', '' ],
+			'units' => ['px', 'ex', 'em', '%', ''],
 			'default' => $GLOBALS['wgModernTimelineWidth'],
 		];
 
 		$definitions[self::PARAM_HEIGHT] = [
 			'type' => ParameterTypes::DIMENSION,
-			'units' => [ 'px', 'ex', 'em', '' ],
+			'units' => ['px', 'ex', 'em', ''],
 			'default' => $GLOBALS['wgModernTimelineHeight'],
 		];
 
@@ -58,7 +58,7 @@ 
 		$definitions[self::PARAM_POSITION] = [
 			'type' => ParameterTypes::STRING,
 			'default' => $GLOBALS['wgModernTimelinePosition'],
-			'values' => [ 'top', 'bottom' ],
+			'values' => ['top', 'bottom'],
 		];
 
 		$definitions[self::PARAM_TICK_WIDTH] = [
@@ -86,7 +86,7 @@ 
 
 		$definitions[self::PARAM_NAV_HEIGHT] = [
 			'type' => ParameterTypes::DIMENSION,
-			'units' => [ 'px', '%' ],
+			'units' => ['px', '%'],
 			'default' => $GLOBALS['wgModernTimelineNavHeight'],
 		];
 
@@ -98,16 +98,16 @@ 
 		$definitions[self::PARAM_IMAGE] = [
 			'type' => ParameterTypes::STRING,
 			'default' => $GLOBALS['wgModernTimelineImageProperty'],
-			'aliases' => [ 'imageproperty', 'image' ],
+			'aliases' => ['imageproperty', 'image'],
 		];
 
-		foreach ( $definitions as $name => $definition ) {
-			$definitions[$name]['message'] = 'modern-timeline-param-' . str_replace( ' ', '-', $name );
+		foreach ($definitions as $name => $definition) {
+			$definitions[$name]['message'] = 'modern-timeline-param-' . str_replace(' ', '-', $name);
 
-			if ( strpos( $name, ' ' ) !== false ) {
+			if (strpos($name, ' ') !== false) {
 				$definitions[$name]['aliases'] = array_merge(
-					array_key_exists( 'aliases', $definitions[$name] ) ? (array)$definitions[$name]['aliases'] : [],
-					[ str_replace( ' ', '', $name ) ]
+					array_key_exists('aliases', $definitions[$name]) ? (array)$definitions[$name]['aliases'] : [],
+					[str_replace(' ', '', $name)]
 				);
 			}
 		}
@@ -119,31 +119,31 @@ 
 	 * @param array $parameters
 	 * @return array
 	 */
-	public static function processedParamsToJson( array $parameters ): array {
+	public static function processedParamsToJson(array $parameters): array {
 		$json = [
 			'hash_bookmark' => $parameters[self::PARAM_BOOKMARK],
 			'default_bg_color' => $parameters[self::PARAM_BACKGROUND],
 			'scale_factor' => $parameters[self::PARAM_SCALE_FACTOR],
 			'timenav_position' => $parameters[self::PARAM_POSITION],
 			'optimal_tick_width' => $parameters[self::PARAM_TICK_WIDTH],
-			'start_at_slide' => self::getStartAtSlide( $parameters ),
+			'start_at_slide' => self::getStartAtSlide($parameters),
 			'start_at_end' => $parameters[self::PARAM_START_AT_END],
 			'duration' => $parameters[self::PARAM_TRANSITION_DURATION],
 		];
 
 		$height = $parameters[self::PARAM_NAV_HEIGHT];
 
-		if ( strpos( $height, '%' ) === false ) {
-			$json['timenav_height'] = (int)substr( $height, 0, -2 );
+		if (strpos($height, '%') === false) {
+			$json['timenav_height'] = (int)substr($height, 0, -2);
 		}
 		else {
-			$json['timenav_height_percentage'] = (int)substr( $height, 0, -1 );
+			$json['timenav_height_percentage'] = (int)substr($height, 0, -1);
 		}
 
 		return $json;
 	}
 
-	private static function getStartAtSlide( array $parameters ): int {
+	private static function getStartAtSlide(array $parameters): int {
 		return $parameters[self::PARAM_START_SLIDE] - 1;
 	}
 

Braces +1 added lines, -2 removed lines

@@ -135,8 +135,7 @@
 
 		if ( strpos( $height, '%' ) === false ) {
 			$json['timenav_height'] = (int)substr( $height, 0, -2 );
-		}
-		else {
+		} else {
 			$json['timenav_height_percentage'] = (int)substr( $height, 0, -1 );
 		}
 

src/SlidePresenter/SimpleSlidePresenter.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline\SlidePresenter;
 
@@ -12,41 +12,41 @@ 
 
 	private $parameters;
 
-	public function __construct( array $parameters ) {
+	public function __construct(array $parameters) {
 		$this->parameters = $parameters;
 	}
 
-	public function getText( Subject $subject ): string {
-		return implode( '<br>', iterator_to_array( $this->getDisplayValues( $subject ) ) );
+	public function getText(Subject $subject): string {
+		return implode('<br>', iterator_to_array($this->getDisplayValues($subject)));
 	}
 
-	private function getDisplayValues( Subject $subject ) {
-		foreach ( $subject->getPropertyValueCollections() as $propertyValues ) {
-			foreach ( $propertyValues->getDataItems() as $dataItem ) {
-				if ( !$this->isHiddenPrintRequest( $propertyValues->getPrintRequest() ) ) {
-					yield $this->getDisplayValue( $propertyValues->getPrintRequest(), $dataItem );
+	private function getDisplayValues(Subject $subject) {
+		foreach ($subject->getPropertyValueCollections() as $propertyValues) {
+			foreach ($propertyValues->getDataItems() as $dataItem) {
+				if (!$this->isHiddenPrintRequest($propertyValues->getPrintRequest())) {
+					yield $this->getDisplayValue($propertyValues->getPrintRequest(), $dataItem);
 				}
 			}
 		}
 	}
 
-	private function isHiddenPrintRequest( PrintRequest $pr ) {
-		return $pr->getText( null ) === $this->parameters['image property'];
+	private function isHiddenPrintRequest(PrintRequest $pr) {
+		return $pr->getText(null) === $this->parameters['image property'];
 	}
 
-	private function getDisplayValue( PrintRequest $pr, \SMWDataItem $dataItem ) {
-		$property = $pr->getText( null );
-		$value = $this->dataItemToText( $dataItem );
+	private function getDisplayValue(PrintRequest $pr, \SMWDataItem $dataItem) {
+		$property = $pr->getText(null);
+		$value = $this->dataItemToText($dataItem);
 
-		if ( $property === '' ) {
+		if ($property === '') {
 			return $value;
 		}
 
 		return $property . ': ' . $value;
 	}
 
-	private function dataItemToText( \SMWDataItem $dataItem ): string {
-		return DataValueFactory::getInstance()->newDataValueByItem( $dataItem )->getLongHTMLText();
+	private function dataItemToText(\SMWDataItem $dataItem): string {
+		return DataValueFactory::getInstance()->newDataValueByItem($dataItem)->getLongHTMLText();
 	}
 
 }

src/SlidePresenter/SlidePresenter.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline\SlidePresenter;
 
@@ -8,6 +8,6 @@ 
 
 interface SlidePresenter {
 
-	public function getText( Subject $subject ): string;
+	public function getText(Subject $subject): string;
 
 }

src/SlidePresenter/TemplateSlidePresenter.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline\SlidePresenter;
 
@@ -13,15 +13,15 @@ 
 
 	private $templateName;
 
-	public function __construct( string $templateName ) {
+	public function __construct(string $templateName) {
 		$this->templateName = $templateName;
 	}
 
-	public function getText( Subject $subject ): string {
+	public function getText(Subject $subject): string {
 		$parser = $this->getParser();
 
 		return $parser->recursiveTagParseFully(
-			( new TemplateSlidePresenter( $this->templateName ) )->getTemplateText( $subject )
+			(new TemplateSlidePresenter($this->templateName))->getTemplateText($subject)
 		);
 	}
 
@@ -29,21 +29,21 @@ 
 		return MediaWikiServices::getInstance()->getParser();
 	}
 
-	public function getTemplateText( Subject $subject ): string {
-		return '{{' . implode( '|', $this->getTemplateSegments( $subject ) ) . '}}';
+	public function getTemplateText(Subject $subject): string {
+		return '{{' . implode('|', $this->getTemplateSegments($subject)) . '}}';
 	}
 
-	private function getTemplateSegments( Subject $subject ): array {
+	private function getTemplateSegments(Subject $subject): array {
 		return array_merge(
 			[
 				$this->templateName,
-				$this->parameter( 'title', $subject->getWikiPage()->getTitle()->getFullText() )
+				$this->parameter('title', $subject->getWikiPage()->getTitle()->getFullText())
 			],
 			array_map(
-				function( PropertyValueCollection $pvc ) {
+				function(PropertyValueCollection $pvc) {
 					return $this->parameter(
-						$pvc->getPrintRequest()->getText( null ) ?? '',
-						$pvc->getDataItems() === [] ? '' : $this->dataItemToText( $pvc->getDataItems()[0] )
+						$pvc->getPrintRequest()->getText(null) ?? '',
+						$pvc->getDataItems() === [] ? '' : $this->dataItemToText($pvc->getDataItems()[0])
 					);
 				},
 				$subject->getPropertyValueCollections()->toArray()
@@ -51,11 +51,11 @@ 
 		);
 	}
 
-	private function dataItemToText( \SMWDataItem $dataItem ): string {
-		return DataValueFactory::getInstance()->newDataValueByItem( $dataItem )->getLongHTMLText();
+	private function dataItemToText(\SMWDataItem $dataItem): string {
+		return DataValueFactory::getInstance()->newDataValueByItem($dataItem)->getLongHTMLText();
 	}
 
-	private function parameter( string $name, string $value ): string {
+	private function parameter(string $name, string $value): string {
 		return $name . '=' . $value;
 	}
 }

src/JsonBuilder.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline;
 
@@ -12,7 +12,7 @@ 
 
 	private $slidePresenter;
 
-	public function __construct( SlidePresenter $slidePresenter ) {
+	public function __construct(SlidePresenter $slidePresenter) {
 		$this->slidePresenter = $slidePresenter;
 	}
 
@@ -20,32 +20,32 @@ 
 	 * @param Event[] $events
 	 * @return array
 	 */
-	public function eventsToTimelineJson( array $events ): array {
+	public function eventsToTimelineJson(array $events): array {
 		$jsonEvents = [];
 
-		foreach ( $events as $event ) {
-			if ( $event->getSubject()->getWikiPage()->getTitle() !== null ) {
-				$jsonEvents[] = $this->buildEvent( $event );
+		foreach ($events as $event) {
+			if ($event->getSubject()->getWikiPage()->getTitle() !== null) {
+				$jsonEvents[] = $this->buildEvent($event);
 			}
 		}
 
-		return [ 'events' => $jsonEvents ];
+		return ['events' => $jsonEvents];
 	}
 
-	public function buildEvent( Event $event ): array {
+	public function buildEvent(Event $event): array {
 		$jsonEvent = [
 			'text' => [
-				'headline' => $this->newHeadline( $event->getSubject()->getWikiPage()->getTitle() ),
-				'text' =>  $this->slidePresenter->getText( $event->getSubject() )
+				'headline' => $this->newHeadline($event->getSubject()->getWikiPage()->getTitle()),
+				'text' =>  $this->slidePresenter->getText($event->getSubject())
 			],
-			'start_date' => $this->timeToJson( $event->getStartDate() ),
+			'start_date' => $this->timeToJson($event->getStartDate()),
 		];
 
-		if ( $event->getEndDate() !== null ) {
-			$jsonEvent['end_date'] = $this->timeToJson( $event->getEndDate() );
+		if ($event->getEndDate() !== null) {
+			$jsonEvent['end_date'] = $this->timeToJson($event->getEndDate());
 		}
 
-		if ( $event->hasImage() ) {
+		if ($event->hasImage()) {
 			$jsonEvent['media'] = [
 				'url' => $event->getImageUrl(),
 				'thumbnail' => $event->getImageUrl()
@@ -55,17 +55,17 @@ 
 		return $jsonEvent;
 	}
 
-	private function newHeadline( \Title $title ): string {
+	private function newHeadline(\Title $title): string {
 		return \Html::element(
 			'a',
-			[ 'href' => $title->getFullURL() ],
+			['href' => $title->getFullURL()],
 			$title->getText()
 		);
 
 //		return DataValueFactory::getInstance()->newDataValueByItem( $subject->getWikiPage() )->getLongHTMLText( smwfGetLinker() );
 	}
 
-	private function timeToJson( SMWDITime $time ): array {
+	private function timeToJson(SMWDITime $time): array {
 		return [
 			'year' => $time->getYear(),
 			'month' => $time->getMonth(),