@@ -72,12 +72,12 @@ |
||
| 72 | 72 | return $this->snakHash; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - protected function &getMainArray( array &$container ) { |
|
| 76 | - $statementArray = &$this->getStatementArray( $container ); |
|
| 75 | + protected function &getMainArray(array &$container) { |
|
| 76 | + $statementArray = &$this->getStatementArray($container); |
|
| 77 | 77 | |
| 78 | - if ( !array_key_exists( 'mainsnak', $statementArray ) ) { |
|
| 78 | + if (!array_key_exists('mainsnak', $statementArray)) { |
|
| 79 | 79 | $snakHash = $this->getSnakHash(); |
| 80 | - $statementArray['mainsnak'] = [ 'hash' => $snakHash ]; |
|
| 80 | + $statementArray['mainsnak'] = ['hash' => $snakHash]; |
|
| 81 | 81 | } |
| 82 | 82 | $mainsnakArray = &$statementArray['mainsnak']; |
| 83 | 83 | |
@@ -11,8 +11,8 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | class ContextCursorDeserializer { |
| 13 | 13 | |
| 14 | - public function deserialize( array $serialization ) { |
|
| 15 | - switch ( $serialization['t'] ) { |
|
| 14 | + public function deserialize(array $serialization) { |
|
| 15 | + switch ($serialization['t']) { |
|
| 16 | 16 | case Context::TYPE_STATEMENT: |
| 17 | 17 | return new MainSnakContextCursor( |
| 18 | 18 | $serialization['i'], |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | ); |
| 40 | 40 | default: |
| 41 | 41 | throw new InvalidArgumentException( |
| 42 | - 'Unknown serialization type ' . $serialization['t'] |
|
| 42 | + 'Unknown serialization type '.$serialization['t'] |
|
| 43 | 43 | ); |
| 44 | 44 | } |
| 45 | 45 | } |
@@ -24,22 +24,22 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | const NULL_PROPERTY_ID = 'P2147483647'; |
| 26 | 26 | |
| 27 | - public function __construct( ContextCursor $contextCursor ) { |
|
| 27 | + public function __construct(ContextCursor $contextCursor) { |
|
| 28 | 28 | $constraint = new Constraint( |
| 29 | 29 | 'null', |
| 30 | - new PropertyId( self::NULL_PROPERTY_ID ), |
|
| 30 | + new PropertyId(self::NULL_PROPERTY_ID), |
|
| 31 | 31 | 'none', |
| 32 | 32 | [] |
| 33 | 33 | ); |
| 34 | - parent::__construct( $contextCursor, $constraint ); |
|
| 34 | + parent::__construct($contextCursor, $constraint); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function getConstraint() { |
| 38 | - throw new DomainException( 'NullResult holds no constraint' ); |
|
| 38 | + throw new DomainException('NullResult holds no constraint'); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function getConstraintId() { |
| 42 | - throw new DomainException( 'NullResult holds no constraint' ); |
|
| 42 | + throw new DomainException('NullResult holds no constraint'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | } |
@@ -76,14 +76,14 @@ discard block |
||
| 76 | 76 | * @param CheckResult $checkResult |
| 77 | 77 | * @return array |
| 78 | 78 | */ |
| 79 | - public function serialize( CheckResult $checkResult ) { |
|
| 79 | + public function serialize(CheckResult $checkResult) { |
|
| 80 | 80 | $contextCursor = $checkResult->getContextCursor(); |
| 81 | 81 | |
| 82 | 82 | $serialization = [ |
| 83 | - self::KEY_CONTEXT_CURSOR => $this->contextCursorSerializer->serialize( $contextCursor ), |
|
| 83 | + self::KEY_CONTEXT_CURSOR => $this->contextCursorSerializer->serialize($contextCursor), |
|
| 84 | 84 | ]; |
| 85 | 85 | |
| 86 | - if ( $checkResult instanceof NullResult ) { |
|
| 86 | + if ($checkResult instanceof NullResult) { |
|
| 87 | 87 | $serialization[self::KEY_NULL_RESULT] = 1; |
| 88 | 88 | } else { |
| 89 | 89 | $constraint = $checkResult->getConstraint(); |
@@ -91,21 +91,21 @@ discard block |
||
| 91 | 91 | $violationMessage = $checkResult->getMessage(); |
| 92 | 92 | |
| 93 | 93 | $serialization[self::KEY_CONSTRAINT] = |
| 94 | - $this->constraintSerializer->serialize( $constraint ); |
|
| 94 | + $this->constraintSerializer->serialize($constraint); |
|
| 95 | 95 | $serialization[self::KEY_CHECK_RESULT_STATUS] = |
| 96 | 96 | $checkResult->getStatus(); |
| 97 | 97 | $serialization[self::KEY_CACHING_METADATA] = |
| 98 | - $this->serializeCachingMetadata( $cachingMetadata ); |
|
| 98 | + $this->serializeCachingMetadata($cachingMetadata); |
|
| 99 | 99 | |
| 100 | - if ( $violationMessage !== null ) { |
|
| 100 | + if ($violationMessage !== null) { |
|
| 101 | 101 | $serialization[self::KEY_VIOLATION_MESSAGE] = |
| 102 | - $this->violationMessageSerializer->serialize( $violationMessage ); |
|
| 102 | + $this->violationMessageSerializer->serialize($violationMessage); |
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - if ( $this->serializeDependencyMetadata ) { |
|
| 106 | + if ($this->serializeDependencyMetadata) { |
|
| 107 | 107 | $serialization[self::KEY_DEPENDENCY_METADATA] = |
| 108 | - $this->serializeDependencyMetadata( $checkResult ); |
|
| 108 | + $this->serializeDependencyMetadata($checkResult); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | return $serialization; |
@@ -115,12 +115,12 @@ discard block |
||
| 115 | 115 | * @param CachingMetadata $cachingMetadata |
| 116 | 116 | * @return array |
| 117 | 117 | */ |
| 118 | - private function serializeCachingMetadata( CachingMetadata $cachingMetadata ) { |
|
| 118 | + private function serializeCachingMetadata(CachingMetadata $cachingMetadata) { |
|
| 119 | 119 | $maximumAge = $cachingMetadata->getMaximumAgeInSeconds(); |
| 120 | 120 | |
| 121 | 121 | $serialization = []; |
| 122 | 122 | |
| 123 | - if ( $maximumAge > 0 ) { |
|
| 123 | + if ($maximumAge > 0) { |
|
| 124 | 124 | $serialization[self::KEY_CACHING_METADATA_MAX_AGE] = $maximumAge; |
| 125 | 125 | } |
| 126 | 126 | |
@@ -131,21 +131,21 @@ discard block |
||
| 131 | 131 | * @param CheckResult $checkResult |
| 132 | 132 | * @return array |
| 133 | 133 | */ |
| 134 | - private function serializeDependencyMetadata( CheckResult $checkResult ) { |
|
| 134 | + private function serializeDependencyMetadata(CheckResult $checkResult) { |
|
| 135 | 135 | $dependencyMetadata = $checkResult->getMetadata()->getDependencyMetadata(); |
| 136 | 136 | $entityIds = $dependencyMetadata->getEntityIds(); |
| 137 | 137 | $futureTime = $dependencyMetadata->getFutureTime(); |
| 138 | 138 | |
| 139 | 139 | $serialization = [ |
| 140 | 140 | self::KEY_DEPENDENCY_METADATA_ENTITY_IDS => array_map( |
| 141 | - function ( EntityId $entityId ) { |
|
| 141 | + function(EntityId $entityId) { |
|
| 142 | 142 | return $entityId->getSerialization(); |
| 143 | 143 | }, |
| 144 | 144 | $entityIds |
| 145 | 145 | ), |
| 146 | 146 | ]; |
| 147 | 147 | |
| 148 | - if ( $futureTime !== null ) { |
|
| 148 | + if ($futureTime !== null) { |
|
| 149 | 149 | $serialization[self::KEY_DEPENDENCY_METADATA_FUTURE_TIME] = |
| 150 | 150 | $futureTime->getArrayValue(); |
| 151 | 151 | } |
@@ -44,57 +44,56 @@ |
||
| 44 | 44 | ) { |
| 45 | 45 | $results = []; |
| 46 | 46 | $metadatas = []; |
| 47 | - $statusesFlipped = array_flip( $statuses ); |
|
| 48 | - foreach ( $entityIds as $entityId ) { |
|
| 47 | + $statusesFlipped = array_flip($statuses); |
|
| 48 | + foreach ($entityIds as $entityId) { |
|
| 49 | 49 | $entityResults = $this->delegatingConstraintChecker->checkAgainstConstraintsOnEntityId( |
| 50 | 50 | $entityId, |
| 51 | 51 | $constraintIds, |
| 52 | - [ $this, 'defaultResultsPerContext' ], |
|
| 53 | - [ $this, 'defaultResultsPerEntity' ] |
|
| 52 | + [$this, 'defaultResultsPerContext'], |
|
| 53 | + [$this, 'defaultResultsPerEntity'] |
|
| 54 | 54 | ); |
| 55 | - foreach ( $entityResults as $result ) { |
|
| 55 | + foreach ($entityResults as $result) { |
|
| 56 | 56 | $metadatas[] = $result->getMetadata(); |
| 57 | - if ( $this->statusSelected( $statusesFlipped, $result ) ) { |
|
| 57 | + if ($this->statusSelected($statusesFlipped, $result)) { |
|
| 58 | 58 | $results[] = $result; |
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | - foreach ( $claimIds as $claimId ) { |
|
| 62 | + foreach ($claimIds as $claimId) { |
|
| 63 | 63 | $claimResults = $this->delegatingConstraintChecker->checkAgainstConstraintsOnClaimId( |
| 64 | 64 | $claimId, |
| 65 | 65 | $constraintIds, |
| 66 | - [ $this, 'defaultResultsPerContext' ] |
|
| 66 | + [$this, 'defaultResultsPerContext'] |
|
| 67 | 67 | ); |
| 68 | - foreach ( $claimResults as $result ) { |
|
| 68 | + foreach ($claimResults as $result) { |
|
| 69 | 69 | $metadatas[] = $result->getMetadata(); |
| 70 | - if ( $this->statusSelected( $statusesFlipped, $result ) ) { |
|
| 70 | + if ($this->statusSelected($statusesFlipped, $result)) { |
|
| 71 | 71 | $results[] = $result; |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | return new CachedCheckResults( |
| 76 | 76 | $results, |
| 77 | - Metadata::merge( $metadatas ) |
|
| 77 | + Metadata::merge($metadatas) |
|
| 78 | 78 | ); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - public function defaultResultsPerContext( Context $context ) { |
|
| 81 | + public function defaultResultsPerContext(Context $context) { |
|
| 82 | 82 | return $context->getType() === Context::TYPE_STATEMENT ? |
| 83 | - [ new NullResult( $context->getCursor() ) ] : |
|
| 84 | - []; |
|
| 83 | + [new NullResult($context->getCursor())] : []; |
|
| 85 | 84 | } |
| 86 | 85 | |
| 87 | - public function defaultResultsPerEntity( EntityId $entityId ) { |
|
| 86 | + public function defaultResultsPerEntity(EntityId $entityId) { |
|
| 88 | 87 | return [ |
| 89 | - ( new NullResult( new EntityContextCursor( $entityId->getSerialization() ) ) ) |
|
| 90 | - ->withMetadata( Metadata::ofDependencyMetadata( |
|
| 91 | - DependencyMetadata::ofEntityId( $entityId ) |
|
| 92 | - ) ) |
|
| 88 | + (new NullResult(new EntityContextCursor($entityId->getSerialization()))) |
|
| 89 | + ->withMetadata(Metadata::ofDependencyMetadata( |
|
| 90 | + DependencyMetadata::ofEntityId($entityId) |
|
| 91 | + )) |
|
| 93 | 92 | ]; |
| 94 | 93 | } |
| 95 | 94 | |
| 96 | - public function statusSelected( array $statusesFlipped, CheckResult $result ) { |
|
| 97 | - return array_key_exists( $result->getStatus(), $statusesFlipped ) || |
|
| 95 | + public function statusSelected(array $statusesFlipped, CheckResult $result) { |
|
| 96 | + return array_key_exists($result->getStatus(), $statusesFlipped) || |
|
| 98 | 97 | $result instanceof NullResult; |
| 99 | 98 | } |
| 100 | 99 | |
@@ -56,13 +56,13 @@ discard block |
||
| 56 | 56 | * @param array $serialization |
| 57 | 57 | * @return CheckResult |
| 58 | 58 | */ |
| 59 | - public function deserialize( array $serialization ) { |
|
| 59 | + public function deserialize(array $serialization) { |
|
| 60 | 60 | $contextCursor = $this->contextCursorDeserializer->deserialize( |
| 61 | 61 | $serialization[CheckResultSerializer::KEY_CONTEXT_CURSOR] |
| 62 | 62 | ); |
| 63 | 63 | |
| 64 | - if ( array_key_exists( CheckResultSerializer::KEY_NULL_RESULT, $serialization ) ) { |
|
| 65 | - $result = new NullResult( $contextCursor ); |
|
| 64 | + if (array_key_exists(CheckResultSerializer::KEY_NULL_RESULT, $serialization)) { |
|
| 65 | + $result = new NullResult($contextCursor); |
|
| 66 | 66 | $cachingMetadata = CachingMetadata::fresh(); |
| 67 | 67 | } else { |
| 68 | 68 | $constraint = $this->constraintDeserializer->deserialize( |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | $status = $serialization[CheckResultSerializer::KEY_CHECK_RESULT_STATUS]; |
| 75 | 75 | |
| 76 | - $violationMessage = $this->getViolationMessageFromSerialization( $serialization ); |
|
| 76 | + $violationMessage = $this->getViolationMessageFromSerialization($serialization); |
|
| 77 | 77 | |
| 78 | 78 | $result = new CheckResult( |
| 79 | 79 | $contextCursor, |
@@ -88,13 +88,13 @@ discard block |
||
| 88 | 88 | ); |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - $dependencyMetadata = $this->getDependencyMetadataFromSerialization( $serialization ); |
|
| 91 | + $dependencyMetadata = $this->getDependencyMetadataFromSerialization($serialization); |
|
| 92 | 92 | |
| 93 | 93 | return $result->withMetadata( |
| 94 | - Metadata::merge( [ |
|
| 95 | - Metadata::ofCachingMetadata( $cachingMetadata ), |
|
| 96 | - Metadata::ofDependencyMetadata( $dependencyMetadata ), |
|
| 97 | - ] ) |
|
| 94 | + Metadata::merge([ |
|
| 95 | + Metadata::ofCachingMetadata($cachingMetadata), |
|
| 96 | + Metadata::ofDependencyMetadata($dependencyMetadata), |
|
| 97 | + ]) |
|
| 98 | 98 | ); |
| 99 | 99 | } |
| 100 | 100 | |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | * @param array $serialization |
| 103 | 103 | * @return null|ViolationMessage |
| 104 | 104 | */ |
| 105 | - private function getViolationMessageFromSerialization( array $serialization ) { |
|
| 106 | - if ( array_key_exists( CheckResultSerializer::KEY_VIOLATION_MESSAGE, $serialization ) ) { |
|
| 105 | + private function getViolationMessageFromSerialization(array $serialization) { |
|
| 106 | + if (array_key_exists(CheckResultSerializer::KEY_VIOLATION_MESSAGE, $serialization)) { |
|
| 107 | 107 | return $this->violationMessageDeserializer->deserialize( |
| 108 | 108 | $serialization[CheckResultSerializer::KEY_VIOLATION_MESSAGE] |
| 109 | 109 | ); |
@@ -116,8 +116,8 @@ discard block |
||
| 116 | 116 | * @param array $serialization |
| 117 | 117 | * @return DependencyMetadata |
| 118 | 118 | */ |
| 119 | - private function getDependencyMetadataFromSerialization( array $serialization ) { |
|
| 120 | - if ( array_key_exists( CheckResultSerializer::KEY_DEPENDENCY_METADATA, $serialization ) ) { |
|
| 119 | + private function getDependencyMetadataFromSerialization(array $serialization) { |
|
| 120 | + if (array_key_exists(CheckResultSerializer::KEY_DEPENDENCY_METADATA, $serialization)) { |
|
| 121 | 121 | return $this->deserializeDependencyMetadata( |
| 122 | 122 | $serialization[CheckResultSerializer::KEY_DEPENDENCY_METADATA] |
| 123 | 123 | ); |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * @param array $serialization |
| 131 | 131 | * @return CachingMetadata |
| 132 | 132 | */ |
| 133 | - private function deserializeCachingMetadata( array $serialization ) { |
|
| 133 | + private function deserializeCachingMetadata(array $serialization) { |
|
| 134 | 134 | if ( |
| 135 | 135 | array_key_exists( |
| 136 | 136 | CheckResultSerializer::KEY_CACHING_METADATA_MAX_AGE, |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | * @param array $serialization |
| 150 | 150 | * @return DependencyMetadata |
| 151 | 151 | */ |
| 152 | - private function deserializeDependencyMetadata( array $serialization ) { |
|
| 152 | + private function deserializeDependencyMetadata(array $serialization) { |
|
| 153 | 153 | if ( |
| 154 | 154 | array_key_exists( |
| 155 | 155 | CheckResultSerializer::KEY_DEPENDENCY_METADATA_FUTURE_TIME, |
@@ -159,20 +159,20 @@ discard block |
||
| 159 | 159 | $futureTime = TimeValue::newFromArray( |
| 160 | 160 | $serialization[CheckResultSerializer::KEY_DEPENDENCY_METADATA_FUTURE_TIME] |
| 161 | 161 | ); |
| 162 | - $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime( $futureTime ); |
|
| 162 | + $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime($futureTime); |
|
| 163 | 163 | } else { |
| 164 | 164 | $futureTimeDependencyMetadata = DependencyMetadata::blank(); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | $dependencyMetadata = array_reduce( |
| 168 | 168 | $serialization[CheckResultSerializer::KEY_DEPENDENCY_METADATA_ENTITY_IDS], |
| 169 | - function ( DependencyMetadata $metadata, $entityIdSerialization ) { |
|
| 170 | - $entityId = $this->entityIdParser->parse( $entityIdSerialization ); |
|
| 169 | + function(DependencyMetadata $metadata, $entityIdSerialization) { |
|
| 170 | + $entityId = $this->entityIdParser->parse($entityIdSerialization); |
|
| 171 | 171 | |
| 172 | - return DependencyMetadata::merge( [ |
|
| 172 | + return DependencyMetadata::merge([ |
|
| 173 | 173 | $metadata, |
| 174 | - DependencyMetadata::ofEntityId( $entityId ) |
|
| 175 | - ] ); |
|
| 174 | + DependencyMetadata::ofEntityId($entityId) |
|
| 175 | + ]); |
|
| 176 | 176 | }, |
| 177 | 177 | $futureTimeDependencyMetadata |
| 178 | 178 | ); |
@@ -4,17 +4,17 @@ |
||
| 4 | 4 | * @license GPL-2.0-or-later |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -if ( function_exists( 'wfLoadExtension' ) ) { |
|
| 8 | - wfLoadExtension( 'WikibaseQualityConstraints', __DIR__ . '/extension.json' ); |
|
| 7 | +if (function_exists('wfLoadExtension')) { |
|
| 8 | + wfLoadExtension('WikibaseQualityConstraints', __DIR__.'/extension.json'); |
|
| 9 | 9 | // Keep i18n globals so mergeMessageFileList.php doesn't break |
| 10 | - $wgMessagesDirs['WikibaseQualityConstraints'] = __DIR__ . '/i18n'; |
|
| 11 | - $wgExtensionMessagesFiles['WikibaseQualityConstraintsAlias'] = __DIR__ . '/WikibaseQualityConstraints.alias.php'; |
|
| 10 | + $wgMessagesDirs['WikibaseQualityConstraints'] = __DIR__.'/i18n'; |
|
| 11 | + $wgExtensionMessagesFiles['WikibaseQualityConstraintsAlias'] = __DIR__.'/WikibaseQualityConstraints.alias.php'; |
|
| 12 | 12 | wfWarn( |
| 13 | - 'Deprecated PHP entry point used for WikibaseQualityConstraints extension. ' . |
|
| 14 | - 'Please use wfLoadExtension instead, ' . |
|
| 13 | + 'Deprecated PHP entry point used for WikibaseQualityConstraints extension. '. |
|
| 14 | + 'Please use wfLoadExtension instead, '. |
|
| 15 | 15 | 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' |
| 16 | 16 | ); |
| 17 | 17 | return; |
| 18 | 18 | } else { |
| 19 | - die( 'This version of the WikibaseQualityConstraints extension requires MediaWiki 1.25+' ); |
|
| 19 | + die('This version of the WikibaseQualityConstraints extension requires MediaWiki 1.25+'); |
|
| 20 | 20 | } |
@@ -21,9 +21,9 @@ |
||
| 21 | 21 | /** |
| 22 | 22 | * @param ViolationMessage $violationMessage |
| 23 | 23 | */ |
| 24 | - public function __construct( ViolationMessage $violationMessage ) { |
|
| 25 | - $message = '⧼' . $violationMessage->getMessageKey() . '⧽'; |
|
| 26 | - parent::__construct( $message ); |
|
| 24 | + public function __construct(ViolationMessage $violationMessage) { |
|
| 25 | + $message = '⧼'.$violationMessage->getMessageKey().'⧽'; |
|
| 26 | + parent::__construct($message); |
|
| 27 | 27 | |
| 28 | 28 | $this->violationMessage = $violationMessage; |
| 29 | 29 | } |
@@ -55,34 +55,34 @@ discard block |
||
| 55 | 55 | * (temporarily, pre-rendered strings are allowed and returned without changes) |
| 56 | 56 | * @return string |
| 57 | 57 | */ |
| 58 | - public function render( ViolationMessage $violationMessage ) { |
|
| 59 | - if ( !array_key_exists( $violationMessage->getMessageKey(), $this->alternativeMessageKeys ) ) { |
|
| 60 | - return parent::render( $violationMessage ); |
|
| 58 | + public function render(ViolationMessage $violationMessage) { |
|
| 59 | + if (!array_key_exists($violationMessage->getMessageKey(), $this->alternativeMessageKeys)) { |
|
| 60 | + return parent::render($violationMessage); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | $arguments = $violationMessage->getArguments(); |
| 64 | - $multilingualTextArgument = array_pop( $arguments ); |
|
| 64 | + $multilingualTextArgument = array_pop($arguments); |
|
| 65 | 65 | $multilingualTextParams = $this->renderMultilingualText( |
| 66 | 66 | $multilingualTextArgument['value'], |
| 67 | 67 | $multilingualTextArgument['role'] |
| 68 | 68 | ); |
| 69 | 69 | |
| 70 | - $paramsLists = [ [] ]; |
|
| 71 | - foreach ( $arguments as $argument ) { |
|
| 72 | - $paramsLists[] = $this->renderArgument( $argument ); |
|
| 70 | + $paramsLists = [[]]; |
|
| 71 | + foreach ($arguments as $argument) { |
|
| 72 | + $paramsLists[] = $this->renderArgument($argument); |
|
| 73 | 73 | } |
| 74 | - $regularParams = call_user_func_array( 'array_merge', $paramsLists ); |
|
| 74 | + $regularParams = call_user_func_array('array_merge', $paramsLists); |
|
| 75 | 75 | |
| 76 | - if ( $multilingualTextParams === null ) { |
|
| 76 | + if ($multilingualTextParams === null) { |
|
| 77 | 77 | return $this->messageLocalizer |
| 78 | - ->msg( $this->alternativeMessageKeys[$violationMessage->getMessageKey()] ) |
|
| 79 | - ->params( $regularParams ) |
|
| 78 | + ->msg($this->alternativeMessageKeys[$violationMessage->getMessageKey()]) |
|
| 79 | + ->params($regularParams) |
|
| 80 | 80 | ->escaped(); |
| 81 | 81 | } else { |
| 82 | 82 | return $this->messageLocalizer |
| 83 | - ->msg( $violationMessage->getMessageKey() ) |
|
| 84 | - ->params( $regularParams ) |
|
| 85 | - ->params( $multilingualTextParams ) |
|
| 83 | + ->msg($violationMessage->getMessageKey()) |
|
| 84 | + ->params($regularParams) |
|
| 85 | + ->params($multilingualTextParams) |
|
| 86 | 86 | ->escaped(); |
| 87 | 87 | } |
| 88 | 88 | } |
@@ -93,18 +93,18 @@ discard block |
||
| 93 | 93 | * @return array[]|null list of parameters as accepted by Message::params(), |
| 94 | 94 | * or null if the text is not available in the user’s language |
| 95 | 95 | */ |
| 96 | - protected function renderMultilingualText( MultilingualTextValue $text, $role ) { |
|
| 96 | + protected function renderMultilingualText(MultilingualTextValue $text, $role) { |
|
| 97 | 97 | global $wgLang; |
| 98 | 98 | $languageCodes = $wgLang->getFallbackLanguages(); |
| 99 | - array_unshift( $languageCodes, $wgLang->getCode() ); |
|
| 99 | + array_unshift($languageCodes, $wgLang->getCode()); |
|
| 100 | 100 | |
| 101 | 101 | $texts = $text->getTexts(); |
| 102 | - foreach ( $languageCodes as $languageCode ) { |
|
| 103 | - if ( array_key_exists( $languageCode, $texts ) ) { |
|
| 104 | - return [ Message::rawParam( $this->addRole( |
|
| 105 | - htmlspecialchars( $texts[$languageCode]->getText() ), |
|
| 102 | + foreach ($languageCodes as $languageCode) { |
|
| 103 | + if (array_key_exists($languageCode, $texts)) { |
|
| 104 | + return [Message::rawParam($this->addRole( |
|
| 105 | + htmlspecialchars($texts[$languageCode]->getText()), |
|
| 106 | 106 | $role |
| 107 | - ) ) ]; |
|
| 107 | + ))]; |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | |