@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | */ |
30 | 30 | private $isSortable; |
31 | 31 | |
32 | - public function __construct( array $headers ) { |
|
33 | - foreach ( $headers as $header ) { |
|
34 | - $this->addHeader( $header ); |
|
32 | + public function __construct(array $headers) { |
|
33 | + foreach ($headers as $header) { |
|
34 | + $this->addHeader($header); |
|
35 | 35 | } |
36 | 36 | } |
37 | 37 | |
@@ -40,16 +40,16 @@ discard block |
||
40 | 40 | * |
41 | 41 | * @throws InvalidArgumentException |
42 | 42 | */ |
43 | - private function addHeader( $header ) { |
|
44 | - Assert::parameterType( [ 'string', HtmlTableHeaderBuilder::class ], $header, '$header' ); |
|
43 | + private function addHeader($header) { |
|
44 | + Assert::parameterType(['string', HtmlTableHeaderBuilder::class], $header, '$header'); |
|
45 | 45 | |
46 | - if ( is_string( $header ) ) { |
|
47 | - $header = new HtmlTableHeaderBuilder( $header ); |
|
46 | + if (is_string($header)) { |
|
47 | + $header = new HtmlTableHeaderBuilder($header); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | $this->headers[] = $header; |
51 | 51 | |
52 | - if ( $header->getIsSortable() ) { |
|
52 | + if ($header->getIsSortable()) { |
|
53 | 53 | $this->isSortable = true; |
54 | 54 | } |
55 | 55 | } |
@@ -82,12 +82,12 @@ discard block |
||
82 | 82 | * |
83 | 83 | * @throws InvalidArgumentException |
84 | 84 | */ |
85 | - public function appendRow( array $cells ) { |
|
86 | - foreach ( $cells as $key => $cell ) { |
|
87 | - if ( is_string( $cell ) ) { |
|
88 | - $cells[$key] = new HtmlTableCellBuilder( $cell ); |
|
89 | - } elseif ( !( $cell instanceof HtmlTableCellBuilder ) ) { |
|
90 | - throw new InvalidArgumentException( '$cells must be array of HtmlTableCell objects.' ); |
|
85 | + public function appendRow(array $cells) { |
|
86 | + foreach ($cells as $key => $cell) { |
|
87 | + if (is_string($cell)) { |
|
88 | + $cells[$key] = new HtmlTableCellBuilder($cell); |
|
89 | + } elseif (!($cell instanceof HtmlTableCellBuilder)) { |
|
90 | + throw new InvalidArgumentException('$cells must be array of HtmlTableCell objects.'); |
|
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
@@ -101,13 +101,13 @@ discard block |
||
101 | 101 | * |
102 | 102 | * @throws InvalidArgumentException |
103 | 103 | */ |
104 | - public function appendRows( array $rows ) { |
|
105 | - foreach ( $rows as $cells ) { |
|
106 | - if ( !is_array( $cells ) ) { |
|
107 | - throw new InvalidArgumentException( '$rows must be array of arrays of HtmlTableCell objects.' ); |
|
104 | + public function appendRows(array $rows) { |
|
105 | + foreach ($rows as $cells) { |
|
106 | + if (!is_array($cells)) { |
|
107 | + throw new InvalidArgumentException('$rows must be array of arrays of HtmlTableCell objects.'); |
|
108 | 108 | } |
109 | 109 | |
110 | - $this->appendRow( $cells ); |
|
110 | + $this->appendRow($cells); |
|
111 | 111 | } |
112 | 112 | } |
113 | 113 | |
@@ -119,38 +119,38 @@ discard block |
||
119 | 119 | public function toHtml() { |
120 | 120 | // Open table |
121 | 121 | $tableClasses = 'wikitable'; |
122 | - if ( $this->isSortable ) { |
|
122 | + if ($this->isSortable) { |
|
123 | 123 | $tableClasses .= ' sortable'; |
124 | 124 | } |
125 | - $html = Html::openElement( 'table', [ 'class' => $tableClasses ] ); |
|
125 | + $html = Html::openElement('table', ['class' => $tableClasses]); |
|
126 | 126 | |
127 | 127 | // Write headers |
128 | - $html .= Html::openElement( 'thead' ); |
|
129 | - $html .= Html::openElement( 'tr' ); |
|
130 | - foreach ( $this->headers as $header ) { |
|
128 | + $html .= Html::openElement('thead'); |
|
129 | + $html .= Html::openElement('tr'); |
|
130 | + foreach ($this->headers as $header) { |
|
131 | 131 | $html .= $header->toHtml(); |
132 | 132 | } |
133 | - $html .= Html::closeElement( 'tr' ); |
|
134 | - $html .= Html::closeElement( 'thead' ); |
|
135 | - $html .= Html::openElement( 'tbody' ); |
|
133 | + $html .= Html::closeElement('tr'); |
|
134 | + $html .= Html::closeElement('thead'); |
|
135 | + $html .= Html::openElement('tbody'); |
|
136 | 136 | |
137 | 137 | // Write rows |
138 | - foreach ( $this->rows as $row ) { |
|
139 | - $html .= Html::openElement( 'tr' ); |
|
138 | + foreach ($this->rows as $row) { |
|
139 | + $html .= Html::openElement('tr'); |
|
140 | 140 | |
141 | 141 | /** |
142 | 142 | * @var HtmlTableCellBuilder $cell |
143 | 143 | */ |
144 | - foreach ( $row as $cell ) { |
|
144 | + foreach ($row as $cell) { |
|
145 | 145 | $html .= $cell->toHtml(); |
146 | 146 | } |
147 | 147 | |
148 | - $html .= Html::closeElement( 'tr' ); |
|
148 | + $html .= Html::closeElement('tr'); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | // Close table |
152 | - $html .= Html::closeElement( 'tbody' ); |
|
153 | - $html .= Html::closeElement( 'table' ); |
|
152 | + $html .= Html::closeElement('tbody'); |
|
153 | + $html .= Html::closeElement('table'); |
|
154 | 154 | |
155 | 155 | return $html; |
156 | 156 | } |
@@ -128,17 +128,17 @@ discard block |
||
128 | 128 | public function __construct( |
129 | 129 | $messageKey |
130 | 130 | ) { |
131 | - if ( strpos( $messageKey, self::MESSAGE_KEY_PREFIX ) !== 0 ) { |
|
131 | + if (strpos($messageKey, self::MESSAGE_KEY_PREFIX) !== 0) { |
|
132 | 132 | throw new InvalidArgumentException( |
133 | - 'ViolationMessage key ⧼' . |
|
134 | - $messageKey . |
|
135 | - '⧽ should start with "' . |
|
136 | - self::MESSAGE_KEY_PREFIX . |
|
133 | + 'ViolationMessage key ⧼'. |
|
134 | + $messageKey. |
|
135 | + '⧽ should start with "'. |
|
136 | + self::MESSAGE_KEY_PREFIX. |
|
137 | 137 | '".' |
138 | 138 | ); |
139 | 139 | } |
140 | 140 | |
141 | - $this->messageKeySuffix = substr( $messageKey, strlen( self::MESSAGE_KEY_PREFIX ) ); |
|
141 | + $this->messageKeySuffix = substr($messageKey, strlen(self::MESSAGE_KEY_PREFIX)); |
|
142 | 142 | $this->arguments = []; |
143 | 143 | } |
144 | 144 | |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * @return string |
148 | 148 | */ |
149 | 149 | public function getMessageKey() { |
150 | - return self::MESSAGE_KEY_PREFIX . $this->messageKeySuffix; |
|
150 | + return self::MESSAGE_KEY_PREFIX.$this->messageKeySuffix; |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
@@ -167,9 +167,9 @@ discard block |
||
167 | 167 | * @param mixed $value the value, which should match the $type |
168 | 168 | * @return self |
169 | 169 | */ |
170 | - public function withArgument( $type, $role, $value ) { |
|
170 | + public function withArgument($type, $role, $value) { |
|
171 | 171 | $ret = clone $this; |
172 | - $ret->arguments[] = [ 'type' => $type, 'role' => $role, 'value' => $value ]; |
|
172 | + $ret->arguments[] = ['type' => $type, 'role' => $role, 'value' => $value]; |
|
173 | 173 | return $ret; |
174 | 174 | } |
175 | 175 | |
@@ -181,8 +181,8 @@ discard block |
||
181 | 181 | * @param string|null $role one of the Role::* constants |
182 | 182 | * @return self |
183 | 183 | */ |
184 | - public function withEntityId( EntityId $entityId, $role = null ) { |
|
185 | - return $this->withArgument( self::TYPE_ENTITY_ID, $role, $entityId ); |
|
184 | + public function withEntityId(EntityId $entityId, $role = null) { |
|
185 | + return $this->withArgument(self::TYPE_ENTITY_ID, $role, $entityId); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | /** |
@@ -199,8 +199,8 @@ discard block |
||
199 | 199 | * @param string|null $role one of the Role::* constants |
200 | 200 | * @return self |
201 | 201 | */ |
202 | - public function withEntityIdList( array $entityIdList, $role = null ) { |
|
203 | - return $this->withArgument( self::TYPE_ENTITY_ID_LIST, $role, $entityIdList ); |
|
202 | + public function withEntityIdList(array $entityIdList, $role = null) { |
|
203 | + return $this->withArgument(self::TYPE_ENTITY_ID_LIST, $role, $entityIdList); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | /** |
@@ -211,8 +211,8 @@ discard block |
||
211 | 211 | * @param string|null $role one of the Role::* constants |
212 | 212 | * @return self |
213 | 213 | */ |
214 | - public function withItemIdSnakValue( ItemIdSnakValue $value, $role = null ) { |
|
215 | - return $this->withArgument( self::TYPE_ITEM_ID_SNAK_VALUE, $role, $value ); |
|
214 | + public function withItemIdSnakValue(ItemIdSnakValue $value, $role = null) { |
|
215 | + return $this->withArgument(self::TYPE_ITEM_ID_SNAK_VALUE, $role, $value); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | /** |
@@ -229,8 +229,8 @@ discard block |
||
229 | 229 | * @param string|null $role one of the Role::* constants |
230 | 230 | * @return self |
231 | 231 | */ |
232 | - public function withItemIdSnakValueList( array $valueList, $role = null ) { |
|
233 | - return $this->withArgument( self::TYPE_ITEM_ID_SNAK_VALUE_LIST, $role, $valueList ); |
|
232 | + public function withItemIdSnakValueList(array $valueList, $role = null) { |
|
233 | + return $this->withArgument(self::TYPE_ITEM_ID_SNAK_VALUE_LIST, $role, $valueList); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | /** |
@@ -241,8 +241,8 @@ discard block |
||
241 | 241 | * @param string|null $role one of the Role::* constants |
242 | 242 | * @return self |
243 | 243 | */ |
244 | - public function withDataValue( DataValue $dataValue, $role = null ) { |
|
245 | - return $this->withArgument( self::TYPE_DATA_VALUE, $role, $dataValue ); |
|
244 | + public function withDataValue(DataValue $dataValue, $role = null) { |
|
245 | + return $this->withArgument(self::TYPE_DATA_VALUE, $role, $dataValue); |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | /** |
@@ -257,8 +257,8 @@ discard block |
||
257 | 257 | * @param string|null $role one of the Role::* constants |
258 | 258 | * @return self |
259 | 259 | */ |
260 | - public function withDataValueType( $dataValueType, $role = null ) { |
|
261 | - return $this->withArgument( self::TYPE_DATA_VALUE_TYPE, $role, $dataValueType ); |
|
260 | + public function withDataValueType($dataValueType, $role = null) { |
|
261 | + return $this->withArgument(self::TYPE_DATA_VALUE_TYPE, $role, $dataValueType); |
|
262 | 262 | } |
263 | 263 | |
264 | 264 | /** |
@@ -269,8 +269,8 @@ discard block |
||
269 | 269 | * @param string|null $role one of the Role::* constants |
270 | 270 | * @return self |
271 | 271 | */ |
272 | - public function withInlineCode( $code, $role = null ) { |
|
273 | - return $this->withArgument( self::TYPE_INLINE_CODE, $role, $code ); |
|
272 | + public function withInlineCode($code, $role = null) { |
|
273 | + return $this->withArgument(self::TYPE_INLINE_CODE, $role, $code); |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | /** |
@@ -281,8 +281,8 @@ discard block |
||
281 | 281 | * @param string|null $role one of the Role::* constants |
282 | 282 | * @return self |
283 | 283 | */ |
284 | - public function withConstraintScope( $scope, $role = null ) { |
|
285 | - return $this->withArgument( self::TYPE_CONSTRAINT_SCOPE, $role, $scope ); |
|
284 | + public function withConstraintScope($scope, $role = null) { |
|
285 | + return $this->withArgument(self::TYPE_CONSTRAINT_SCOPE, $role, $scope); |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | /** |
@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | * @param string|null $role one of the Role::* constants |
294 | 294 | * @return self |
295 | 295 | */ |
296 | - public function withConstraintScopeList( array $scopeList, $role = null ) { |
|
297 | - return $this->withArgument( self::TYPE_CONSTRAINT_SCOPE_LIST, $role, $scopeList ); |
|
296 | + public function withConstraintScopeList(array $scopeList, $role = null) { |
|
297 | + return $this->withArgument(self::TYPE_CONSTRAINT_SCOPE_LIST, $role, $scopeList); |
|
298 | 298 | } |
299 | 299 | |
300 | 300 | /** |
@@ -305,8 +305,8 @@ discard block |
||
305 | 305 | * @param string|null $role one of the Role::* constants |
306 | 306 | * @return self |
307 | 307 | */ |
308 | - public function withPropertyScope( $scope, $role = null ) { |
|
309 | - return $this->withArgument( self::TYPE_PROPERTY_SCOPE, $role, $scope ); |
|
308 | + public function withPropertyScope($scope, $role = null) { |
|
309 | + return $this->withArgument(self::TYPE_PROPERTY_SCOPE, $role, $scope); |
|
310 | 310 | } |
311 | 311 | |
312 | 312 | /** |
@@ -317,8 +317,8 @@ discard block |
||
317 | 317 | * @param string|null $role one of the Role::* constants |
318 | 318 | * @return self |
319 | 319 | */ |
320 | - public function withPropertyScopeList( array $scopeList, $role = null ) { |
|
321 | - return $this->withArgument( self::TYPE_PROPERTY_SCOPE_LIST, $role, $scopeList ); |
|
320 | + public function withPropertyScopeList(array $scopeList, $role = null) { |
|
321 | + return $this->withArgument(self::TYPE_PROPERTY_SCOPE_LIST, $role, $scopeList); |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | /** |
@@ -333,8 +333,8 @@ discard block |
||
333 | 333 | * @param string $languageCode |
334 | 334 | * @return self |
335 | 335 | */ |
336 | - public function withLanguage( $languageCode ) { |
|
337 | - return $this->withArgument( self::TYPE_LANGUAGE, null, $languageCode ); |
|
336 | + public function withLanguage($languageCode) { |
|
337 | + return $this->withArgument(self::TYPE_LANGUAGE, null, $languageCode); |
|
338 | 338 | } |
339 | 339 | |
340 | 340 | /** |
@@ -349,8 +349,8 @@ discard block |
||
349 | 349 | * @param string[] $languageCodes |
350 | 350 | * @return self |
351 | 351 | */ |
352 | - public function withLanguages( $languageCodes ) { |
|
353 | - return $this->withArgument( self::TYPE_LANGUAGE_LIST, null, $languageCodes ); |
|
352 | + public function withLanguages($languageCodes) { |
|
353 | + return $this->withArgument(self::TYPE_LANGUAGE_LIST, null, $languageCodes); |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | /** |
@@ -365,8 +365,8 @@ discard block |
||
365 | 365 | * @param string|null $role one of the Role::* constants |
366 | 366 | * @return self |
367 | 367 | */ |
368 | - public function withMultilingualText( MultilingualTextValue $text, $role = null ) { |
|
369 | - return $this->withArgument( self::TYPE_MULTILINGUAL_TEXT, $role, $text ); |
|
368 | + public function withMultilingualText(MultilingualTextValue $text, $role = null) { |
|
369 | + return $this->withArgument(self::TYPE_MULTILINGUAL_TEXT, $role, $text); |
|
370 | 370 | } |
371 | 371 | |
372 | 372 | } |
@@ -18,9 +18,9 @@ |
||
18 | 18 | */ |
19 | 19 | private $violationMessage; |
20 | 20 | |
21 | - public function __construct( ViolationMessage $violationMessage ) { |
|
22 | - $message = '⧼' . $violationMessage->getMessageKey() . '⧽'; |
|
23 | - parent::__construct( $message ); |
|
21 | + public function __construct(ViolationMessage $violationMessage) { |
|
22 | + $message = '⧼'.$violationMessage->getMessageKey().'⧽'; |
|
23 | + parent::__construct($message); |
|
24 | 24 | |
25 | 25 | $this->violationMessage = $violationMessage; |
26 | 26 | } |
@@ -53,12 +53,12 @@ discard block |
||
53 | 53 | $this->statsFactory = $statsFactory; |
54 | 54 | $this->logger = $logger; |
55 | 55 | $this->constraintCheckDurationLimits = [ |
56 | - 'info' => $config->get( 'WBQualityConstraintsCheckDurationInfoSeconds' ), |
|
57 | - 'warning' => $config->get( 'WBQualityConstraintsCheckDurationWarningSeconds' ), |
|
56 | + 'info' => $config->get('WBQualityConstraintsCheckDurationInfoSeconds'), |
|
57 | + 'warning' => $config->get('WBQualityConstraintsCheckDurationWarningSeconds'), |
|
58 | 58 | ]; |
59 | 59 | $this->constraintCheckOnEntityDurationLimits = [ |
60 | - 'info' => $config->get( 'WBQualityConstraintsCheckOnEntityDurationInfoSeconds' ), |
|
61 | - 'warning' => $config->get( 'WBQualityConstraintsCheckOnEntityDurationWarningSeconds' ), |
|
60 | + 'info' => $config->get('WBQualityConstraintsCheckOnEntityDurationInfoSeconds'), |
|
61 | + 'warning' => $config->get('WBQualityConstraintsCheckOnEntityDurationWarningSeconds'), |
|
62 | 62 | ]; |
63 | 63 | } |
64 | 64 | |
@@ -70,23 +70,23 @@ discard block |
||
70 | 70 | * @param float $durationSeconds |
71 | 71 | * @return array [ $limitSeconds, $logLevel ] |
72 | 72 | */ |
73 | - private function findLimit( $limits, $durationSeconds ) { |
|
73 | + private function findLimit($limits, $durationSeconds) { |
|
74 | 74 | $limitSeconds = null; |
75 | 75 | $logLevel = null; |
76 | 76 | |
77 | - foreach ( $limits as $level => $limit ) { |
|
77 | + foreach ($limits as $level => $limit) { |
|
78 | 78 | if ( |
79 | 79 | // duration exceeds this limit |
80 | 80 | $limit !== null && $durationSeconds > $limit && |
81 | 81 | // this limit is longer than previous longest limit |
82 | - ( $limitSeconds === null || $limit > $limitSeconds ) |
|
82 | + ($limitSeconds === null || $limit > $limitSeconds) |
|
83 | 83 | ) { |
84 | 84 | $limitSeconds = $limit; |
85 | 85 | $logLevel = $level; |
86 | 86 | } |
87 | 87 | } |
88 | 88 | |
89 | - return [ $limitSeconds, $logLevel ]; |
|
89 | + return [$limitSeconds, $logLevel]; |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -111,30 +111,30 @@ discard block |
||
111 | 111 | $durationSeconds, |
112 | 112 | $method |
113 | 113 | ) { |
114 | - $constraintCheckerClassShortName = substr( strrchr( $constraintCheckerClass, '\\' ), 1 ); |
|
114 | + $constraintCheckerClassShortName = substr(strrchr($constraintCheckerClass, '\\'), 1); |
|
115 | 115 | $constraintTypeItemId = $constraint->getConstraintTypeItemId(); |
116 | 116 | |
117 | 117 | $baseCheckTimingKey = 'wikibase.quality.constraints.check.timing'; |
118 | 118 | $this->statsFactory |
119 | - ->getTiming( 'check_constraint_duration_seconds' ) |
|
120 | - ->copyToStatsdAt( "$baseCheckTimingKey.$constraintTypeItemId-$constraintCheckerClassShortName" ) |
|
121 | - ->observe( $durationSeconds * 1000 ); |
|
119 | + ->getTiming('check_constraint_duration_seconds') |
|
120 | + ->copyToStatsdAt("$baseCheckTimingKey.$constraintTypeItemId-$constraintCheckerClassShortName") |
|
121 | + ->observe($durationSeconds * 1000); |
|
122 | 122 | |
123 | 123 | // find the longest limit (and associated log level) that the duration exceeds |
124 | - [ $limitSeconds, $logLevel ] = $this->findLimit( |
|
124 | + [$limitSeconds, $logLevel] = $this->findLimit( |
|
125 | 125 | $this->constraintCheckDurationLimits, |
126 | 126 | $durationSeconds |
127 | 127 | ); |
128 | - if ( $limitSeconds === null ) { |
|
128 | + if ($limitSeconds === null) { |
|
129 | 129 | return; |
130 | 130 | } |
131 | - if ( $context->getType() !== Context::TYPE_STATEMENT ) { |
|
131 | + if ($context->getType() !== Context::TYPE_STATEMENT) { |
|
132 | 132 | // TODO log less details but still log something |
133 | 133 | return; |
134 | 134 | } |
135 | 135 | |
136 | 136 | $resultMessage = $result->getMessage(); |
137 | - if ( $resultMessage !== null ) { |
|
137 | + if ($resultMessage !== null) { |
|
138 | 138 | $resultMessageKey = $resultMessage->getMessageKey(); |
139 | 139 | } else { |
140 | 140 | $resultMessageKey = null; |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | |
143 | 143 | $this->logger->log( |
144 | 144 | $logLevel, |
145 | - 'Constraint check with {constraintCheckerClassShortName} ' . |
|
146 | - 'took longer than {limitSeconds} second(s) ' . |
|
145 | + 'Constraint check with {constraintCheckerClassShortName} '. |
|
146 | + 'took longer than {limitSeconds} second(s) '. |
|
147 | 147 | '(duration: {durationSeconds} seconds).', |
148 | 148 | [ |
149 | 149 | 'method' => $method, |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | 'constraintId' => $constraint->getConstraintId(), |
154 | 154 | 'constraintPropertyId' => $constraint->getPropertyId()->getSerialization(), |
155 | 155 | 'constraintTypeItemId' => $constraintTypeItemId, |
156 | - 'constraintParameters' => json_encode( $constraint->getConstraintParameters() ), |
|
156 | + 'constraintParameters' => json_encode($constraint->getConstraintParameters()), |
|
157 | 157 | 'constraintCheckerClass' => $constraintCheckerClass, |
158 | 158 | 'constraintCheckerClassShortName' => $constraintCheckerClassShortName, |
159 | 159 | 'entityId' => $context->getEntity()->getId()->getSerialization(), |
@@ -185,23 +185,23 @@ discard block |
||
185 | 185 | ) { |
186 | 186 | $checkEntityTimingKey = 'wikibase.quality.constraints.check.entity.timing'; |
187 | 187 | $this->statsFactory |
188 | - ->getTiming( 'check_entity_constraint_duration_seconds' ) |
|
189 | - ->copyToStatsdAt( $checkEntityTimingKey ) |
|
190 | - ->observe( $durationSeconds * 1000 ); |
|
188 | + ->getTiming('check_entity_constraint_duration_seconds') |
|
189 | + ->copyToStatsdAt($checkEntityTimingKey) |
|
190 | + ->observe($durationSeconds * 1000); |
|
191 | 191 | |
192 | 192 | // find the longest limit (and associated log level) that the duration exceeds |
193 | - [ $limitSeconds, $logLevel ] = $this->findLimit( |
|
193 | + [$limitSeconds, $logLevel] = $this->findLimit( |
|
194 | 194 | $this->constraintCheckOnEntityDurationLimits, |
195 | 195 | $durationSeconds |
196 | 196 | ); |
197 | - if ( $limitSeconds === null ) { |
|
197 | + if ($limitSeconds === null) { |
|
198 | 198 | return; |
199 | 199 | } |
200 | 200 | |
201 | 201 | $this->logger->log( |
202 | 202 | $logLevel, |
203 | - 'Full constraint check on {entityId} ' . |
|
204 | - 'took longer than {limitSeconds} second(s) ' . |
|
203 | + 'Full constraint check on {entityId} '. |
|
204 | + 'took longer than {limitSeconds} second(s) '. |
|
205 | 205 | '(duration: {durationSeconds} seconds).', |
206 | 206 | [ |
207 | 207 | 'method' => $method, |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | /** |
218 | 218 | * Log a cache hit for a complete constraint check result for the given entity ID. |
219 | 219 | */ |
220 | - public function logCheckConstraintsCacheHit( EntityId $entityId ) { |
|
220 | + public function logCheckConstraintsCacheHit(EntityId $entityId) { |
|
221 | 221 | $cacheEntityHitKey = 'wikibase.quality.constraints.cache.entity.hit'; |
222 | - $metric = $this->statsFactory->getCounter( 'cache_entity_hit_total' ); |
|
222 | + $metric = $this->statsFactory->getCounter('cache_entity_hit_total'); |
|
223 | 223 | $metric->copyToStatsdAt( |
224 | 224 | $cacheEntityHitKey, |
225 | 225 | )->increment(); |
@@ -230,12 +230,12 @@ discard block |
||
230 | 230 | * |
231 | 231 | * @param EntityId[] $entityIds |
232 | 232 | */ |
233 | - public function logCheckConstraintsCacheMisses( array $entityIds ) { |
|
233 | + public function logCheckConstraintsCacheMisses(array $entityIds) { |
|
234 | 234 | $cacheEntityMissKey = 'wikibase.quality.constraints.cache.entity.miss'; |
235 | - $metric = $this->statsFactory->getCounter( 'cache_entity_miss_total' ); |
|
235 | + $metric = $this->statsFactory->getCounter('cache_entity_miss_total'); |
|
236 | 236 | $metric->copyToStatsdAt( |
237 | 237 | $cacheEntityMissKey, |
238 | - )->incrementBy( count( $entityIds ) ); |
|
238 | + )->incrementBy(count($entityIds)); |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | /** |
@@ -261,17 +261,17 @@ discard block |
||
261 | 261 | * @param EntityId[] $entityIds |
262 | 262 | * @param int $maxRevisionIds |
263 | 263 | */ |
264 | - public function logHugeDependencyMetadata( array $entityIds, $maxRevisionIds ) { |
|
264 | + public function logHugeDependencyMetadata(array $entityIds, $maxRevisionIds) { |
|
265 | 265 | $this->logger->log( |
266 | 266 | 'warning', |
267 | - 'Dependency metadata for constraint check result has huge set of entity IDs ' . |
|
268 | - '(count ' . count( $entityIds ) . ', limit ' . $maxRevisionIds . '); ' . |
|
267 | + 'Dependency metadata for constraint check result has huge set of entity IDs '. |
|
268 | + '(count '.count($entityIds).', limit '.$maxRevisionIds.'); '. |
|
269 | 269 | 'caching disabled for this check result.', |
270 | 270 | [ |
271 | 271 | 'loggingMethod' => __METHOD__, |
272 | 272 | 'entityIds' => json_encode( |
273 | 273 | array_map( |
274 | - static function ( EntityId $entityId ) { |
|
274 | + static function(EntityId $entityId) { |
|
275 | 275 | return $entityId->getSerialization(); |
276 | 276 | }, |
277 | 277 | $entityIds |
@@ -290,17 +290,17 @@ discard block |
||
290 | 290 | 'Sparql API replied with status 429 and a retry-after header. Requesting to retry after {retryAfterTime}', |
291 | 291 | [ |
292 | 292 | 'retryAfterTime' => $retryAfterTime, |
293 | - 'responseHeaders' => json_encode( $request->getResponseHeaders() ), |
|
293 | + 'responseHeaders' => json_encode($request->getResponseHeaders()), |
|
294 | 294 | 'responseContent' => $request->getContent(), |
295 | 295 | ] |
296 | 296 | ); |
297 | 297 | } |
298 | 298 | |
299 | - public function logSparqlHelperTooManyRequestsRetryAfterInvalid( MWHttpRequest $request ) { |
|
299 | + public function logSparqlHelperTooManyRequestsRetryAfterInvalid(MWHttpRequest $request) { |
|
300 | 300 | $this->logger->warning( |
301 | 301 | 'Sparql API replied with status 429 and no valid retry-after header.', |
302 | 302 | [ |
303 | - 'responseHeaders' => json_encode( $request->getResponseHeaders() ), |
|
303 | + 'responseHeaders' => json_encode($request->getResponseHeaders()), |
|
304 | 304 | 'responseContent' => $request->getContent(), |
305 | 305 | ] |
306 | 306 | ); |
@@ -144,14 +144,14 @@ discard block |
||
144 | 144 | ) { |
145 | 145 | $results = []; |
146 | 146 | $metadatas = []; |
147 | - if ( $this->canUseStoredResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) { |
|
147 | + if ($this->canUseStoredResults($entityIds, $claimIds, $constraintIds, $statuses)) { |
|
148 | 148 | $storedEntityIds = []; |
149 | - foreach ( $entityIds as $entityId ) { |
|
150 | - $storedResults = $this->getStoredResults( $entityId ); |
|
151 | - if ( $storedResults !== null ) { |
|
152 | - $this->loggingHelper->logCheckConstraintsCacheHit( $entityId ); |
|
153 | - foreach ( $storedResults->getArray() as $checkResult ) { |
|
154 | - if ( $this->statusSelected( $statuses, $checkResult ) ) { |
|
149 | + foreach ($entityIds as $entityId) { |
|
150 | + $storedResults = $this->getStoredResults($entityId); |
|
151 | + if ($storedResults !== null) { |
|
152 | + $this->loggingHelper->logCheckConstraintsCacheHit($entityId); |
|
153 | + foreach ($storedResults->getArray() as $checkResult) { |
|
154 | + if ($this->statusSelected($statuses, $checkResult)) { |
|
155 | 155 | $results[] = $checkResult; |
156 | 156 | } |
157 | 157 | } |
@@ -159,19 +159,19 @@ discard block |
||
159 | 159 | $storedEntityIds[] = $entityId; |
160 | 160 | } |
161 | 161 | } |
162 | - $entityIds = array_values( array_diff( $entityIds, $storedEntityIds ) ); |
|
162 | + $entityIds = array_values(array_diff($entityIds, $storedEntityIds)); |
|
163 | 163 | } |
164 | - if ( $entityIds !== [] || $claimIds !== [] ) { |
|
165 | - if ( $entityIds !== [] ) { |
|
166 | - $this->loggingHelper->logCheckConstraintsCacheMisses( $entityIds ); |
|
164 | + if ($entityIds !== [] || $claimIds !== []) { |
|
165 | + if ($entityIds !== []) { |
|
166 | + $this->loggingHelper->logCheckConstraintsCacheMisses($entityIds); |
|
167 | 167 | } |
168 | - $response = $this->getAndStoreResults( $entityIds, $claimIds, $constraintIds, $statuses ); |
|
169 | - $results = array_merge( $results, $response->getArray() ); |
|
168 | + $response = $this->getAndStoreResults($entityIds, $claimIds, $constraintIds, $statuses); |
|
169 | + $results = array_merge($results, $response->getArray()); |
|
170 | 170 | $metadatas[] = $response->getMetadata(); |
171 | 171 | } |
172 | 172 | return new CachedCheckResults( |
173 | 173 | $results, |
174 | - Metadata::merge( $metadatas ) |
|
174 | + Metadata::merge($metadatas) |
|
175 | 175 | ); |
176 | 176 | } |
177 | 177 | |
@@ -194,13 +194,13 @@ discard block |
||
194 | 194 | ?array $constraintIds, |
195 | 195 | array $statuses |
196 | 196 | ) { |
197 | - if ( $claimIds !== [] ) { |
|
197 | + if ($claimIds !== []) { |
|
198 | 198 | return false; |
199 | 199 | } |
200 | - if ( $constraintIds !== null ) { |
|
200 | + if ($constraintIds !== null) { |
|
201 | 201 | return false; |
202 | 202 | } |
203 | - if ( array_diff( $statuses, self::CACHED_STATUSES ) !== [] ) { |
|
203 | + if (array_diff($statuses, self::CACHED_STATUSES) !== []) { |
|
204 | 204 | return false; |
205 | 205 | } |
206 | 206 | return true; |
@@ -215,8 +215,8 @@ discard block |
||
215 | 215 | * @param CheckResult $result |
216 | 216 | * @return bool |
217 | 217 | */ |
218 | - private function statusSelected( array $statuses, CheckResult $result ) { |
|
219 | - return in_array( $result->getStatus(), $statuses, true ) || |
|
218 | + private function statusSelected(array $statuses, CheckResult $result) { |
|
219 | + return in_array($result->getStatus(), $statuses, true) || |
|
220 | 220 | $result instanceof NullResult; |
221 | 221 | } |
222 | 222 | |
@@ -233,11 +233,11 @@ discard block |
||
233 | 233 | ?array $constraintIds, |
234 | 234 | array $statuses |
235 | 235 | ) { |
236 | - $results = $this->resultsSource->getResults( $entityIds, $claimIds, $constraintIds, $statuses ); |
|
236 | + $results = $this->resultsSource->getResults($entityIds, $claimIds, $constraintIds, $statuses); |
|
237 | 237 | |
238 | - if ( $this->canStoreResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) { |
|
239 | - foreach ( $entityIds as $entityId ) { |
|
240 | - $this->storeResults( $entityId, $results ); |
|
238 | + if ($this->canStoreResults($entityIds, $claimIds, $constraintIds, $statuses)) { |
|
239 | + foreach ($entityIds as $entityId) { |
|
240 | + $this->storeResults($entityId, $results); |
|
241 | 241 | } |
242 | 242 | } |
243 | 243 | |
@@ -268,10 +268,10 @@ discard block |
||
268 | 268 | ?array $constraintIds, |
269 | 269 | array $statuses |
270 | 270 | ) { |
271 | - if ( $constraintIds !== null ) { |
|
271 | + if ($constraintIds !== null) { |
|
272 | 272 | return false; |
273 | 273 | } |
274 | - if ( array_diff( self::CACHED_STATUSES, $statuses ) !== [] ) { |
|
274 | + if (array_diff(self::CACHED_STATUSES, $statuses) !== []) { |
|
275 | 275 | return false; |
276 | 276 | } |
277 | 277 | return true; |
@@ -285,21 +285,21 @@ discard block |
||
285 | 285 | * May include check results for other entity IDs as well, |
286 | 286 | * or check results with statuses that we’re not interested in caching. |
287 | 287 | */ |
288 | - private function storeResults( EntityId $entityId, CachedCheckResults $results ) { |
|
288 | + private function storeResults(EntityId $entityId, CachedCheckResults $results) { |
|
289 | 289 | $latestRevisionIds = $this->getLatestRevisionIds( |
290 | 290 | $results->getMetadata()->getDependencyMetadata()->getEntityIds() |
291 | 291 | ); |
292 | - if ( $latestRevisionIds === null ) { |
|
292 | + if ($latestRevisionIds === null) { |
|
293 | 293 | return; |
294 | 294 | } |
295 | 295 | |
296 | 296 | $resultSerializations = []; |
297 | - foreach ( $results->getArray() as $checkResult ) { |
|
298 | - if ( $checkResult->getContextCursor()->getEntityId() !== $entityId->getSerialization() ) { |
|
297 | + foreach ($results->getArray() as $checkResult) { |
|
298 | + if ($checkResult->getContextCursor()->getEntityId() !== $entityId->getSerialization()) { |
|
299 | 299 | continue; |
300 | 300 | } |
301 | - if ( $this->statusSelected( self::CACHED_STATUSES, $checkResult ) ) { |
|
302 | - $resultSerializations[] = $this->checkResultSerializer->serialize( $checkResult ); |
|
301 | + if ($this->statusSelected(self::CACHED_STATUSES, $checkResult)) { |
|
302 | + $resultSerializations[] = $this->checkResultSerializer->serialize($checkResult); |
|
303 | 303 | } |
304 | 304 | } |
305 | 305 | |
@@ -308,11 +308,11 @@ discard block |
||
308 | 308 | 'latestRevisionIds' => $latestRevisionIds, |
309 | 309 | ]; |
310 | 310 | $futureTime = $results->getMetadata()->getDependencyMetadata()->getFutureTime(); |
311 | - if ( $futureTime !== null ) { |
|
311 | + if ($futureTime !== null) { |
|
312 | 312 | $value['futureTime'] = $futureTime->getArrayValue(); |
313 | 313 | } |
314 | 314 | |
315 | - $this->cache->set( $entityId, $value, $this->ttlInSeconds ); |
|
315 | + $this->cache->set($entityId, $value, $this->ttlInSeconds); |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | /** |
@@ -327,33 +327,32 @@ discard block |
||
327 | 327 | $forRevision = 0 |
328 | 328 | ) { |
329 | 329 | $cacheInfo = WANObjectCache::PASS_BY_REF; |
330 | - $value = $this->cache->get( $entityId, $curTTL, [], $cacheInfo ); |
|
331 | - $now = ( $this->microtime )( true ); |
|
330 | + $value = $this->cache->get($entityId, $curTTL, [], $cacheInfo); |
|
331 | + $now = ($this->microtime)(true); |
|
332 | 332 | |
333 | - $dependencyMetadata = $this->checkDependencyMetadata( $value, |
|
334 | - [ $entityId->getSerialization() => $forRevision ] ); |
|
335 | - if ( $dependencyMetadata === null ) { |
|
333 | + $dependencyMetadata = $this->checkDependencyMetadata($value, |
|
334 | + [$entityId->getSerialization() => $forRevision]); |
|
335 | + if ($dependencyMetadata === null) { |
|
336 | 336 | return null; |
337 | 337 | } |
338 | 338 | |
339 | 339 | // @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset False positive |
340 | 340 | $asOf = $cacheInfo[WANObjectCache::KEY_AS_OF]; |
341 | - $ageInSeconds = (int)ceil( $now - $asOf ); |
|
341 | + $ageInSeconds = (int) ceil($now - $asOf); |
|
342 | 342 | $cachingMetadata = $ageInSeconds > 0 ? |
343 | - CachingMetadata::ofMaximumAgeInSeconds( $ageInSeconds ) : |
|
344 | - CachingMetadata::fresh(); |
|
343 | + CachingMetadata::ofMaximumAgeInSeconds($ageInSeconds) : CachingMetadata::fresh(); |
|
345 | 344 | |
346 | 345 | $results = []; |
347 | - foreach ( $value['results'] as $resultSerialization ) { |
|
348 | - $results[] = $this->deserializeCheckResult( $resultSerialization, $cachingMetadata ); |
|
346 | + foreach ($value['results'] as $resultSerialization) { |
|
347 | + $results[] = $this->deserializeCheckResult($resultSerialization, $cachingMetadata); |
|
349 | 348 | } |
350 | 349 | |
351 | 350 | return new CachedCheckResults( |
352 | 351 | $results, |
353 | - Metadata::merge( [ |
|
354 | - Metadata::ofCachingMetadata( $cachingMetadata ), |
|
355 | - Metadata::ofDependencyMetadata( $dependencyMetadata ), |
|
356 | - ] ) |
|
352 | + Metadata::merge([ |
|
353 | + Metadata::ofCachingMetadata($cachingMetadata), |
|
354 | + Metadata::ofDependencyMetadata($dependencyMetadata), |
|
355 | + ]) |
|
357 | 356 | ); |
358 | 357 | } |
359 | 358 | |
@@ -369,43 +368,43 @@ discard block |
||
369 | 368 | * @return DependencyMetadata|null the dependency metadata, |
370 | 369 | * or null if $value should no longer be used |
371 | 370 | */ |
372 | - private function checkDependencyMetadata( $value, $paramRevs ) { |
|
373 | - if ( $value === false ) { |
|
371 | + private function checkDependencyMetadata($value, $paramRevs) { |
|
372 | + if ($value === false) { |
|
374 | 373 | return null; |
375 | 374 | } |
376 | 375 | |
377 | - if ( array_key_exists( 'futureTime', $value ) ) { |
|
378 | - $futureTime = TimeValue::newFromArray( $value['futureTime'] ); |
|
379 | - if ( !$this->timeValueComparer->isFutureTime( $futureTime ) ) { |
|
376 | + if (array_key_exists('futureTime', $value)) { |
|
377 | + $futureTime = TimeValue::newFromArray($value['futureTime']); |
|
378 | + if (!$this->timeValueComparer->isFutureTime($futureTime)) { |
|
380 | 379 | return null; |
381 | 380 | } |
382 | - $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime( $futureTime ); |
|
381 | + $futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime($futureTime); |
|
383 | 382 | } else { |
384 | 383 | $futureTimeDependencyMetadata = DependencyMetadata::blank(); |
385 | 384 | } |
386 | 385 | |
387 | - foreach ( $paramRevs as $id => $revision ) { |
|
388 | - if ( $revision > 0 ) { |
|
389 | - $value['latestRevisionIds'][$id] = min( $revision, $value['latestRevisionIds'][$id] ?? PHP_INT_MAX ); |
|
386 | + foreach ($paramRevs as $id => $revision) { |
|
387 | + if ($revision > 0) { |
|
388 | + $value['latestRevisionIds'][$id] = min($revision, $value['latestRevisionIds'][$id] ?? PHP_INT_MAX); |
|
390 | 389 | } |
391 | 390 | } |
392 | 391 | |
393 | 392 | $dependedEntityIds = array_map( |
394 | - [ $this->entityIdParser, "parse" ], |
|
395 | - array_keys( $value['latestRevisionIds'] ) |
|
393 | + [$this->entityIdParser, "parse"], |
|
394 | + array_keys($value['latestRevisionIds']) |
|
396 | 395 | ); |
397 | 396 | |
398 | - if ( $value['latestRevisionIds'] !== $this->getLatestRevisionIds( $dependedEntityIds ) ) { |
|
397 | + if ($value['latestRevisionIds'] !== $this->getLatestRevisionIds($dependedEntityIds)) { |
|
399 | 398 | return null; |
400 | 399 | } |
401 | 400 | |
402 | 401 | return array_reduce( |
403 | 402 | $dependedEntityIds, |
404 | - static function ( DependencyMetadata $metadata, EntityId $entityId ) { |
|
405 | - return DependencyMetadata::merge( [ |
|
403 | + static function(DependencyMetadata $metadata, EntityId $entityId) { |
|
404 | + return DependencyMetadata::merge([ |
|
406 | 405 | $metadata, |
407 | - DependencyMetadata::ofEntityId( $entityId ), |
|
408 | - ] ); |
|
406 | + DependencyMetadata::ofEntityId($entityId), |
|
407 | + ]); |
|
409 | 408 | }, |
410 | 409 | $futureTimeDependencyMetadata |
411 | 410 | ); |
@@ -425,13 +424,13 @@ discard block |
||
425 | 424 | array $resultSerialization, |
426 | 425 | CachingMetadata $cachingMetadata |
427 | 426 | ) { |
428 | - $result = $this->checkResultDeserializer->deserialize( $resultSerialization ); |
|
429 | - if ( $this->isPossiblyStaleResult( $result ) ) { |
|
427 | + $result = $this->checkResultDeserializer->deserialize($resultSerialization); |
|
428 | + if ($this->isPossiblyStaleResult($result)) { |
|
430 | 429 | $result->withMetadata( |
431 | - Metadata::merge( [ |
|
430 | + Metadata::merge([ |
|
432 | 431 | $result->getMetadata(), |
433 | - Metadata::ofCachingMetadata( $cachingMetadata ), |
|
434 | - ] ) |
|
432 | + Metadata::ofCachingMetadata($cachingMetadata), |
|
433 | + ]) |
|
435 | 434 | ); |
436 | 435 | } |
437 | 436 | return $result; |
@@ -441,8 +440,8 @@ discard block |
||
441 | 440 | * @param CheckResult $result |
442 | 441 | * @return bool |
443 | 442 | */ |
444 | - private function isPossiblyStaleResult( CheckResult $result ) { |
|
445 | - if ( $result instanceof NullResult ) { |
|
443 | + private function isPossiblyStaleResult(CheckResult $result) { |
|
444 | + if ($result instanceof NullResult) { |
|
446 | 445 | return false; |
447 | 446 | } |
448 | 447 | |
@@ -457,14 +456,14 @@ discard block |
||
457 | 456 | * @return int[]|null array from entity ID serializations to revision ID, |
458 | 457 | * or null to indicate that not all revision IDs could be loaded |
459 | 458 | */ |
460 | - private function getLatestRevisionIds( array $entityIds ) { |
|
461 | - if ( $entityIds === [] ) { |
|
459 | + private function getLatestRevisionIds(array $entityIds) { |
|
460 | + if ($entityIds === []) { |
|
462 | 461 | $this->loggingHelper->logEmptyDependencyMetadata(); |
463 | 462 | return []; |
464 | 463 | } |
465 | - if ( count( $entityIds ) > $this->maxRevisionIds ) { |
|
464 | + if (count($entityIds) > $this->maxRevisionIds) { |
|
466 | 465 | // one of those entities will probably be edited soon, so might as well skip caching |
467 | - $this->loggingHelper->logHugeDependencyMetadata( $entityIds, $this->maxRevisionIds ); |
|
466 | + $this->loggingHelper->logHugeDependencyMetadata($entityIds, $this->maxRevisionIds); |
|
468 | 467 | return null; |
469 | 468 | } |
470 | 469 | |
@@ -472,7 +471,7 @@ discard block |
||
472 | 471 | $entityIds, |
473 | 472 | LookupConstants::LATEST_FROM_REPLICA |
474 | 473 | ); |
475 | - if ( $this->hasFalseElements( $latestRevisionIds ) ) { |
|
474 | + if ($this->hasFalseElements($latestRevisionIds)) { |
|
476 | 475 | return null; |
477 | 476 | } |
478 | 477 | return $latestRevisionIds; |
@@ -482,14 +481,14 @@ discard block |
||
482 | 481 | * @param array $array |
483 | 482 | * @return bool |
484 | 483 | */ |
485 | - private function hasFalseElements( array $array ) { |
|
486 | - return in_array( false, $array, true ); |
|
484 | + private function hasFalseElements(array $array) { |
|
485 | + return in_array(false, $array, true); |
|
487 | 486 | } |
488 | 487 | |
489 | 488 | /** |
490 | 489 | * Set a custom function to get the current time, instead of microtime(). |
491 | 490 | */ |
492 | - public function setMicrotimeFunction( callable $microtime ) { |
|
491 | + public function setMicrotimeFunction(callable $microtime) { |
|
493 | 492 | $this->microtime = $microtime; |
494 | 493 | } |
495 | 494 |