@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * @codeCoverageIgnore This method is purely declarative. |
79 | 79 | */ |
80 | 80 | public function getDefaultContextTypes() { |
81 | - return [ Context::TYPE_STATEMENT ]; |
|
81 | + return [Context::TYPE_STATEMENT]; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
@@ -90,30 +90,30 @@ discard block |
||
90 | 90 | * @return CheckResult |
91 | 91 | * @throws \ConfigException |
92 | 92 | */ |
93 | - public function checkConstraint( Context $context, Constraint $constraint ) { |
|
94 | - if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) { |
|
95 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED ); |
|
93 | + public function checkConstraint(Context $context, Constraint $constraint) { |
|
94 | + if ($context->getSnakRank() === Statement::RANK_DEPRECATED) { |
|
95 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED); |
|
96 | 96 | } |
97 | 97 | $snak = $context->getSnak(); |
98 | - if ( !$snak instanceof PropertyValueSnak ) { |
|
98 | + if (!$snak instanceof PropertyValueSnak) { |
|
99 | 99 | // nothing to check |
100 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_COMPLIANCE ); |
|
100 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_COMPLIANCE); |
|
101 | 101 | } |
102 | - if ( $snak->getDataValue()->getType() !== 'wikibase-entityid' ) { |
|
102 | + if ($snak->getDataValue()->getType() !== 'wikibase-entityid') { |
|
103 | 103 | // wrong data type |
104 | - $message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) ) |
|
105 | - ->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM ) |
|
106 | - ->withDataValueType( 'wikibase-entityid' ); |
|
107 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_VIOLATION, $message ); |
|
104 | + $message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type')) |
|
105 | + ->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM) |
|
106 | + ->withDataValueType('wikibase-entityid'); |
|
107 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_VIOLATION, $message); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** @var EntityId $objectId */ |
111 | 111 | $objectId = $snak->getDataValue()->getEntityId(); |
112 | - $objectItem = $this->entityLookup->getEntity( $objectId ); |
|
113 | - if ( !( $objectItem instanceof StatementListProvider ) ) { |
|
112 | + $objectItem = $this->entityLookup->getEntity($objectId); |
|
113 | + if (!($objectItem instanceof StatementListProvider)) { |
|
114 | 114 | // object was deleted/doesn't exist |
115 | - $message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' ); |
|
116 | - return new CheckResult( $context, $constraint, [], CheckResult::STATUS_VIOLATION, $message ); |
|
115 | + $message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist'); |
|
116 | + return new CheckResult($context, $constraint, [], CheckResult::STATUS_VIOLATION, $message); |
|
117 | 117 | } |
118 | 118 | /** @var Statement[] $objectStatements */ |
119 | 119 | $objectStatements = $objectItem->getStatements()->toArray(); |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | /** @var Statement[] $subjectStatements */ |
124 | 124 | $subjectStatements = $context->getEntity()->getStatements()->toArray(); |
125 | 125 | /** @var String[] $startPropertyIds */ |
126 | - $startPropertyIds = $this->config->get( self::CONFIG_VARIABLE_START_PROPERTY_IDS ); |
|
126 | + $startPropertyIds = $this->config->get(self::CONFIG_VARIABLE_START_PROPERTY_IDS); |
|
127 | 127 | /** @var String[] $endPropertyIds */ |
128 | - $endPropertyIds = $this->config->get( self::CONFIG_VARIABLE_END_PROPERTY_IDS ); |
|
128 | + $endPropertyIds = $this->config->get(self::CONFIG_VARIABLE_END_PROPERTY_IDS); |
|
129 | 129 | $subjectStartValue = $this->getExtremeValue( |
130 | 130 | $startPropertyIds, |
131 | 131 | $subjectStatements, |
@@ -147,15 +147,15 @@ discard block |
||
147 | 147 | 'end' |
148 | 148 | ); |
149 | 149 | if ( |
150 | - $this->rangeCheckerHelper->getComparison( $subjectStartValue, $subjectEndValue ) <= 0 && |
|
151 | - $this->rangeCheckerHelper->getComparison( $objectStartValue, $objectEndValue ) <= 0 && ( |
|
152 | - $this->rangeCheckerHelper->getComparison( $subjectEndValue, $objectStartValue ) < 0 || |
|
153 | - $this->rangeCheckerHelper->getComparison( $objectEndValue, $subjectStartValue ) < 0 |
|
150 | + $this->rangeCheckerHelper->getComparison($subjectStartValue, $subjectEndValue) <= 0 && |
|
151 | + $this->rangeCheckerHelper->getComparison($objectStartValue, $objectEndValue) <= 0 && ( |
|
152 | + $this->rangeCheckerHelper->getComparison($subjectEndValue, $objectStartValue) < 0 || |
|
153 | + $this->rangeCheckerHelper->getComparison($objectEndValue, $subjectStartValue) < 0 |
|
154 | 154 | ) |
155 | 155 | ) { |
156 | 156 | if ( |
157 | 157 | $subjectEndValue == null || |
158 | - $this->rangeCheckerHelper->getComparison( $objectEndValue, $subjectEndValue ) < 0 |
|
158 | + $this->rangeCheckerHelper->getComparison($objectEndValue, $subjectEndValue) < 0 |
|
159 | 159 | ) { |
160 | 160 | $earlierEntityId = $objectId; |
161 | 161 | $minEndValue = $objectEndValue; |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | $message = null; |
179 | 179 | $status = CheckResult::STATUS_COMPLIANCE; |
180 | 180 | } |
181 | - return new CheckResult( $context, $constraint, [], $status, $message ); |
|
181 | + return new CheckResult($context, $constraint, [], $status, $message); |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | /** |
@@ -188,19 +188,19 @@ discard block |
||
188 | 188 | * |
189 | 189 | * @return DataValue|null |
190 | 190 | */ |
191 | - private function getExtremeValue( $extremePropertyIds, $statements, $startOrEnd ) { |
|
192 | - if ( $startOrEnd !== 'start' && $startOrEnd !== 'end' ) { |
|
193 | - throw new \InvalidArgumentException( '$startOrEnd must be \'start\' or \'end\'.' ); |
|
191 | + private function getExtremeValue($extremePropertyIds, $statements, $startOrEnd) { |
|
192 | + if ($startOrEnd !== 'start' && $startOrEnd !== 'end') { |
|
193 | + throw new \InvalidArgumentException('$startOrEnd must be \'start\' or \'end\'.'); |
|
194 | 194 | } |
195 | 195 | $extremeValue = null; |
196 | - foreach ( $extremePropertyIds as $extremePropertyId ) { |
|
197 | - $statementList = new StatementList( $statements ); |
|
198 | - $extremeStatements = $statementList->getByPropertyId( new PropertyId( $extremePropertyId ) ); |
|
196 | + foreach ($extremePropertyIds as $extremePropertyId) { |
|
197 | + $statementList = new StatementList($statements); |
|
198 | + $extremeStatements = $statementList->getByPropertyId(new PropertyId($extremePropertyId)); |
|
199 | 199 | /** @var Statement $extremeStatement */ |
200 | - foreach ( $extremeStatements as $extremeStatement ) { |
|
201 | - if ( $extremeStatement->getRank() !== Statement::RANK_DEPRECATED ) { |
|
200 | + foreach ($extremeStatements as $extremeStatement) { |
|
201 | + if ($extremeStatement->getRank() !== Statement::RANK_DEPRECATED) { |
|
202 | 202 | $snak = $extremeStatement->getMainSnak(); |
203 | - if ( !$snak instanceof PropertyValueSnak ) { |
|
203 | + if (!$snak instanceof PropertyValueSnak) { |
|
204 | 204 | return null; |
205 | 205 | } else { |
206 | 206 | $comparison = $this->rangeCheckerHelper->getComparison( |
@@ -209,8 +209,8 @@ discard block |
||
209 | 209 | ); |
210 | 210 | if ( |
211 | 211 | $extremeValue === null || |
212 | - ( $startOrEnd === 'start' && $comparison < 0 ) || |
|
213 | - ( $startOrEnd === 'end' && $comparison > 0 ) |
|
212 | + ($startOrEnd === 'start' && $comparison < 0) || |
|
213 | + ($startOrEnd === 'end' && $comparison > 0) |
|
214 | 214 | ) { |
215 | 215 | $extremeValue = $snak->getDataValue(); |
216 | 216 | } |
@@ -240,17 +240,16 @@ discard block |
||
240 | 240 | DataValue $maxStartValue |
241 | 241 | ) { |
242 | 242 | $messageKey = $earlierEntityId === $subjectId ? |
243 | - 'wbqc-violation-message-contemporary-subject-earlier' : |
|
244 | - 'wbqc-violation-message-contemporary-value-earlier'; |
|
245 | - return ( new ViolationMessage( $messageKey ) ) |
|
246 | - ->withEntityId( $subjectId, Role::SUBJECT ) |
|
247 | - ->withEntityId( $propertyId, Role::PREDICATE ) |
|
248 | - ->withEntityId( $objectId, Role::OBJECT ) |
|
249 | - ->withDataValue( $minEndValue, Role::OBJECT ) |
|
250 | - ->withDataValue( $maxStartValue, Role::OBJECT ); |
|
243 | + 'wbqc-violation-message-contemporary-subject-earlier' : 'wbqc-violation-message-contemporary-value-earlier'; |
|
244 | + return (new ViolationMessage($messageKey)) |
|
245 | + ->withEntityId($subjectId, Role::SUBJECT) |
|
246 | + ->withEntityId($propertyId, Role::PREDICATE) |
|
247 | + ->withEntityId($objectId, Role::OBJECT) |
|
248 | + ->withDataValue($minEndValue, Role::OBJECT) |
|
249 | + ->withDataValue($maxStartValue, Role::OBJECT); |
|
251 | 250 | } |
252 | 251 | |
253 | - public function checkConstraintParameters( Constraint $constraint ) { |
|
252 | + public function checkConstraintParameters(Constraint $constraint) { |
|
254 | 253 | // no parameters |
255 | 254 | return []; |
256 | 255 | } |
@@ -22,15 +22,15 @@ discard block |
||
22 | 22 | // no parent::__construct() call |
23 | 23 | } |
24 | 24 | |
25 | - public function hasType( $id, array $classes ) { |
|
26 | - throw new LogicException( 'methods of this class should never be called' ); |
|
25 | + public function hasType($id, array $classes) { |
|
26 | + throw new LogicException('methods of this class should never be called'); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | public function findEntitiesWithSameStatement( |
30 | 30 | Statement $statement, |
31 | 31 | $ignoreDeprecatedStatements |
32 | 32 | ) { |
33 | - throw new LogicException( 'methods of this class should never be called' ); |
|
33 | + throw new LogicException('methods of this class should never be called'); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function findEntitiesWithSameQualifierOrReference( |
@@ -39,15 +39,15 @@ discard block |
||
39 | 39 | $type, |
40 | 40 | $ignoreDeprecatedStatements |
41 | 41 | ) { |
42 | - throw new LogicException( 'methods of this class should never be called' ); |
|
42 | + throw new LogicException('methods of this class should never be called'); |
|
43 | 43 | } |
44 | 44 | |
45 | - public function matchesRegularExpression( $text, $regex ) { |
|
46 | - throw new LogicException( 'methods of this class should never be called' ); |
|
45 | + public function matchesRegularExpression($text, $regex) { |
|
46 | + throw new LogicException('methods of this class should never be called'); |
|
47 | 47 | } |
48 | 48 | |
49 | - public function runQuery( $query, $needsPrefixes = true ) { |
|
50 | - throw new LogicException( 'methods of this class should never be called' ); |
|
49 | + public function runQuery($query, $needsPrefixes = true) { |
|
50 | + throw new LogicException('methods of this class should never be called'); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | } |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | EntityIdLookup $entityIdLookup, |
40 | 40 | RdfVocabulary $rdfVocabulary |
41 | 41 | ) { |
42 | - parent::__construct( $page, $context ); |
|
42 | + parent::__construct($page, $context); |
|
43 | 43 | $this->resultsSource = $resultsSource; |
44 | 44 | $this->entityIdLookup = $entityIdLookup; |
45 | 45 | $this->rdfVocabulary = $rdfVocabulary; |
46 | 46 | } |
47 | 47 | |
48 | - public static function newFromGlobalState( Page $page, IContextSource $context ) { |
|
48 | + public static function newFromGlobalState(Page $page, IContextSource $context) { |
|
49 | 49 | $repo = WikibaseRepo::getDefaultInstance(); |
50 | 50 | |
51 | 51 | return new static( |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | * @param string $guid |
93 | 93 | * @return string |
94 | 94 | */ |
95 | - private function cleanupGuid( $guid ) { |
|
96 | - return preg_replace( '/[^\w-]/', '-', $guid ); |
|
95 | + private function cleanupGuid($guid) { |
|
96 | + return preg_replace('/[^\w-]/', '-', $guid); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | /** |
@@ -105,51 +105,51 @@ discard block |
||
105 | 105 | $response = $this->getRequest()->response(); |
106 | 106 | $this->getOutput()->disable(); |
107 | 107 | |
108 | - if ( !$this->resultsSource instanceof CachingResultsSource ) { |
|
108 | + if (!$this->resultsSource instanceof CachingResultsSource) { |
|
109 | 109 | // TODO: make configurable whether only cached results are returned |
110 | - $response->statusHeader( 501 ); // Not Implemented |
|
110 | + $response->statusHeader(501); // Not Implemented |
|
111 | 111 | return null; |
112 | 112 | } |
113 | 113 | |
114 | - $entityId = $this->entityIdLookup->getEntityIdForTitle( $this->getTitle() ); |
|
115 | - if ( $entityId === null ) { |
|
116 | - $response->statusHeader( 404 ); // Not Found |
|
114 | + $entityId = $this->entityIdLookup->getEntityIdForTitle($this->getTitle()); |
|
115 | + if ($entityId === null) { |
|
116 | + $response->statusHeader(404); // Not Found |
|
117 | 117 | return null; |
118 | 118 | } |
119 | 119 | |
120 | - $results = $this->resultsSource->getStoredResults( $entityId ); |
|
121 | - if ( $results === null ) { |
|
122 | - $response->statusHeader( 204 ); // No Content |
|
120 | + $results = $this->resultsSource->getStoredResults($entityId); |
|
121 | + if ($results === null) { |
|
122 | + $response->statusHeader(204); // No Content |
|
123 | 123 | return null; |
124 | 124 | } |
125 | 125 | |
126 | 126 | $format = 'ttl'; // TODO: make format an option |
127 | 127 | |
128 | 128 | $writerFactory = new RdfWriterFactory(); |
129 | - $formatName = $writerFactory->getFormatName( $format ); |
|
130 | - $contentType = $writerFactory->getMimeTypes( $formatName )[0]; |
|
129 | + $formatName = $writerFactory->getFormatName($format); |
|
130 | + $contentType = $writerFactory->getMimeTypes($formatName)[0]; |
|
131 | 131 | |
132 | - $response->header( "Content-Type: $contentType; charset=UTF-8" ); |
|
132 | + $response->header("Content-Type: $contentType; charset=UTF-8"); |
|
133 | 133 | |
134 | - $writer = $writerFactory->getWriter( $formatName ); |
|
135 | - foreach ( [ RdfVocabulary::NS_STATEMENT, RdfVocabulary::NS_ONTOLOGY ] as $ns ) { |
|
136 | - $writer->prefix( $ns, $this->rdfVocabulary->getNamespaceURI( $ns ) ); |
|
134 | + $writer = $writerFactory->getWriter($formatName); |
|
135 | + foreach ([RdfVocabulary::NS_STATEMENT, RdfVocabulary::NS_ONTOLOGY] as $ns) { |
|
136 | + $writer->prefix($ns, $this->rdfVocabulary->getNamespaceURI($ns)); |
|
137 | 137 | } |
138 | 138 | $writer->start(); |
139 | 139 | |
140 | - foreach ( $results->getArray() as $checkResult ) { |
|
141 | - if ( $checkResult instanceof NullResult ) { |
|
140 | + foreach ($results->getArray() as $checkResult) { |
|
141 | + if ($checkResult instanceof NullResult) { |
|
142 | 142 | continue; |
143 | 143 | } |
144 | - if ( $checkResult->getStatus() === CheckResult::STATUS_BAD_PARAMETERS ) { |
|
144 | + if ($checkResult->getStatus() === CheckResult::STATUS_BAD_PARAMETERS) { |
|
145 | 145 | continue; |
146 | 146 | } |
147 | 147 | |
148 | - $writer->about( RdfVocabulary::NS_STATEMENT, |
|
149 | - $this->cleanupGuid( $checkResult->getContextCursor()->getStatementGuid() ) ) |
|
150 | - ->say( RdfVocabulary::NS_ONTOLOGY, 'hasViolationForConstraint' ) |
|
151 | - ->is( RdfVocabulary::NS_STATEMENT, |
|
152 | - $this->cleanupGuid( $checkResult->getConstraint()->getConstraintId() ) ); |
|
148 | + $writer->about(RdfVocabulary::NS_STATEMENT, |
|
149 | + $this->cleanupGuid($checkResult->getContextCursor()->getStatementGuid())) |
|
150 | + ->say(RdfVocabulary::NS_ONTOLOGY, 'hasViolationForConstraint') |
|
151 | + ->is(RdfVocabulary::NS_STATEMENT, |
|
152 | + $this->cleanupGuid($checkResult->getConstraint()->getConstraintId())); |
|
153 | 153 | } |
154 | 154 | $writer->finish(); |
155 | 155 | echo $writer->drain(); |
@@ -80,23 +80,23 @@ discard block |
||
80 | 80 | * @return bool |
81 | 81 | * @throws OverflowException if $entitiesChecked exceeds the configured limit |
82 | 82 | */ |
83 | - private function isSubclassOf( EntityId $comparativeClass, array $classesToCheck, &$entitiesChecked = 0 ) { |
|
84 | - $maxEntities = $this->config->get( 'WBQualityConstraintsTypeCheckMaxEntities' ); |
|
83 | + private function isSubclassOf(EntityId $comparativeClass, array $classesToCheck, &$entitiesChecked = 0) { |
|
84 | + $maxEntities = $this->config->get('WBQualityConstraintsTypeCheckMaxEntities'); |
|
85 | 85 | if ( ++$entitiesChecked > $maxEntities ) { |
86 | - throw new OverflowException( 'Too many entities to check' ); |
|
86 | + throw new OverflowException('Too many entities to check'); |
|
87 | 87 | } |
88 | 88 | |
89 | - $item = $this->entityLookup->getEntity( $comparativeClass ); |
|
90 | - if ( !( $item instanceof StatementListProvider ) ) { |
|
89 | + $item = $this->entityLookup->getEntity($comparativeClass); |
|
90 | + if (!($item instanceof StatementListProvider)) { |
|
91 | 91 | return false; // lookup failed, probably because item doesn't exist |
92 | 92 | } |
93 | 93 | |
94 | - $subclassId = $this->config->get( 'WBQualityConstraintsSubclassOfId' ); |
|
94 | + $subclassId = $this->config->get('WBQualityConstraintsSubclassOfId'); |
|
95 | 95 | /** @var Statement $statement */ |
96 | - foreach ( $item->getStatements()->getByPropertyId( new PropertyId( $subclassId ) ) as $statement ) { |
|
96 | + foreach ($item->getStatements()->getByPropertyId(new PropertyId($subclassId)) as $statement) { |
|
97 | 97 | $mainSnak = $statement->getMainSnak(); |
98 | 98 | |
99 | - if ( !( $this->hasCorrectType( $mainSnak ) ) ) { |
|
99 | + if (!($this->hasCorrectType($mainSnak))) { |
|
100 | 100 | continue; |
101 | 101 | } |
102 | 102 | /** @var PropertyValueSnak $mainSnak */ |
@@ -105,11 +105,11 @@ discard block |
||
105 | 105 | $dataValue = $mainSnak->getDataValue(); |
106 | 106 | $comparativeClass = $dataValue->getEntityId(); |
107 | 107 | |
108 | - if ( in_array( $comparativeClass->getSerialization(), $classesToCheck ) ) { |
|
108 | + if (in_array($comparativeClass->getSerialization(), $classesToCheck)) { |
|
109 | 109 | return true; |
110 | 110 | } |
111 | 111 | |
112 | - if ( $this->isSubclassOf( $comparativeClass, $classesToCheck, $entitiesChecked ) ) { |
|
112 | + if ($this->isSubclassOf($comparativeClass, $classesToCheck, $entitiesChecked)) { |
|
113 | 113 | return true; |
114 | 114 | } |
115 | 115 | } |
@@ -130,48 +130,48 @@ discard block |
||
130 | 130 | * @return CachedBool |
131 | 131 | * @throws SparqlHelperException if SPARQL is used and the query times out or some other error occurs |
132 | 132 | */ |
133 | - public function isSubclassOfWithSparqlFallback( EntityId $comparativeClass, array $classesToCheck ) { |
|
133 | + public function isSubclassOfWithSparqlFallback(EntityId $comparativeClass, array $classesToCheck) { |
|
134 | 134 | try { |
135 | 135 | $entitiesChecked = 0; |
136 | - $start1 = microtime( true ); |
|
137 | - $isSubclass = $this->isSubclassOf( $comparativeClass, $classesToCheck, $entitiesChecked ); |
|
138 | - $end1 = microtime( true ); |
|
136 | + $start1 = microtime(true); |
|
137 | + $isSubclass = $this->isSubclassOf($comparativeClass, $classesToCheck, $entitiesChecked); |
|
138 | + $end1 = microtime(true); |
|
139 | 139 | $this->dataFactory->timing( |
140 | 140 | 'wikibase.quality.constraints.type.php.success.timing', |
141 | - ( $end1 - $start1 ) * 1000 |
|
141 | + ($end1 - $start1) * 1000 |
|
142 | 142 | ); |
143 | 143 | $this->dataFactory->timing( // not really a timing, but works like one (we want percentiles etc.) |
144 | 144 | 'wikibase.quality.constraints.type.php.success.entities', |
145 | 145 | $entitiesChecked |
146 | 146 | ); |
147 | 147 | |
148 | - return new CachedBool( $isSubclass, Metadata::blank() ); |
|
149 | - } catch ( OverflowException $e ) { |
|
150 | - $end1 = microtime( true ); |
|
148 | + return new CachedBool($isSubclass, Metadata::blank()); |
|
149 | + } catch (OverflowException $e) { |
|
150 | + $end1 = microtime(true); |
|
151 | 151 | $this->dataFactory->timing( |
152 | 152 | 'wikibase.quality.constraints.type.php.overflow.timing', |
153 | - ( $end1 - $start1 ) * 1000 |
|
153 | + ($end1 - $start1) * 1000 |
|
154 | 154 | ); |
155 | 155 | |
156 | - if ( !( $this->sparqlHelper instanceof DummySparqlHelper ) ) { |
|
156 | + if (!($this->sparqlHelper instanceof DummySparqlHelper)) { |
|
157 | 157 | $this->dataFactory->increment( |
158 | 158 | 'wikibase.quality.constraints.sparql.typeFallback' |
159 | 159 | ); |
160 | 160 | |
161 | - $start2 = microtime( true ); |
|
161 | + $start2 = microtime(true); |
|
162 | 162 | $hasType = $this->sparqlHelper->hasType( |
163 | 163 | $comparativeClass->getSerialization(), |
164 | 164 | $classesToCheck |
165 | 165 | ); |
166 | - $end2 = microtime( true ); |
|
166 | + $end2 = microtime(true); |
|
167 | 167 | $this->dataFactory->timing( |
168 | 168 | 'wikibase.quality.constraints.type.sparql.success.timing', |
169 | - ( $end2 - $start2 ) * 1000 |
|
169 | + ($end2 - $start2) * 1000 |
|
170 | 170 | ); |
171 | 171 | |
172 | 172 | return $hasType; |
173 | 173 | } else { |
174 | - return new CachedBool( false, Metadata::blank() ); |
|
174 | + return new CachedBool(false, Metadata::blank()); |
|
175 | 175 | } |
176 | 176 | } |
177 | 177 | } |
@@ -189,13 +189,13 @@ discard block |
||
189 | 189 | * @return CachedBool |
190 | 190 | * @throws SparqlHelperException if SPARQL is used and the query times out or some other error occurs |
191 | 191 | */ |
192 | - public function hasClassInRelation( StatementList $statements, array $relationIds, array $classesToCheck ) { |
|
192 | + public function hasClassInRelation(StatementList $statements, array $relationIds, array $classesToCheck) { |
|
193 | 193 | $metadatas = []; |
194 | 194 | |
195 | - foreach ( $this->getStatementsByPropertyIds( $statements, $relationIds ) as $statement ) { |
|
195 | + foreach ($this->getStatementsByPropertyIds($statements, $relationIds) as $statement) { |
|
196 | 196 | $mainSnak = $statement->getMainSnak(); |
197 | 197 | |
198 | - if ( !$this->hasCorrectType( $mainSnak ) ) { |
|
198 | + if (!$this->hasCorrectType($mainSnak)) { |
|
199 | 199 | continue; |
200 | 200 | } |
201 | 201 | /** @var PropertyValueSnak $mainSnak */ |
@@ -204,28 +204,28 @@ discard block |
||
204 | 204 | $dataValue = $mainSnak->getDataValue(); |
205 | 205 | $comparativeClass = $dataValue->getEntityId(); |
206 | 206 | |
207 | - if ( in_array( $comparativeClass->getSerialization(), $classesToCheck ) ) { |
|
207 | + if (in_array($comparativeClass->getSerialization(), $classesToCheck)) { |
|
208 | 208 | // discard $metadatas, we know this is fresh |
209 | - return new CachedBool( true, Metadata::blank() ); |
|
209 | + return new CachedBool(true, Metadata::blank()); |
|
210 | 210 | } |
211 | 211 | |
212 | - $result = $this->isSubclassOfWithSparqlFallback( $comparativeClass, $classesToCheck ); |
|
212 | + $result = $this->isSubclassOfWithSparqlFallback($comparativeClass, $classesToCheck); |
|
213 | 213 | $metadatas[] = $result->getMetadata(); |
214 | - if ( $result->getBool() ) { |
|
214 | + if ($result->getBool()) { |
|
215 | 215 | return new CachedBool( |
216 | 216 | true, |
217 | - Metadata::merge( $metadatas ) |
|
217 | + Metadata::merge($metadatas) |
|
218 | 218 | ); |
219 | 219 | } |
220 | 220 | } |
221 | 221 | |
222 | 222 | return new CachedBool( |
223 | 223 | false, |
224 | - Metadata::merge( $metadatas ) |
|
224 | + Metadata::merge($metadatas) |
|
225 | 225 | ); |
226 | 226 | } |
227 | 227 | |
228 | - private function hasCorrectType( Snak $mainSnak ) { |
|
228 | + private function hasCorrectType(Snak $mainSnak) { |
|
229 | 229 | return $mainSnak instanceof PropertyValueSnak |
230 | 230 | && $mainSnak->getDataValue()->getType() === 'wikibase-entityid'; |
231 | 231 | } |
@@ -242,12 +242,12 @@ discard block |
||
242 | 242 | ) { |
243 | 243 | $statementArrays = []; |
244 | 244 | |
245 | - foreach ( $propertyIdSerializations as $propertyIdSerialization ) { |
|
246 | - $propertyId = new PropertyId( $propertyIdSerialization ); |
|
247 | - $statementArrays[] = $statements->getByPropertyId( $propertyId )->toArray(); |
|
245 | + foreach ($propertyIdSerializations as $propertyIdSerialization) { |
|
246 | + $propertyId = new PropertyId($propertyIdSerialization); |
|
247 | + $statementArrays[] = $statements->getByPropertyId($propertyId)->toArray(); |
|
248 | 248 | } |
249 | 249 | |
250 | - return call_user_func_array( 'array_merge', $statementArrays ); |
|
250 | + return call_user_func_array('array_merge', $statementArrays); |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
@@ -259,10 +259,10 @@ discard block |
||
259 | 259 | * |
260 | 260 | * @return ViolationMessage |
261 | 261 | */ |
262 | - public function getViolationMessage( PropertyId $propertyId, EntityId $entityId, array $classes, $checker, $relation ) { |
|
262 | + public function getViolationMessage(PropertyId $propertyId, EntityId $entityId, array $classes, $checker, $relation) { |
|
263 | 263 | $classes = array_map( |
264 | - function( $itemIdSerialization ) { |
|
265 | - return new ItemId( $itemIdSerialization ); |
|
264 | + function($itemIdSerialization) { |
|
265 | + return new ItemId($itemIdSerialization); |
|
266 | 266 | }, |
267 | 267 | $classes |
268 | 268 | ); |
@@ -274,10 +274,10 @@ discard block |
||
274 | 274 | // wbqc-violation-message-valueType-instance |
275 | 275 | // wbqc-violation-message-valueType-subclass |
276 | 276 | // wbqc-violation-message-valueType-instanceOrSubclass |
277 | - return ( new ViolationMessage( 'wbqc-violation-message-' . $checker . '-' . $relation ) ) |
|
278 | - ->withEntityId( $propertyId, Role::CONSTRAINT_PROPERTY ) |
|
279 | - ->withEntityId( $entityId, Role::SUBJECT ) |
|
280 | - ->withEntityIdList( $classes, Role::OBJECT ); |
|
277 | + return (new ViolationMessage('wbqc-violation-message-'.$checker.'-'.$relation)) |
|
278 | + ->withEntityId($propertyId, Role::CONSTRAINT_PROPERTY) |
|
279 | + ->withEntityId($entityId, Role::SUBJECT) |
|
280 | + ->withEntityIdList($classes, Role::OBJECT); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | } |
@@ -7,13 +7,13 @@ |
||
7 | 7 | use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ExceptionIgnoringEntityLookup; |
8 | 8 | |
9 | 9 | return [ |
10 | - WikibaseServices::ENTITY_LOOKUP => function( MediaWikiServices $services ) { |
|
10 | + WikibaseServices::ENTITY_LOOKUP => function(MediaWikiServices $services) { |
|
11 | 11 | return new ExceptionIgnoringEntityLookup( |
12 | 12 | WikibaseRepo::getDefaultInstance()->getEntityLookup() |
13 | 13 | ); |
14 | 14 | }, |
15 | 15 | |
16 | - WikibaseServices::PROPERTY_DATA_TYPE_LOOKUP => function( MediaWikiServices $services ) { |
|
16 | + WikibaseServices::PROPERTY_DATA_TYPE_LOOKUP => function(MediaWikiServices $services) { |
|
17 | 17 | return WikibaseRepo::getDefaultInstance()->getPropertyDataTypeLookup(); |
18 | 18 | }, |
19 | 19 | ]; |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | private $lookup; |
23 | 23 | |
24 | - public function __construct( EntityLookup $lookup ) { |
|
24 | + public function __construct(EntityLookup $lookup) { |
|
25 | 25 | $this->lookup = $lookup; |
26 | 26 | } |
27 | 27 | |
@@ -32,10 +32,10 @@ discard block |
||
32 | 32 | * @param EntityId $entityId |
33 | 33 | * @return EntityDocument|null |
34 | 34 | */ |
35 | - public function getEntity( EntityId $entityId ) { |
|
35 | + public function getEntity(EntityId $entityId) { |
|
36 | 36 | try { |
37 | - return $this->lookup->getEntity( $entityId ); |
|
38 | - } catch ( EntityLookupException $exception ) { |
|
37 | + return $this->lookup->getEntity($entityId); |
|
38 | + } catch (EntityLookupException $exception) { |
|
39 | 39 | return null; |
40 | 40 | } |
41 | 41 | } |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | * @param EntityId $entityId |
49 | 49 | * @return bool |
50 | 50 | */ |
51 | - public function hasEntity( EntityId $entityId ) { |
|
52 | - return $this->lookup->hasEntity( $entityId ); |
|
51 | + public function hasEntity(EntityId $entityId) { |
|
52 | + return $this->lookup->hasEntity($entityId); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | } |
@@ -15,10 +15,10 @@ discard block |
||
15 | 15 | use Wikibase\Repo\WikibaseRepo; |
16 | 16 | |
17 | 17 | // @codeCoverageIgnoreStart |
18 | -$basePath = getenv( "MW_INSTALL_PATH" ) !== false |
|
19 | - ? getenv( "MW_INSTALL_PATH" ) : __DIR__ . "/../../.."; |
|
18 | +$basePath = getenv("MW_INSTALL_PATH") !== false |
|
19 | + ? getenv("MW_INSTALL_PATH") : __DIR__."/../../.."; |
|
20 | 20 | |
21 | -require_once $basePath . "/maintenance/Maintenance.php"; |
|
21 | +require_once $basePath."/maintenance/Maintenance.php"; |
|
22 | 22 | // @codeCoverageIgnoreEnd |
23 | 23 | |
24 | 24 | /** |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | parent::__construct(); |
53 | 53 | |
54 | 54 | $this->addDescription( |
55 | - 'Import entities needed for constraint checks ' . |
|
55 | + 'Import entities needed for constraint checks '. |
|
56 | 56 | 'from Wikidata into the local repository.' |
57 | 57 | ); |
58 | 58 | $this->addOption( |
59 | 59 | 'config-format', |
60 | - 'The format in which the resulting configuration will be omitted: ' . |
|
61 | - '"globals" for directly settings global variables, suitable for inclusion in LocalSettings.php (default), ' . |
|
60 | + 'The format in which the resulting configuration will be omitted: '. |
|
61 | + '"globals" for directly settings global variables, suitable for inclusion in LocalSettings.php (default), '. |
|
62 | 62 | 'or "wgConf" for printing parts of arrays suitable for inclusion in $wgConf->settings.' |
63 | 63 | ); |
64 | 64 | $this->addOption( |
@@ -75,8 +75,8 @@ discard block |
||
75 | 75 | $this->entitySerializer = $repo->getAllTypesEntitySerializer(); |
76 | 76 | $this->entityDeserializer = $repo->getInternalFormatEntityDeserializer(); |
77 | 77 | $this->entityStore = $repo->getEntityStore(); |
78 | - if ( !$this->getOption( 'dry-run', false ) ) { |
|
79 | - $this->user = User::newSystemUser( 'WikibaseQualityConstraints importer' ); |
|
78 | + if (!$this->getOption('dry-run', false)) { |
|
79 | + $this->user = User::newSystemUser('WikibaseQualityConstraints importer'); |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | |
@@ -85,20 +85,20 @@ discard block |
||
85 | 85 | |
86 | 86 | $configUpdates = []; |
87 | 87 | |
88 | - $extensionJsonFile = __DIR__ . '/../extension.json'; |
|
89 | - $extensionJsonText = file_get_contents( $extensionJsonFile ); |
|
90 | - $extensionJson = json_decode( $extensionJsonText, /* assoc = */ true ); |
|
91 | - $wikidataEntityIds = $this->getEntitiesToImport( $extensionJson['config'], $this->getConfig() ); |
|
88 | + $extensionJsonFile = __DIR__.'/../extension.json'; |
|
89 | + $extensionJsonText = file_get_contents($extensionJsonFile); |
|
90 | + $extensionJson = json_decode($extensionJsonText, /* assoc = */ true); |
|
91 | + $wikidataEntityIds = $this->getEntitiesToImport($extensionJson['config'], $this->getConfig()); |
|
92 | 92 | |
93 | - foreach ( $wikidataEntityIds as $key => $wikidataEntityId ) { |
|
94 | - $localEntityId = $this->importEntityFromWikidata( $wikidataEntityId ); |
|
93 | + foreach ($wikidataEntityIds as $key => $wikidataEntityId) { |
|
94 | + $localEntityId = $this->importEntityFromWikidata($wikidataEntityId); |
|
95 | 95 | $configUpdates[$key] = [ |
96 | 96 | 'wikidata' => $wikidataEntityId, |
97 | 97 | 'local' => $localEntityId, |
98 | 98 | ]; |
99 | 99 | } |
100 | 100 | |
101 | - $this->outputConfigUpdates( $configUpdates ); |
|
101 | + $this->outputConfigUpdates($configUpdates); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -106,18 +106,18 @@ discard block |
||
106 | 106 | * @param Config $wikiConfig |
107 | 107 | * @return string[] |
108 | 108 | */ |
109 | - private function getEntitiesToImport( array $extensionJsonConfig, Config $wikiConfig ) { |
|
109 | + private function getEntitiesToImport(array $extensionJsonConfig, Config $wikiConfig) { |
|
110 | 110 | $wikidataEntityIds = []; |
111 | 111 | |
112 | - foreach ( $extensionJsonConfig as $key => $value ) { |
|
113 | - if ( !preg_match( '/Id$/', $key ) ) { |
|
112 | + foreach ($extensionJsonConfig as $key => $value) { |
|
113 | + if (!preg_match('/Id$/', $key)) { |
|
114 | 114 | continue; |
115 | 115 | } |
116 | 116 | |
117 | 117 | $wikidataEntityId = $value['value']; |
118 | - $localEntityId = $wikiConfig->get( $key ); |
|
118 | + $localEntityId = $wikiConfig->get($key); |
|
119 | 119 | |
120 | - if ( $localEntityId === $wikidataEntityId ) { |
|
120 | + if ($localEntityId === $wikidataEntityId) { |
|
121 | 121 | $wikidataEntityIds[$key] = $wikidataEntityId; |
122 | 122 | } |
123 | 123 | } |
@@ -129,10 +129,10 @@ discard block |
||
129 | 129 | * @param string $wikidataEntityId |
130 | 130 | * @return string local entity ID |
131 | 131 | */ |
132 | - private function importEntityFromWikidata( $wikidataEntityId ) { |
|
132 | + private function importEntityFromWikidata($wikidataEntityId) { |
|
133 | 133 | $wikidataEntityUrl = "https://www.wikidata.org/wiki/Special:EntityData/$wikidataEntityId.json"; |
134 | - $wikidataEntitiesJson = file_get_contents( $wikidataEntityUrl ); |
|
135 | - return $this->importEntityFromJson( $wikidataEntityId, $wikidataEntitiesJson ); |
|
134 | + $wikidataEntitiesJson = file_get_contents($wikidataEntityUrl); |
|
135 | + return $this->importEntityFromJson($wikidataEntityId, $wikidataEntitiesJson); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -140,23 +140,23 @@ discard block |
||
140 | 140 | * @param string $wikidataEntitiesJson |
141 | 141 | * @return string local entity ID |
142 | 142 | */ |
143 | - private function importEntityFromJson( $wikidataEntityId, $wikidataEntitiesJson ) { |
|
144 | - $wikidataEntityArray = json_decode( $wikidataEntitiesJson, true )['entities'][$wikidataEntityId]; |
|
145 | - $wikidataEntity = $this->entityDeserializer->deserialize( $wikidataEntityArray ); |
|
143 | + private function importEntityFromJson($wikidataEntityId, $wikidataEntitiesJson) { |
|
144 | + $wikidataEntityArray = json_decode($wikidataEntitiesJson, true)['entities'][$wikidataEntityId]; |
|
145 | + $wikidataEntity = $this->entityDeserializer->deserialize($wikidataEntityArray); |
|
146 | 146 | |
147 | - $wikidataEntity->setId( null ); |
|
147 | + $wikidataEntity->setId(null); |
|
148 | 148 | |
149 | - if ( $wikidataEntity instanceof StatementListProvider ) { |
|
149 | + if ($wikidataEntity instanceof StatementListProvider) { |
|
150 | 150 | $wikidataEntity->getStatements()->clear(); |
151 | 151 | } |
152 | 152 | |
153 | - if ( $wikidataEntity instanceof Item ) { |
|
154 | - $wikidataEntity->setSiteLinkList( new SiteLinkList() ); |
|
153 | + if ($wikidataEntity instanceof Item) { |
|
154 | + $wikidataEntity->setSiteLinkList(new SiteLinkList()); |
|
155 | 155 | } |
156 | 156 | |
157 | - if ( $this->getOption( 'dry-run', false ) ) { |
|
158 | - $wikidataEntityJson = json_encode( $this->entitySerializer->serialize( $wikidataEntity ) ); |
|
159 | - $this->output( $wikidataEntityJson . "\n" ); |
|
157 | + if ($this->getOption('dry-run', false)) { |
|
158 | + $wikidataEntityJson = json_encode($this->entitySerializer->serialize($wikidataEntity)); |
|
159 | + $this->output($wikidataEntityJson."\n"); |
|
160 | 160 | return "-$wikidataEntityId"; |
161 | 161 | } |
162 | 162 | |
@@ -169,54 +169,54 @@ discard block |
||
169 | 169 | )->getEntity(); |
170 | 170 | |
171 | 171 | return $localEntity->getId()->getSerialization(); |
172 | - } catch ( StorageException $storageException ) { |
|
173 | - return $this->storageExceptionToEntityId( $storageException ); |
|
172 | + } catch (StorageException $storageException) { |
|
173 | + return $this->storageExceptionToEntityId($storageException); |
|
174 | 174 | } |
175 | 175 | } |
176 | 176 | |
177 | - private function storageExceptionToEntityId( StorageException $storageException ) { |
|
177 | + private function storageExceptionToEntityId(StorageException $storageException) { |
|
178 | 178 | $message = $storageException->getMessage(); |
179 | 179 | // example messages: |
180 | 180 | // * Item [[Item:Q475|Q475]] already has label "as references" associated with language code en, using the same description text. |
181 | 181 | // * Item [[Q475]] already has label "as references" associated with language code en, using the same description text. |
182 | 182 | // * Property [[Property:P694|P694]] already has label "instance of" associated with language code en. |
183 | 183 | $pattern = '/[[|]([^][|]*)]] already has label .* associated with language code/'; |
184 | - if ( preg_match( $pattern, $message, $matches ) ) { |
|
184 | + if (preg_match($pattern, $message, $matches)) { |
|
185 | 185 | return $matches[1]; |
186 | 186 | } else { |
187 | 187 | throw $storageException; |
188 | 188 | } |
189 | 189 | } |
190 | 190 | |
191 | - private function outputConfigUpdates( array $configUpdates ) { |
|
192 | - $configFormat = $this->getOption( 'config-format', 'globals' ); |
|
193 | - switch ( $configFormat ) { |
|
191 | + private function outputConfigUpdates(array $configUpdates) { |
|
192 | + $configFormat = $this->getOption('config-format', 'globals'); |
|
193 | + switch ($configFormat) { |
|
194 | 194 | case 'globals': |
195 | - $this->outputConfigUpdatesGlobals( $configUpdates ); |
|
195 | + $this->outputConfigUpdatesGlobals($configUpdates); |
|
196 | 196 | break; |
197 | 197 | case 'wgConf': |
198 | - $this->outputConfigUpdatesWgConf( $configUpdates ); |
|
198 | + $this->outputConfigUpdatesWgConf($configUpdates); |
|
199 | 199 | break; |
200 | 200 | default: |
201 | - $this->error( "Invalid config format \"$configFormat\", using \"globals\"" ); |
|
202 | - $this->outputConfigUpdatesGlobals( $configUpdates ); |
|
201 | + $this->error("Invalid config format \"$configFormat\", using \"globals\""); |
|
202 | + $this->outputConfigUpdatesGlobals($configUpdates); |
|
203 | 203 | break; |
204 | 204 | } |
205 | 205 | } |
206 | 206 | |
207 | - private function outputConfigUpdatesGlobals( array $configUpdates ) { |
|
208 | - foreach ( $configUpdates as $key => $value ) { |
|
209 | - $localValueCode = var_export( $value['local'], true ); |
|
210 | - $this->output( "\$wg$key = $localValueCode;\n" ); |
|
207 | + private function outputConfigUpdatesGlobals(array $configUpdates) { |
|
208 | + foreach ($configUpdates as $key => $value) { |
|
209 | + $localValueCode = var_export($value['local'], true); |
|
210 | + $this->output("\$wg$key = $localValueCode;\n"); |
|
211 | 211 | } |
212 | 212 | } |
213 | 213 | |
214 | - private function outputConfigUpdatesWgConf( array $configUpdates ) { |
|
215 | - foreach ( $configUpdates as $key => $value ) { |
|
216 | - $keyCode = var_export( "wg$key", true ); |
|
217 | - $wikidataValueCode = var_export( $value['wikidata'], true ); |
|
218 | - $localValueCode = var_export( $value['local'], true ); |
|
219 | - $wikiIdCode = var_export( wfWikiID(), true ); |
|
214 | + private function outputConfigUpdatesWgConf(array $configUpdates) { |
|
215 | + foreach ($configUpdates as $key => $value) { |
|
216 | + $keyCode = var_export("wg$key", true); |
|
217 | + $wikidataValueCode = var_export($value['wikidata'], true); |
|
218 | + $localValueCode = var_export($value['local'], true); |
|
219 | + $wikiIdCode = var_export(wfWikiID(), true); |
|
220 | 220 | $block = <<< EOF |
221 | 221 | $keyCode => [ |
222 | 222 | 'default' => $wikidataValueCode, |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | |
227 | 227 | EOF; |
228 | - $this->output( $block ); |
|
228 | + $this->output($block); |
|
229 | 229 | } |
230 | 230 | } |
231 | 231 |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | /** |
33 | 33 | * @param array $headers |
34 | 34 | */ |
35 | - public function __construct( array $headers ) { |
|
36 | - foreach ( $headers as $header ) { |
|
37 | - $this->addHeader( $header ); |
|
35 | + public function __construct(array $headers) { |
|
36 | + foreach ($headers as $header) { |
|
37 | + $this->addHeader($header); |
|
38 | 38 | } |
39 | 39 | } |
40 | 40 | |
@@ -43,16 +43,16 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @throws InvalidArgumentException |
45 | 45 | */ |
46 | - private function addHeader( $header ) { |
|
47 | - Assert::parameterType( 'string|' . HtmlTableHeaderBuilder::class, $header, '$header' ); |
|
46 | + private function addHeader($header) { |
|
47 | + Assert::parameterType('string|'.HtmlTableHeaderBuilder::class, $header, '$header'); |
|
48 | 48 | |
49 | - if ( is_string( $header ) ) { |
|
50 | - $header = new HtmlTableHeaderBuilder( $header ); |
|
49 | + if (is_string($header)) { |
|
50 | + $header = new HtmlTableHeaderBuilder($header); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | $this->headers[] = $header; |
54 | 54 | |
55 | - if ( $header->getIsSortable() ) { |
|
55 | + if ($header->getIsSortable()) { |
|
56 | 56 | $this->isSortable = true; |
57 | 57 | } |
58 | 58 | } |
@@ -85,12 +85,12 @@ discard block |
||
85 | 85 | * |
86 | 86 | * @throws InvalidArgumentException |
87 | 87 | */ |
88 | - public function appendRow( array $cells ) { |
|
89 | - foreach ( $cells as $key => $cell ) { |
|
90 | - if ( is_string( $cell ) ) { |
|
91 | - $cells[$key] = new HtmlTableCellBuilder( $cell ); |
|
92 | - } elseif ( !( $cell instanceof HtmlTableCellBuilder ) ) { |
|
93 | - throw new InvalidArgumentException( '$cells must be array of HtmlTableCell objects.' ); |
|
88 | + public function appendRow(array $cells) { |
|
89 | + foreach ($cells as $key => $cell) { |
|
90 | + if (is_string($cell)) { |
|
91 | + $cells[$key] = new HtmlTableCellBuilder($cell); |
|
92 | + } elseif (!($cell instanceof HtmlTableCellBuilder)) { |
|
93 | + throw new InvalidArgumentException('$cells must be array of HtmlTableCell objects.'); |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 | |
@@ -104,13 +104,13 @@ discard block |
||
104 | 104 | * |
105 | 105 | * @throws InvalidArgumentException |
106 | 106 | */ |
107 | - public function appendRows( array $rows ) { |
|
108 | - foreach ( $rows as $cells ) { |
|
109 | - if ( !is_array( $cells ) ) { |
|
110 | - throw new InvalidArgumentException( '$rows must be array of arrays of HtmlTableCell objects.' ); |
|
107 | + public function appendRows(array $rows) { |
|
108 | + foreach ($rows as $cells) { |
|
109 | + if (!is_array($cells)) { |
|
110 | + throw new InvalidArgumentException('$rows must be array of arrays of HtmlTableCell objects.'); |
|
111 | 111 | } |
112 | 112 | |
113 | - $this->appendRow( $cells ); |
|
113 | + $this->appendRow($cells); |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | |
@@ -122,38 +122,38 @@ discard block |
||
122 | 122 | public function toHtml() { |
123 | 123 | // Open table |
124 | 124 | $tableClasses = 'wikitable'; |
125 | - if ( $this->isSortable ) { |
|
125 | + if ($this->isSortable) { |
|
126 | 126 | $tableClasses .= ' sortable'; |
127 | 127 | } |
128 | - $html = Html::openElement( 'table', [ 'class' => $tableClasses ] ); |
|
128 | + $html = Html::openElement('table', ['class' => $tableClasses]); |
|
129 | 129 | |
130 | 130 | // Write headers |
131 | - $html .= Html::openElement( 'thead' ); |
|
132 | - $html .= Html::openElement( 'tr' ); |
|
133 | - foreach ( $this->headers as $header ) { |
|
131 | + $html .= Html::openElement('thead'); |
|
132 | + $html .= Html::openElement('tr'); |
|
133 | + foreach ($this->headers as $header) { |
|
134 | 134 | $html .= $header->toHtml(); |
135 | 135 | } |
136 | - $html .= Html::closeElement( 'tr' ); |
|
137 | - $html .= Html::closeElement( 'thead' ); |
|
138 | - $html .= Html::openElement( 'tbody' ); |
|
136 | + $html .= Html::closeElement('tr'); |
|
137 | + $html .= Html::closeElement('thead'); |
|
138 | + $html .= Html::openElement('tbody'); |
|
139 | 139 | |
140 | 140 | // Write rows |
141 | - foreach ( $this->rows as $row ) { |
|
142 | - $html .= Html::openElement( 'tr' ); |
|
141 | + foreach ($this->rows as $row) { |
|
142 | + $html .= Html::openElement('tr'); |
|
143 | 143 | |
144 | 144 | /** |
145 | 145 | * @var HtmlTableCellBuilder $cell |
146 | 146 | */ |
147 | - foreach ( $row as $cell ) { |
|
147 | + foreach ($row as $cell) { |
|
148 | 148 | $html .= $cell->toHtml(); |
149 | 149 | } |
150 | 150 | |
151 | - $html .= Html::closeElement( 'tr' ); |
|
151 | + $html .= Html::closeElement('tr'); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | // Close table |
155 | - $html .= Html::closeElement( 'tbody' ); |
|
156 | - $html .= Html::closeElement( 'table' ); |
|
155 | + $html .= Html::closeElement('tbody'); |
|
156 | + $html .= Html::closeElement('table'); |
|
157 | 157 | |
158 | 158 | return $html; |
159 | 159 | } |
@@ -162,19 +162,19 @@ discard block |
||
162 | 162 | $this->loggingHelper = $loggingHelper; |
163 | 163 | $this->defaultUserAgent = $defaultUserAgent; |
164 | 164 | $this->requestFactory = $requestFactory; |
165 | - $this->entityPrefix = $rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY ); |
|
165 | + $this->entityPrefix = $rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY); |
|
166 | 166 | $this->prefixes = <<<EOT |
167 | -PREFIX wd: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY )}> |
|
168 | -PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}> |
|
169 | -PREFIX wdt: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_DIRECT_CLAIM )}> |
|
170 | -PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}> |
|
171 | -PREFIX p: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM )}> |
|
172 | -PREFIX ps: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM_STATEMENT )}> |
|
173 | -PREFIX pq: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER )}> |
|
174 | -PREFIX pqv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER_VALUE )}> |
|
175 | -PREFIX pr: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE )}> |
|
176 | -PREFIX prv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE_VALUE )}> |
|
177 | -PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ONTOLOGY )}> |
|
167 | +PREFIX wd: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY)}> |
|
168 | +PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}> |
|
169 | +PREFIX wdt: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_DIRECT_CLAIM)}> |
|
170 | +PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}> |
|
171 | +PREFIX p: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM)}> |
|
172 | +PREFIX ps: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM_STATEMENT)}> |
|
173 | +PREFIX pq: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER)}> |
|
174 | +PREFIX pqv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER_VALUE)}> |
|
175 | +PREFIX pr: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE)}> |
|
176 | +PREFIX prv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE_VALUE)}> |
|
177 | +PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ONTOLOGY)}> |
|
178 | 178 | EOT; |
179 | 179 | } |
180 | 180 | |
@@ -185,22 +185,21 @@ discard block |
||
185 | 185 | * @return CachedBool |
186 | 186 | * @throws SparqlHelperException if the query times out or some other error occurs |
187 | 187 | */ |
188 | - public function hasType( $id, array $classes ) { |
|
189 | - $subclassOfId = $this->config->get( 'WBQualityConstraintsSubclassOfId' ); |
|
188 | + public function hasType($id, array $classes) { |
|
189 | + $subclassOfId = $this->config->get('WBQualityConstraintsSubclassOfId'); |
|
190 | 190 | // TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually |
191 | - $gearingHint = $this->config->get( 'WBQualityConstraintsSparqlHasWikibaseSupport' ) ? |
|
192 | - ' hint:Prior hint:gearing "forward".' : |
|
193 | - ''; |
|
191 | + $gearingHint = $this->config->get('WBQualityConstraintsSparqlHasWikibaseSupport') ? |
|
192 | + ' hint:Prior hint:gearing "forward".' : ''; |
|
194 | 193 | |
195 | 194 | $metadatas = []; |
196 | 195 | |
197 | - foreach ( array_chunk( $classes, 20 ) as $classesChunk ) { |
|
198 | - $classesValues = implode( ' ', array_map( |
|
199 | - function( $class ) { |
|
200 | - return 'wd:' . $class; |
|
196 | + foreach (array_chunk($classes, 20) as $classesChunk) { |
|
197 | + $classesValues = implode(' ', array_map( |
|
198 | + function($class) { |
|
199 | + return 'wd:'.$class; |
|
201 | 200 | }, |
202 | 201 | $classesChunk |
203 | - ) ); |
|
202 | + )); |
|
204 | 203 | |
205 | 204 | $query = <<<EOF |
206 | 205 | ASK { |
@@ -210,19 +209,19 @@ discard block |
||
210 | 209 | } |
211 | 210 | EOF; |
212 | 211 | |
213 | - $result = $this->runQuery( $query ); |
|
212 | + $result = $this->runQuery($query); |
|
214 | 213 | $metadatas[] = $result->getMetadata(); |
215 | - if ( $result->getArray()['boolean'] ) { |
|
214 | + if ($result->getArray()['boolean']) { |
|
216 | 215 | return new CachedBool( |
217 | 216 | true, |
218 | - Metadata::merge( $metadatas ) |
|
217 | + Metadata::merge($metadatas) |
|
219 | 218 | ); |
220 | 219 | } |
221 | 220 | } |
222 | 221 | |
223 | 222 | return new CachedBool( |
224 | 223 | false, |
225 | - Metadata::merge( $metadatas ) |
|
224 | + Metadata::merge($metadatas) |
|
226 | 225 | ); |
227 | 226 | } |
228 | 227 | |
@@ -238,10 +237,10 @@ discard block |
||
238 | 237 | $ignoreDeprecatedStatements |
239 | 238 | ) { |
240 | 239 | $pid = $statement->getPropertyId()->serialize(); |
241 | - $guid = str_replace( '$', '-', $statement->getGuid() ); |
|
240 | + $guid = str_replace('$', '-', $statement->getGuid()); |
|
242 | 241 | |
243 | 242 | $deprecatedFilter = ''; |
244 | - if ( $ignoreDeprecatedStatements ) { |
|
243 | + if ($ignoreDeprecatedStatements) { |
|
245 | 244 | $deprecatedFilter = 'MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }'; |
246 | 245 | } |
247 | 246 | |
@@ -260,9 +259,9 @@ discard block |
||
260 | 259 | LIMIT 10 |
261 | 260 | EOF; |
262 | 261 | |
263 | - $result = $this->runQuery( $query ); |
|
262 | + $result = $this->runQuery($query); |
|
264 | 263 | |
265 | - return $this->getOtherEntities( $result ); |
|
264 | + return $this->getOtherEntities($result); |
|
266 | 265 | } |
267 | 266 | |
268 | 267 | /** |
@@ -287,16 +286,15 @@ discard block |
||
287 | 286 | $dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty( |
288 | 287 | $snak->getPropertyId() |
289 | 288 | ); |
290 | - list( $value, $isFullValue ) = $this->getRdfLiteral( $dataType, $dataValue ); |
|
291 | - if ( $isFullValue ) { |
|
289 | + list($value, $isFullValue) = $this->getRdfLiteral($dataType, $dataValue); |
|
290 | + if ($isFullValue) { |
|
292 | 291 | $prefix .= 'v'; |
293 | 292 | } |
294 | 293 | $path = $type === Context::TYPE_QUALIFIER ? |
295 | - "$prefix:$pid" : |
|
296 | - "prov:wasDerivedFrom/$prefix:$pid"; |
|
294 | + "$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid"; |
|
297 | 295 | |
298 | 296 | $deprecatedFilter = ''; |
299 | - if ( $ignoreDeprecatedStatements ) { |
|
297 | + if ($ignoreDeprecatedStatements) { |
|
300 | 298 | $deprecatedFilter = <<< EOF |
301 | 299 | MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. } |
302 | 300 | EOF; |
@@ -316,9 +314,9 @@ discard block |
||
316 | 314 | LIMIT 10 |
317 | 315 | EOF; |
318 | 316 | |
319 | - $result = $this->runQuery( $query ); |
|
317 | + $result = $this->runQuery($query); |
|
320 | 318 | |
321 | - return $this->getOtherEntities( $result ); |
|
319 | + return $this->getOtherEntities($result); |
|
322 | 320 | } |
323 | 321 | |
324 | 322 | /** |
@@ -328,8 +326,8 @@ discard block |
||
328 | 326 | * |
329 | 327 | * @return string |
330 | 328 | */ |
331 | - private function stringLiteral( $text ) { |
|
332 | - return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"'; |
|
329 | + private function stringLiteral($text) { |
|
330 | + return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"'; |
|
333 | 331 | } |
334 | 332 | |
335 | 333 | /** |
@@ -339,17 +337,17 @@ discard block |
||
339 | 337 | * |
340 | 338 | * @return CachedEntityIds |
341 | 339 | */ |
342 | - private function getOtherEntities( CachedQueryResults $results ) { |
|
343 | - return new CachedEntityIds( array_map( |
|
344 | - function ( $resultBindings ) { |
|
340 | + private function getOtherEntities(CachedQueryResults $results) { |
|
341 | + return new CachedEntityIds(array_map( |
|
342 | + function($resultBindings) { |
|
345 | 343 | $entityIRI = $resultBindings['otherEntity']['value']; |
346 | - $entityPrefixLength = strlen( $this->entityPrefix ); |
|
347 | - if ( substr( $entityIRI, 0, $entityPrefixLength ) === $this->entityPrefix ) { |
|
344 | + $entityPrefixLength = strlen($this->entityPrefix); |
|
345 | + if (substr($entityIRI, 0, $entityPrefixLength) === $this->entityPrefix) { |
|
348 | 346 | try { |
349 | 347 | return $this->entityIdParser->parse( |
350 | - substr( $entityIRI, $entityPrefixLength ) |
|
348 | + substr($entityIRI, $entityPrefixLength) |
|
351 | 349 | ); |
352 | - } catch ( EntityIdParsingException $e ) { |
|
350 | + } catch (EntityIdParsingException $e) { |
|
353 | 351 | // fall through |
354 | 352 | } |
355 | 353 | } |
@@ -357,7 +355,7 @@ discard block |
||
357 | 355 | return null; |
358 | 356 | }, |
359 | 357 | $results->getArray()['results']['bindings'] |
360 | - ), $results->getMetadata() ); |
|
358 | + ), $results->getMetadata()); |
|
361 | 359 | } |
362 | 360 | |
363 | 361 | // @codingStandardsIgnoreStart cyclomatic complexity of this function is too high |
@@ -370,47 +368,47 @@ discard block |
||
370 | 368 | * @return array the literal or IRI as a string in SPARQL syntax, |
371 | 369 | * and a boolean indicating whether it refers to a full value node or not |
372 | 370 | */ |
373 | - private function getRdfLiteral( $dataType, DataValue $dataValue ) { |
|
374 | - switch ( $dataType ) { |
|
371 | + private function getRdfLiteral($dataType, DataValue $dataValue) { |
|
372 | + switch ($dataType) { |
|
375 | 373 | case 'string': |
376 | 374 | case 'external-id': |
377 | - return [ $this->stringLiteral( $dataValue->getValue() ), false ]; |
|
375 | + return [$this->stringLiteral($dataValue->getValue()), false]; |
|
378 | 376 | case 'commonsMedia': |
379 | - $url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() ); |
|
380 | - return [ '<' . $url . '>', false ]; |
|
377 | + $url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue()); |
|
378 | + return ['<'.$url.'>', false]; |
|
381 | 379 | case 'geo-shape': |
382 | - $url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() ); |
|
383 | - return [ '<' . $url . '>', false ]; |
|
380 | + $url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue()); |
|
381 | + return ['<'.$url.'>', false]; |
|
384 | 382 | case 'tabular-data': |
385 | - $url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() ); |
|
386 | - return [ '<' . $url . '>', false ]; |
|
383 | + $url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue()); |
|
384 | + return ['<'.$url.'>', false]; |
|
387 | 385 | case 'url': |
388 | 386 | $url = $dataValue->getValue(); |
389 | - if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) { |
|
387 | + if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) { |
|
390 | 388 | // not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF) |
391 | 389 | // such an URL should never reach us, so just throw |
392 | - throw new InvalidArgumentException( 'invalid URL: ' . $url ); |
|
390 | + throw new InvalidArgumentException('invalid URL: '.$url); |
|
393 | 391 | } |
394 | - return [ '<' . $url . '>', false ]; |
|
392 | + return ['<'.$url.'>', false]; |
|
395 | 393 | case 'wikibase-item': |
396 | 394 | case 'wikibase-property': |
397 | 395 | /** @var EntityIdValue $dataValue */ |
398 | - return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ]; |
|
396 | + return ['wd:'.$dataValue->getEntityId()->getSerialization(), false]; |
|
399 | 397 | case 'monolingualtext': |
400 | 398 | /** @var MonolingualTextValue $dataValue */ |
401 | 399 | $lang = $dataValue->getLanguageCode(); |
402 | - if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) { |
|
400 | + if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) { |
|
403 | 401 | // not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG) |
404 | 402 | // such a language tag should never reach us, so just throw |
405 | - throw new InvalidArgumentException( 'invalid language tag: ' . $lang ); |
|
403 | + throw new InvalidArgumentException('invalid language tag: '.$lang); |
|
406 | 404 | } |
407 | - return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ]; |
|
405 | + return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false]; |
|
408 | 406 | case 'globe-coordinate': |
409 | 407 | case 'quantity': |
410 | 408 | case 'time': |
411 | - return [ 'wdv:' . $dataValue->getHash(), true ]; |
|
409 | + return ['wdv:'.$dataValue->getHash(), true]; |
|
412 | 410 | default: |
413 | - throw new InvalidArgumentException( 'unknown data type: ' . $dataType ); |
|
411 | + throw new InvalidArgumentException('unknown data type: '.$dataType); |
|
414 | 412 | } |
415 | 413 | } |
416 | 414 | // @codingStandardsIgnoreEnd |
@@ -423,44 +421,44 @@ discard block |
||
423 | 421 | * @throws SparqlHelperException if the query times out or some other error occurs |
424 | 422 | * @throws ConstraintParameterException if the $regex is invalid |
425 | 423 | */ |
426 | - public function matchesRegularExpression( $text, $regex ) { |
|
424 | + public function matchesRegularExpression($text, $regex) { |
|
427 | 425 | // caching wrapper around matchesRegularExpressionWithSparql |
428 | 426 | |
429 | - $textHash = hash( 'sha256', $text ); |
|
427 | + $textHash = hash('sha256', $text); |
|
430 | 428 | $cacheKey = $this->cache->makeKey( |
431 | 429 | 'WikibaseQualityConstraints', // extension |
432 | 430 | 'regex', // action |
433 | 431 | 'WDQS-Java', // regex flavor |
434 | - hash( 'sha256', $regex ) |
|
432 | + hash('sha256', $regex) |
|
435 | 433 | ); |
436 | - $cacheMapSize = $this->config->get( 'WBQualityConstraintsFormatCacheMapSize' ); |
|
434 | + $cacheMapSize = $this->config->get('WBQualityConstraintsFormatCacheMapSize'); |
|
437 | 435 | |
438 | 436 | $cacheMapArray = $this->cache->getWithSetCallback( |
439 | 437 | $cacheKey, |
440 | 438 | WANObjectCache::TTL_DAY, |
441 | - function( $cacheMapArray ) use ( $text, $regex, $textHash, $cacheMapSize ) { |
|
439 | + function($cacheMapArray) use ($text, $regex, $textHash, $cacheMapSize) { |
|
442 | 440 | // Initialize the cache map if not set |
443 | - if ( $cacheMapArray === false ) { |
|
441 | + if ($cacheMapArray === false) { |
|
444 | 442 | $key = 'wikibase.quality.constraints.regex.cache.refresh.init'; |
445 | - $this->dataFactory->increment( $key ); |
|
443 | + $this->dataFactory->increment($key); |
|
446 | 444 | return []; |
447 | 445 | } |
448 | 446 | |
449 | 447 | $key = 'wikibase.quality.constraints.regex.cache.refresh'; |
450 | - $this->dataFactory->increment( $key ); |
|
451 | - $cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $cacheMapSize ); |
|
452 | - if ( $cacheMap->has( $textHash ) ) { |
|
448 | + $this->dataFactory->increment($key); |
|
449 | + $cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $cacheMapSize); |
|
450 | + if ($cacheMap->has($textHash)) { |
|
453 | 451 | $key = 'wikibase.quality.constraints.regex.cache.refresh.hit'; |
454 | - $this->dataFactory->increment( $key ); |
|
455 | - $cacheMap->get( $textHash ); // ping cache |
|
452 | + $this->dataFactory->increment($key); |
|
453 | + $cacheMap->get($textHash); // ping cache |
|
456 | 454 | } else { |
457 | 455 | $key = 'wikibase.quality.constraints.regex.cache.refresh.miss'; |
458 | - $this->dataFactory->increment( $key ); |
|
456 | + $this->dataFactory->increment($key); |
|
459 | 457 | try { |
460 | - $matches = $this->matchesRegularExpressionWithSparql( $text, $regex ); |
|
461 | - } catch ( ConstraintParameterException $e ) { |
|
462 | - $matches = $this->serializeConstraintParameterException( $e ); |
|
463 | - } catch ( SparqlHelperException $e ) { |
|
458 | + $matches = $this->matchesRegularExpressionWithSparql($text, $regex); |
|
459 | + } catch (ConstraintParameterException $e) { |
|
460 | + $matches = $this->serializeConstraintParameterException($e); |
|
461 | + } catch (SparqlHelperException $e) { |
|
464 | 462 | // don’t cache this |
465 | 463 | return $cacheMap->toArray(); |
466 | 464 | } |
@@ -484,42 +482,42 @@ discard block |
||
484 | 482 | ] |
485 | 483 | ); |
486 | 484 | |
487 | - if ( isset( $cacheMapArray[$textHash] ) ) { |
|
485 | + if (isset($cacheMapArray[$textHash])) { |
|
488 | 486 | $key = 'wikibase.quality.constraints.regex.cache.hit'; |
489 | - $this->dataFactory->increment( $key ); |
|
487 | + $this->dataFactory->increment($key); |
|
490 | 488 | $matches = $cacheMapArray[$textHash]; |
491 | - if ( is_bool( $matches ) ) { |
|
489 | + if (is_bool($matches)) { |
|
492 | 490 | return $matches; |
493 | - } elseif ( is_array( $matches ) && |
|
494 | - $matches['type'] == ConstraintParameterException::class ) { |
|
495 | - throw $this->deserializeConstraintParameterException( $matches ); |
|
491 | + } elseif (is_array($matches) && |
|
492 | + $matches['type'] == ConstraintParameterException::class) { |
|
493 | + throw $this->deserializeConstraintParameterException($matches); |
|
496 | 494 | } else { |
497 | 495 | throw new MWException( |
498 | - 'Value of unknown type in object cache (' . |
|
499 | - 'cache key: ' . $cacheKey . ', ' . |
|
500 | - 'cache map key: ' . $textHash . ', ' . |
|
501 | - 'value type: ' . gettype( $matches ) . ')' |
|
496 | + 'Value of unknown type in object cache ('. |
|
497 | + 'cache key: '.$cacheKey.', '. |
|
498 | + 'cache map key: '.$textHash.', '. |
|
499 | + 'value type: '.gettype($matches).')' |
|
502 | 500 | ); |
503 | 501 | } |
504 | 502 | } else { |
505 | 503 | $key = 'wikibase.quality.constraints.regex.cache.miss'; |
506 | - $this->dataFactory->increment( $key ); |
|
507 | - return $this->matchesRegularExpressionWithSparql( $text, $regex ); |
|
504 | + $this->dataFactory->increment($key); |
|
505 | + return $this->matchesRegularExpressionWithSparql($text, $regex); |
|
508 | 506 | } |
509 | 507 | } |
510 | 508 | |
511 | - private function serializeConstraintParameterException( ConstraintParameterException $cpe ) { |
|
509 | + private function serializeConstraintParameterException(ConstraintParameterException $cpe) { |
|
512 | 510 | return [ |
513 | 511 | 'type' => ConstraintParameterException::class, |
514 | - 'violationMessage' => $this->violationMessageSerializer->serialize( $cpe->getViolationMessage() ), |
|
512 | + 'violationMessage' => $this->violationMessageSerializer->serialize($cpe->getViolationMessage()), |
|
515 | 513 | ]; |
516 | 514 | } |
517 | 515 | |
518 | - private function deserializeConstraintParameterException( array $serialization ) { |
|
516 | + private function deserializeConstraintParameterException(array $serialization) { |
|
519 | 517 | $message = $this->violationMessageDeserializer->deserialize( |
520 | 518 | $serialization['violationMessage'] |
521 | 519 | ); |
522 | - return new ConstraintParameterException( $message ); |
|
520 | + return new ConstraintParameterException($message); |
|
523 | 521 | } |
524 | 522 | |
525 | 523 | /** |
@@ -533,25 +531,25 @@ discard block |
||
533 | 531 | * @throws SparqlHelperException if the query times out or some other error occurs |
534 | 532 | * @throws ConstraintParameterException if the $regex is invalid |
535 | 533 | */ |
536 | - public function matchesRegularExpressionWithSparql( $text, $regex ) { |
|
537 | - $textStringLiteral = $this->stringLiteral( $text ); |
|
538 | - $regexStringLiteral = $this->stringLiteral( '^(?:' . $regex . ')$' ); |
|
534 | + public function matchesRegularExpressionWithSparql($text, $regex) { |
|
535 | + $textStringLiteral = $this->stringLiteral($text); |
|
536 | + $regexStringLiteral = $this->stringLiteral('^(?:'.$regex.')$'); |
|
539 | 537 | |
540 | 538 | $query = <<<EOF |
541 | 539 | SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {} |
542 | 540 | EOF; |
543 | 541 | |
544 | - $result = $this->runQuery( $query, false ); |
|
542 | + $result = $this->runQuery($query, false); |
|
545 | 543 | |
546 | 544 | $vars = $result->getArray()['results']['bindings'][0]; |
547 | - if ( array_key_exists( 'matches', $vars ) ) { |
|
545 | + if (array_key_exists('matches', $vars)) { |
|
548 | 546 | // true or false ⇒ regex okay, text matches or not |
549 | 547 | return $vars['matches']['value'] === 'true'; |
550 | 548 | } else { |
551 | 549 | // empty result: regex broken |
552 | 550 | throw new ConstraintParameterException( |
553 | - ( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) ) |
|
554 | - ->withInlineCode( $regex, Role::CONSTRAINT_PARAMETER_VALUE ) |
|
551 | + (new ViolationMessage('wbqc-violation-message-parameter-regex')) |
|
552 | + ->withInlineCode($regex, Role::CONSTRAINT_PARAMETER_VALUE) |
|
555 | 553 | ); |
556 | 554 | } |
557 | 555 | } |
@@ -563,14 +561,14 @@ discard block |
||
563 | 561 | * |
564 | 562 | * @return boolean |
565 | 563 | */ |
566 | - public function isTimeout( $responseContent ) { |
|
567 | - $timeoutRegex = implode( '|', array_map( |
|
568 | - function ( $fqn ) { |
|
569 | - return preg_quote( $fqn, '/' ); |
|
564 | + public function isTimeout($responseContent) { |
|
565 | + $timeoutRegex = implode('|', array_map( |
|
566 | + function($fqn) { |
|
567 | + return preg_quote($fqn, '/'); |
|
570 | 568 | }, |
571 | - $this->config->get( 'WBQualityConstraintsSparqlTimeoutExceptionClasses' ) |
|
572 | - ) ); |
|
573 | - return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent ); |
|
569 | + $this->config->get('WBQualityConstraintsSparqlTimeoutExceptionClasses') |
|
570 | + )); |
|
571 | + return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent); |
|
574 | 572 | } |
575 | 573 | |
576 | 574 | /** |
@@ -582,17 +580,17 @@ discard block |
||
582 | 580 | * @return int|boolean the max-age (in seconds) |
583 | 581 | * or a plain boolean if no max-age can be determined |
584 | 582 | */ |
585 | - public function getCacheMaxAge( $responseHeaders ) { |
|
583 | + public function getCacheMaxAge($responseHeaders) { |
|
586 | 584 | if ( |
587 | - array_key_exists( 'x-cache-status', $responseHeaders ) && |
|
588 | - preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] ) |
|
585 | + array_key_exists('x-cache-status', $responseHeaders) && |
|
586 | + preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0]) |
|
589 | 587 | ) { |
590 | 588 | $maxage = []; |
591 | 589 | if ( |
592 | - array_key_exists( 'cache-control', $responseHeaders ) && |
|
593 | - preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage ) |
|
590 | + array_key_exists('cache-control', $responseHeaders) && |
|
591 | + preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage) |
|
594 | 592 | ) { |
595 | - return intval( $maxage[1] ); |
|
593 | + return intval($maxage[1]); |
|
596 | 594 | } else { |
597 | 595 | return true; |
598 | 596 | } |
@@ -613,34 +611,34 @@ discard block |
||
613 | 611 | * or SparlHelper::EMPTY_RETRY_AFTER if there is an empty Retry-After |
614 | 612 | * or SparlHelper::INVALID_RETRY_AFTER if there is something wrong with the format |
615 | 613 | */ |
616 | - public function getThrottling( MWHttpRequest $request ) { |
|
617 | - $retryAfterValue = $request->getResponseHeader( 'Retry-After' ); |
|
618 | - if ( $retryAfterValue === null ) { |
|
614 | + public function getThrottling(MWHttpRequest $request) { |
|
615 | + $retryAfterValue = $request->getResponseHeader('Retry-After'); |
|
616 | + if ($retryAfterValue === null) { |
|
619 | 617 | return self::NO_RETRY_AFTER; |
620 | 618 | } |
621 | 619 | |
622 | - $trimmedRetryAfterValue = trim( $retryAfterValue ); |
|
623 | - if ( empty( $trimmedRetryAfterValue ) ) { |
|
620 | + $trimmedRetryAfterValue = trim($retryAfterValue); |
|
621 | + if (empty($trimmedRetryAfterValue)) { |
|
624 | 622 | return self::EMPTY_RETRY_AFTER; |
625 | 623 | } |
626 | 624 | |
627 | - if ( is_numeric( $trimmedRetryAfterValue ) ) { |
|
628 | - $delaySeconds = (int)$trimmedRetryAfterValue; |
|
629 | - if ( $delaySeconds >= 0 ) { |
|
630 | - return $this->getTimestampInFuture( new DateInterval( 'PT' . $delaySeconds . 'S' ) ); |
|
625 | + if (is_numeric($trimmedRetryAfterValue)) { |
|
626 | + $delaySeconds = (int) $trimmedRetryAfterValue; |
|
627 | + if ($delaySeconds >= 0) { |
|
628 | + return $this->getTimestampInFuture(new DateInterval('PT'.$delaySeconds.'S')); |
|
631 | 629 | } |
632 | 630 | } else { |
633 | - $return = strtotime( $trimmedRetryAfterValue ); |
|
634 | - if ( !empty( $return ) ) { |
|
635 | - return new ConvertibleTimestamp( $return ); |
|
631 | + $return = strtotime($trimmedRetryAfterValue); |
|
632 | + if (!empty($return)) { |
|
633 | + return new ConvertibleTimestamp($return); |
|
636 | 634 | } |
637 | 635 | } |
638 | 636 | return self::INVALID_RETRY_AFTER; |
639 | 637 | } |
640 | 638 | |
641 | - private function getTimestampInFuture( DateInterval $delta ) { |
|
639 | + private function getTimestampInFuture(DateInterval $delta) { |
|
642 | 640 | $now = new ConvertibleTimestamp(); |
643 | - return new ConvertibleTimestamp( $now->timestamp->add( $delta ) ); |
|
641 | + return new ConvertibleTimestamp($now->timestamp->add($delta)); |
|
644 | 642 | } |
645 | 643 | |
646 | 644 | /** |
@@ -654,97 +652,96 @@ discard block |
||
654 | 652 | * |
655 | 653 | * @throws SparqlHelperException if the query times out or some other error occurs |
656 | 654 | */ |
657 | - public function runQuery( $query, $needsPrefixes = true ) { |
|
655 | + public function runQuery($query, $needsPrefixes = true) { |
|
658 | 656 | |
659 | - if ( $this->throttlingLock->isLocked( self::EXPIRY_LOCK_ID ) ) { |
|
660 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' ); |
|
657 | + if ($this->throttlingLock->isLocked(self::EXPIRY_LOCK_ID)) { |
|
658 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling'); |
|
661 | 659 | throw new TooManySparqlRequestsException(); |
662 | 660 | } |
663 | 661 | |
664 | - $endpoint = $this->config->get( 'WBQualityConstraintsSparqlEndpoint' ); |
|
665 | - $maxQueryTimeMillis = $this->config->get( 'WBQualityConstraintsSparqlMaxMillis' ); |
|
666 | - $fallbackBlockDuration = (int)$this->config->get( 'WBQualityConstraintsSparqlThrottlingFallbackDuration' ); |
|
662 | + $endpoint = $this->config->get('WBQualityConstraintsSparqlEndpoint'); |
|
663 | + $maxQueryTimeMillis = $this->config->get('WBQualityConstraintsSparqlMaxMillis'); |
|
664 | + $fallbackBlockDuration = (int) $this->config->get('WBQualityConstraintsSparqlThrottlingFallbackDuration'); |
|
667 | 665 | |
668 | - if ( $fallbackBlockDuration < 0 ) { |
|
669 | - throw new InvalidArgumentException( 'Fallback duration must be positive int but is: '. |
|
670 | - $fallbackBlockDuration ); |
|
666 | + if ($fallbackBlockDuration < 0) { |
|
667 | + throw new InvalidArgumentException('Fallback duration must be positive int but is: '. |
|
668 | + $fallbackBlockDuration); |
|
671 | 669 | } |
672 | 670 | |
673 | - if ( $this->config->get( 'WBQualityConstraintsSparqlHasWikibaseSupport' ) ) { |
|
671 | + if ($this->config->get('WBQualityConstraintsSparqlHasWikibaseSupport')) { |
|
674 | 672 | $needsPrefixes = false; |
675 | 673 | } |
676 | 674 | |
677 | - if ( $needsPrefixes ) { |
|
678 | - $query = $this->prefixes . $query; |
|
675 | + if ($needsPrefixes) { |
|
676 | + $query = $this->prefixes.$query; |
|
679 | 677 | } |
680 | - $query = "#wbqc\n" . $query; |
|
678 | + $query = "#wbqc\n".$query; |
|
681 | 679 | |
682 | - $url = $endpoint . '?' . http_build_query( |
|
680 | + $url = $endpoint.'?'.http_build_query( |
|
683 | 681 | [ |
684 | 682 | 'query' => $query, |
685 | 683 | 'format' => 'json', |
686 | 684 | 'maxQueryTimeMillis' => $maxQueryTimeMillis, |
687 | 685 | ], |
688 | - null, ini_get( 'arg_separator.output' ), |
|
686 | + null, ini_get('arg_separator.output'), |
|
689 | 687 | // encode spaces with %20, not + |
690 | 688 | PHP_QUERY_RFC3986 |
691 | 689 | ); |
692 | 690 | |
693 | 691 | $options = [ |
694 | 692 | 'method' => 'GET', |
695 | - 'timeout' => (int)round( ( $maxQueryTimeMillis + 1000 ) / 1000 ), |
|
693 | + 'timeout' => (int) round(($maxQueryTimeMillis + 1000) / 1000), |
|
696 | 694 | 'connectTimeout' => 'default', |
697 | 695 | 'userAgent' => $this->defaultUserAgent, |
698 | 696 | ]; |
699 | - $request = $this->requestFactory->create( $url, $options ); |
|
700 | - $startTime = microtime( true ); |
|
697 | + $request = $this->requestFactory->create($url, $options); |
|
698 | + $startTime = microtime(true); |
|
701 | 699 | $status = $request->execute(); |
702 | - $endTime = microtime( true ); |
|
700 | + $endTime = microtime(true); |
|
703 | 701 | $this->dataFactory->timing( |
704 | 702 | 'wikibase.quality.constraints.sparql.timing', |
705 | - ( $endTime - $startTime ) * 1000 |
|
703 | + ($endTime - $startTime) * 1000 |
|
706 | 704 | ); |
707 | 705 | |
708 | - if ( $request->getStatus() === self::HTTP_TOO_MANY_REQUESTS ) { |
|
709 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' ); |
|
710 | - $throttlingUntil = $this->getThrottling( $request ); |
|
711 | - if ( !( $throttlingUntil instanceof ConvertibleTimestamp ) ) { |
|
712 | - $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid( $request ); |
|
706 | + if ($request->getStatus() === self::HTTP_TOO_MANY_REQUESTS) { |
|
707 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling'); |
|
708 | + $throttlingUntil = $this->getThrottling($request); |
|
709 | + if (!($throttlingUntil instanceof ConvertibleTimestamp)) { |
|
710 | + $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid($request); |
|
713 | 711 | $this->throttlingLock->lock( |
714 | 712 | self::EXPIRY_LOCK_ID, |
715 | - $this->getTimestampInFuture( new DateInterval( 'PT' . $fallbackBlockDuration . 'S' ) ) |
|
713 | + $this->getTimestampInFuture(new DateInterval('PT'.$fallbackBlockDuration.'S')) |
|
716 | 714 | ); |
717 | 715 | } else { |
718 | - $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent( $throttlingUntil, $request ); |
|
719 | - $this->throttlingLock->lock( self::EXPIRY_LOCK_ID, $throttlingUntil ); |
|
716 | + $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent($throttlingUntil, $request); |
|
717 | + $this->throttlingLock->lock(self::EXPIRY_LOCK_ID, $throttlingUntil); |
|
720 | 718 | } |
721 | 719 | throw new TooManySparqlRequestsException(); |
722 | 720 | } |
723 | 721 | |
724 | - $maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() ); |
|
725 | - if ( $maxAge ) { |
|
726 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' ); |
|
722 | + $maxAge = $this->getCacheMaxAge($request->getResponseHeaders()); |
|
723 | + if ($maxAge) { |
|
724 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.cached'); |
|
727 | 725 | } |
728 | 726 | |
729 | - if ( $status->isOK() ) { |
|
727 | + if ($status->isOK()) { |
|
730 | 728 | $json = $request->getContent(); |
731 | - $arr = json_decode( $json, true ); |
|
729 | + $arr = json_decode($json, true); |
|
732 | 730 | return new CachedQueryResults( |
733 | 731 | $arr, |
734 | 732 | Metadata::ofCachingMetadata( |
735 | 733 | $maxAge ? |
736 | - CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) : |
|
737 | - CachingMetadata::fresh() |
|
734 | + CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh() |
|
738 | 735 | ) |
739 | 736 | ); |
740 | 737 | } else { |
741 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' ); |
|
738 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.error'); |
|
742 | 739 | |
743 | 740 | $this->dataFactory->increment( |
744 | 741 | "wikibase.quality.constraints.sparql.error.http.{$request->getStatus()}" |
745 | 742 | ); |
746 | 743 | |
747 | - if ( $this->isTimeout( $request->getContent() ) ) { |
|
744 | + if ($this->isTimeout($request->getContent())) { |
|
748 | 745 | $this->dataFactory->increment( |
749 | 746 | 'wikibase.quality.constraints.sparql.error.timeout' |
750 | 747 | ); |