ProfessionalWiki / ModernTimeline

src/TimelinePresenter.php

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline;
 
@@ -24,43 +24,43 @@ 
 		return 'modern_timeline_' . ++$timelineNumber;
 	}
 
-	public function presentResult( SimpleQueryResult $result ): string {
-		SMWOutputs::requireResource( 'ext.modern.timeline' );
+	public function presentResult(SimpleQueryResult $result): string {
+		SMWOutputs::requireResource('ext.modern.timeline');
 
 		SMWOutputs::requireHeadItem(
 			$this->id,
-			$this->createJs( $this->createJsonString( $result ) )
+			$this->createJs($this->createJsonString($result))
 		);
 
-		return $this->createDiv( $result->getParameters() );
+		return $this->createDiv($result->getParameters());
 	}
 
-	private function createJsonString( SimpleQueryResult $result ): string {
-		$preJson = $this->newJsonBuilder( $result )
-			->eventsToTimelineJson( ( new EventExtractor( $result->getParameters() ) )->extractEvents( $result->getSubjects() ) );
+	private function createJsonString(SimpleQueryResult $result): string {
+		$preJson = $this->newJsonBuilder($result)
+			->eventsToTimelineJson((new EventExtractor($result->getParameters()))->extractEvents($result->getSubjects()));
 
-		$preJson['options'] = TimelineOptions::processedParamsToJson( $result->getParameters() );
+		$preJson['options'] = TimelineOptions::processedParamsToJson($result->getParameters());
 
-		return json_encode( $preJson );
+		return json_encode($preJson);
 	}
 
-	private function newJsonBuilder( SimpleQueryResult $result ): JsonBuilder {
+	private function newJsonBuilder(SimpleQueryResult $result): JsonBuilder {
 		return new JsonBuilder(
-			$this->getSlidePresenter( $result )
+			$this->getSlidePresenter($result)
 		);
 	}
 
-	private function getSlidePresenter( SimpleQueryResult $result ): SlidePresenter {
+	private function getSlidePresenter(SimpleQueryResult $result): SlidePresenter {
 		$templateName = $result->getParameters()['template'];
 
-		if ( $templateName === '' ) {
-			return new SimpleSlidePresenter( $result->getProcessingResult()->getParameterArray() );
+		if ($templateName === '') {
+			return new SimpleSlidePresenter($result->getProcessingResult()->getParameterArray());
 		}
 
-		return new TemplateSlidePresenter( $templateName );
+		return new TemplateSlidePresenter($templateName);
 	}
 
-	private function createJs( string $json ): string {
+	private function createJs(string $json): string {
 		return \Html::rawElement(
 			'script',
 			[
@@ -71,7 +71,7 @@ 
 		);
 	}
 
-	private function createDiv( array $parameters ): string {
+	private function createDiv(array $parameters): string {
 		$width = $parameters[TimelineOptions::PARAM_WIDTH];
 		$height = $parameters[TimelineOptions::PARAM_HEIGHT];
 

src/SlidePresenter/TemplateSlidePresenter.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline\SlidePresenter;
 
@@ -16,11 +16,11 @@ 
 	) {
 	}
 
-	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)
 		);
 	}
 
@@ -28,21 +28,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()
@@ -50,11 +50,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/SlidePresenter/SimpleSlidePresenter.php

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline\SlidePresenter;
 
@@ -16,37 +16,37 @@ 
 	) {
 	}
 
-	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 ): Traversable {
-		foreach ( $subject->getPropertyValueCollections()->toArray() as $propertyValues ) {
-			foreach ( $propertyValues->getDataItems() as $dataItem ) {
-				if ( !$this->isHiddenPrintRequest( $propertyValues->getPrintRequest() ) ) {
-					yield $this->getDisplayValue( $propertyValues->getPrintRequest(), $dataItem );
+	private function getDisplayValues(Subject $subject): Traversable {
+		foreach ($subject->getPropertyValueCollections()->toArray() as $propertyValues) {
+			foreach ($propertyValues->getDataItems() as $dataItem) {
+				if (!$this->isHiddenPrintRequest($propertyValues->getPrintRequest())) {
+					yield $this->getDisplayValue($propertyValues->getPrintRequest(), $dataItem);
 				}
 			}
 		}
 	}
 
-	private function isHiddenPrintRequest( PrintRequest $pr ): bool {
-		return $pr->getText( null ) === $this->parameters['image property'];
+	private function isHiddenPrintRequest(PrintRequest $pr): bool {
+		return $pr->getText(null) === $this->parameters['image property'];
 	}
 
-	private function getDisplayValue( PrintRequest $pr, \SMWDataItem $dataItem ): string {
-		$property = $pr->getText( null );
-		$value = $this->dataItemToText( $dataItem );
+	private function getDisplayValue(PrintRequest $pr, \SMWDataItem $dataItem): string {
+		$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/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(): void {
-		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;
 
@@ -25,23 +25,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());
 	}
 
 	/**
@@ -51,36 +51,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;
@@ -92,11 +92,11 @@ 
 		);
 	}
 
-	public function getQueryMode( $context ): int {
+	public function getQueryMode($context): int {
 		return SMWQuery::MODE_INSTANCES;
 	}
 
-	public function setShowErrors( $show ): void {
+	public function setShowErrors($show): void {
 	}
 
 	public function isExportFormat(): bool {
@@ -115,6 +115,6 @@ 
 		return false;
 	}
 
-	public function setRecursiveTextProcessor( RecursiveTextProcessor $recursiveTextProcessor ): void {
+	public function setRecursiveTextProcessor(RecursiveTextProcessor $recursiveTextProcessor): void {
 	}
 }

src/EventExtractor.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare( strict_types = 1 );
+declare(strict_types=1);
 
 namespace ModernTimeline;
 
@@ -23,20 +23,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()->toArray() 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()->toArray() 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()));
 							}
 						}
 					}
@@ -49,45 +49,45 @@ 
 		return $events;
 	}
 
-	private function isImageValue( \SMWDataItem $dataItem ): bool {
+	private function isImageValue(\SMWDataItem $dataItem): bool {
 		return $dataItem instanceof DIWikiPage
 			&& $dataItem->getTitle() instanceof \Title
 			&& $dataItem->getTitle()->getNamespace() === NS_FILE
 			&& $dataItem->getTitle()->exists();
 	}
 
-	public function getUrlForFileTitle( \Title $existingTitle ): string {
-		return MediaWikiServices::getInstance()->getRepoGroup()->findFile( $existingTitle )->getURL();
+	public function getUrlForFileTitle(\Title $existingTitle): string {
+		return MediaWikiServices::getInstance()->getRepoGroup()->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;
 				}
-				elseif ( $endDate === null ) {
+				elseif ($endDate === null) {
 					$endDate = $dataItem;
 					break;
 				}
 			}
 		}
 
-		return [ $startDate, $endDate ];
+		return [$startDate, $endDate];
 	}
 
 	/**
 	 * @return PropertyValueCollection[]
 	 */
-	private function getPropertyValueCollectionsWithDates( Subject $subject ): array {
+	private function getPropertyValueCollectionsWithDates(Subject $subject): array {
 		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

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