@@ -39,243 +39,243 @@ |
||
39 | 39 | const PROPERTY_SCOPE_CHECKER = 'WBQC_PropertyScopeChecker'; |
40 | 40 | const CONTEMPORARY_CHECKER = 'WBQC_ContemporaryChecker'; |
41 | 41 | |
42 | - private static function getService( MediaWikiServices $services = null, $name ) { |
|
43 | - if ( $services === null ) { |
|
42 | + private static function getService(MediaWikiServices $services = null, $name) { |
|
43 | + if ($services === null) { |
|
44 | 44 | $services = MediaWikiServices::getInstance(); |
45 | 45 | } |
46 | - return $services->getService( $name ); |
|
46 | + return $services->getService($name); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | 50 | * @param MediaWikiServices|null $services |
51 | 51 | * @return ConstraintChecker |
52 | 52 | */ |
53 | - public static function getConflictsWithChecker( MediaWikiServices $services = null ) { |
|
54 | - return self::getService( $services, self::CONFLICTS_WITH_CHECKER ); |
|
53 | + public static function getConflictsWithChecker(MediaWikiServices $services = null) { |
|
54 | + return self::getService($services, self::CONFLICTS_WITH_CHECKER); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
58 | 58 | * @param MediaWikiServices|null $services |
59 | 59 | * @return ConstraintChecker |
60 | 60 | */ |
61 | - public static function getItemChecker( MediaWikiServices $services = null ) { |
|
62 | - return self::getService( $services, self::ITEM_CHECKER ); |
|
61 | + public static function getItemChecker(MediaWikiServices $services = null) { |
|
62 | + return self::getService($services, self::ITEM_CHECKER); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
66 | 66 | * @param MediaWikiServices|null $services |
67 | 67 | * @return ConstraintChecker |
68 | 68 | */ |
69 | - public static function getTargetRequiredClaimChecker( MediaWikiServices $services = null ) { |
|
70 | - return self::getService( $services, self::TARGET_REQUIRED_CLAIM_CHECKER ); |
|
69 | + public static function getTargetRequiredClaimChecker(MediaWikiServices $services = null) { |
|
70 | + return self::getService($services, self::TARGET_REQUIRED_CLAIM_CHECKER); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
74 | 74 | * @param MediaWikiServices|null $services |
75 | 75 | * @return ConstraintChecker |
76 | 76 | */ |
77 | - public static function getSymmetricChecker( MediaWikiServices $services = null ) { |
|
78 | - return self::getService( $services, self::SYMMETRIC_CHECKER ); |
|
77 | + public static function getSymmetricChecker(MediaWikiServices $services = null) { |
|
78 | + return self::getService($services, self::SYMMETRIC_CHECKER); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
82 | 82 | * @param MediaWikiServices|null $services |
83 | 83 | * @return ConstraintChecker |
84 | 84 | */ |
85 | - public static function getInverseChecker( MediaWikiServices $services = null ) { |
|
86 | - return self::getService( $services, self::INVERSE_CHECKER ); |
|
85 | + public static function getInverseChecker(MediaWikiServices $services = null) { |
|
86 | + return self::getService($services, self::INVERSE_CHECKER); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
90 | 90 | * @param MediaWikiServices|null $services |
91 | 91 | * @return ConstraintChecker |
92 | 92 | */ |
93 | - public static function getQualifierChecker( MediaWikiServices $services = null ) { |
|
94 | - return self::getService( $services, self::QUALIFIER_CHECKER ); |
|
93 | + public static function getQualifierChecker(MediaWikiServices $services = null) { |
|
94 | + return self::getService($services, self::QUALIFIER_CHECKER); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
98 | 98 | * @param MediaWikiServices|null $services |
99 | 99 | * @return ConstraintChecker |
100 | 100 | */ |
101 | - public static function getQualifiersChecker( MediaWikiServices $services = null ) { |
|
102 | - return self::getService( $services, self::QUALIFIERS_CHECKER ); |
|
101 | + public static function getQualifiersChecker(MediaWikiServices $services = null) { |
|
102 | + return self::getService($services, self::QUALIFIERS_CHECKER); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
106 | 106 | * @param MediaWikiServices|null $services |
107 | 107 | * @return ConstraintChecker |
108 | 108 | */ |
109 | - public static function getMandatoryQualifiersChecker( MediaWikiServices $services = null ) { |
|
110 | - return self::getService( $services, self::MANDATORY_QUALIFIERS_CHECKER ); |
|
109 | + public static function getMandatoryQualifiersChecker(MediaWikiServices $services = null) { |
|
110 | + return self::getService($services, self::MANDATORY_QUALIFIERS_CHECKER); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
114 | 114 | * @param MediaWikiServices|null $services |
115 | 115 | * @return ConstraintChecker |
116 | 116 | */ |
117 | - public static function getRangeChecker( MediaWikiServices $services = null ) { |
|
118 | - return self::getService( $services, self::RANGE_CHECKER ); |
|
117 | + public static function getRangeChecker(MediaWikiServices $services = null) { |
|
118 | + return self::getService($services, self::RANGE_CHECKER); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
122 | 122 | * @param MediaWikiServices|null $services |
123 | 123 | * @return ConstraintChecker |
124 | 124 | */ |
125 | - public static function getDiffWithinRangeChecker( MediaWikiServices $services = null ) { |
|
126 | - return self::getService( $services, self::DIFF_WITHIN_RANGE_CHECKER ); |
|
125 | + public static function getDiffWithinRangeChecker(MediaWikiServices $services = null) { |
|
126 | + return self::getService($services, self::DIFF_WITHIN_RANGE_CHECKER); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
130 | 130 | * @param MediaWikiServices|null $services |
131 | 131 | * @return ConstraintChecker |
132 | 132 | */ |
133 | - public static function getTypeChecker( MediaWikiServices $services = null ) { |
|
134 | - return self::getService( $services, self::TYPE_CHECKER ); |
|
133 | + public static function getTypeChecker(MediaWikiServices $services = null) { |
|
134 | + return self::getService($services, self::TYPE_CHECKER); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
138 | 138 | * @param MediaWikiServices|null $services |
139 | 139 | * @return ConstraintChecker |
140 | 140 | */ |
141 | - public static function getValueTypeChecker( MediaWikiServices $services = null ) { |
|
142 | - return self::getService( $services, self::VALUE_TYPE_CHECKER ); |
|
141 | + public static function getValueTypeChecker(MediaWikiServices $services = null) { |
|
142 | + return self::getService($services, self::VALUE_TYPE_CHECKER); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
146 | 146 | * @param MediaWikiServices|null $services |
147 | 147 | * @return ConstraintChecker |
148 | 148 | */ |
149 | - public static function getSingleValueChecker( MediaWikiServices $services = null ) { |
|
150 | - return self::getService( $services, self::SINGLE_VALUE_CHECKER ); |
|
149 | + public static function getSingleValueChecker(MediaWikiServices $services = null) { |
|
150 | + return self::getService($services, self::SINGLE_VALUE_CHECKER); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
154 | 154 | * @param MediaWikiServices|null $services |
155 | 155 | * @return ConstraintChecker |
156 | 156 | */ |
157 | - public static function getMultiValueChecker( MediaWikiServices $services = null ) { |
|
158 | - return self::getService( $services, self::MULTI_VALUE_CHECKER ); |
|
157 | + public static function getMultiValueChecker(MediaWikiServices $services = null) { |
|
158 | + return self::getService($services, self::MULTI_VALUE_CHECKER); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | /** |
162 | 162 | * @param MediaWikiServices|null $services |
163 | 163 | * @return ConstraintChecker |
164 | 164 | */ |
165 | - public static function getUniqueValueChecker( MediaWikiServices $services = null ) { |
|
166 | - return self::getService( $services, self::UNIQUE_VALUE_CHECKER ); |
|
165 | + public static function getUniqueValueChecker(MediaWikiServices $services = null) { |
|
166 | + return self::getService($services, self::UNIQUE_VALUE_CHECKER); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | /** |
170 | 170 | * @param MediaWikiServices|null $services |
171 | 171 | * @return ConstraintChecker |
172 | 172 | */ |
173 | - public static function getFormatChecker( MediaWikiServices $services = null ) { |
|
174 | - return self::getService( $services, self::FORMAT_CHECKER ); |
|
173 | + public static function getFormatChecker(MediaWikiServices $services = null) { |
|
174 | + return self::getService($services, self::FORMAT_CHECKER); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
178 | 178 | * @param MediaWikiServices|null $services |
179 | 179 | * @return ConstraintChecker |
180 | 180 | */ |
181 | - public static function getCommonsLinkChecker( MediaWikiServices $services = null ) { |
|
182 | - return self::getService( $services, self::COMMONS_LINK_CHECKER ); |
|
181 | + public static function getCommonsLinkChecker(MediaWikiServices $services = null) { |
|
182 | + return self::getService($services, self::COMMONS_LINK_CHECKER); |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
186 | 186 | * @param MediaWikiServices|null $services |
187 | 187 | * @return ConstraintChecker |
188 | 188 | */ |
189 | - public static function getOneOfChecker( MediaWikiServices $services = null ) { |
|
190 | - return self::getService( $services, self::ONE_OF_CHECKER ); |
|
189 | + public static function getOneOfChecker(MediaWikiServices $services = null) { |
|
190 | + return self::getService($services, self::ONE_OF_CHECKER); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | /** |
194 | 194 | * @param MediaWikiServices|null $services |
195 | 195 | * @return ConstraintChecker |
196 | 196 | */ |
197 | - public static function getValueOnlyChecker( MediaWikiServices $services = null ) { |
|
198 | - return self::getService( $services, self::VALUE_ONLY_CHECKER ); |
|
197 | + public static function getValueOnlyChecker(MediaWikiServices $services = null) { |
|
198 | + return self::getService($services, self::VALUE_ONLY_CHECKER); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | /** |
202 | 202 | * @param MediaWikiServices|null $services |
203 | 203 | * @return ConstraintChecker |
204 | 204 | */ |
205 | - public static function getReferenceChecker( MediaWikiServices $services = null ) { |
|
206 | - return self::getService( $services, self::REFERENCE_CHECKER ); |
|
205 | + public static function getReferenceChecker(MediaWikiServices $services = null) { |
|
206 | + return self::getService($services, self::REFERENCE_CHECKER); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | /** |
210 | 210 | * @param MediaWikiServices|null $services |
211 | 211 | * @return ConstraintChecker |
212 | 212 | */ |
213 | - public static function getNoBoundsChecker( MediaWikiServices $services = null ) { |
|
214 | - return self::getService( $services, self::NO_BOUNDS_CHECKER ); |
|
213 | + public static function getNoBoundsChecker(MediaWikiServices $services = null) { |
|
214 | + return self::getService($services, self::NO_BOUNDS_CHECKER); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /** |
218 | 218 | * @param MediaWikiServices|null $services |
219 | 219 | * @return ConstraintChecker |
220 | 220 | */ |
221 | - public static function getAllowedUnitsChecker( MediaWikiServices $services = null ) { |
|
222 | - return self::getService( $services, self::ALLOWED_UNITS_CHECKER ); |
|
221 | + public static function getAllowedUnitsChecker(MediaWikiServices $services = null) { |
|
222 | + return self::getService($services, self::ALLOWED_UNITS_CHECKER); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | /** |
226 | 226 | * @param MediaWikiServices|null $services |
227 | 227 | * @return ConstraintChecker |
228 | 228 | */ |
229 | - public static function getSingleBestValueChecker( MediaWikiServices $services = null ) { |
|
230 | - return self::getService( $services, self::SINGLE_BEST_VALUE_CHECKER ); |
|
229 | + public static function getSingleBestValueChecker(MediaWikiServices $services = null) { |
|
230 | + return self::getService($services, self::SINGLE_BEST_VALUE_CHECKER); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | /** |
234 | 234 | * @param MediaWikiServices|null $services |
235 | 235 | * @return ConstraintChecker |
236 | 236 | */ |
237 | - public static function getEntityTypeChecker( MediaWikiServices $services = null ) { |
|
238 | - return self::getService( $services, self::ENTITY_TYPE_CHECKER ); |
|
237 | + public static function getEntityTypeChecker(MediaWikiServices $services = null) { |
|
238 | + return self::getService($services, self::ENTITY_TYPE_CHECKER); |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | /** |
242 | 242 | * @param MediaWikiServices|null $services |
243 | 243 | * @return ConstraintChecker |
244 | 244 | */ |
245 | - public static function getNoneOfChecker( MediaWikiServices $services = null ) { |
|
246 | - return self::getService( $services, self::NONE_OF_CHECKER ); |
|
245 | + public static function getNoneOfChecker(MediaWikiServices $services = null) { |
|
246 | + return self::getService($services, self::NONE_OF_CHECKER); |
|
247 | 247 | } |
248 | 248 | |
249 | 249 | /** |
250 | 250 | * @param MediaWikiServices|null $services |
251 | 251 | * @return ConstraintChecker |
252 | 252 | */ |
253 | - public static function getIntegerChecker( MediaWikiServices $services = null ) { |
|
254 | - return self::getService( $services, self::INTEGER_CHECKER ); |
|
253 | + public static function getIntegerChecker(MediaWikiServices $services = null) { |
|
254 | + return self::getService($services, self::INTEGER_CHECKER); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | /** |
258 | 258 | * @param MediaWikiServices|null $services |
259 | 259 | * @return ConstraintChecker |
260 | 260 | */ |
261 | - public static function getCitationNeededChecker( MediaWikiServices $services = null ) { |
|
262 | - return self::getService( $services, self::CITATION_NEEDED_CHECKER ); |
|
261 | + public static function getCitationNeededChecker(MediaWikiServices $services = null) { |
|
262 | + return self::getService($services, self::CITATION_NEEDED_CHECKER); |
|
263 | 263 | } |
264 | 264 | |
265 | 265 | /** |
266 | 266 | * @param MediaWikiServices|null $services |
267 | 267 | * @return ConstraintChecker |
268 | 268 | */ |
269 | - public static function getPropertyScopeChecker( MediaWikiServices $services = null ) { |
|
270 | - return self::getService( $services, self::PROPERTY_SCOPE_CHECKER ); |
|
269 | + public static function getPropertyScopeChecker(MediaWikiServices $services = null) { |
|
270 | + return self::getService($services, self::PROPERTY_SCOPE_CHECKER); |
|
271 | 271 | } |
272 | 272 | |
273 | 273 | /** |
274 | 274 | * @param MediaWikiServices|null $services |
275 | 275 | * @return ConstraintChecker |
276 | 276 | */ |
277 | - public static function getContemporaryChecker( MediaWikiServices $services = null ) { |
|
278 | - return self::getService( $services, self::CONTEMPORARY_CHECKER ); |
|
277 | + public static function getContemporaryChecker(MediaWikiServices $services = null) { |
|
278 | + return self::getService($services, self::CONTEMPORARY_CHECKER); |
|
279 | 279 | } |
280 | 280 | |
281 | 281 | } |
@@ -42,25 +42,25 @@ discard block |
||
42 | 42 | * @param Title $title |
43 | 43 | * @param string[] $params should contain 'entityId' => 'Q1234' |
44 | 44 | */ |
45 | - public function __construct( Title $title, array $params ) { |
|
46 | - parent::__construct( self::COMMAND, $title, $params ); |
|
45 | + public function __construct(Title $title, array $params) { |
|
46 | + parent::__construct(self::COMMAND, $title, $params); |
|
47 | 47 | $this->removeDuplicates = true; |
48 | 48 | |
49 | - Assert::parameterType( 'string', $params['entityId'], '$params[\'entityId\']' ); |
|
49 | + Assert::parameterType('string', $params['entityId'], '$params[\'entityId\']'); |
|
50 | 50 | $this->entityId = $params['entityId']; |
51 | 51 | |
52 | - $resultSource = ConstraintsServices::getResultsSource( MediaWikiServices::getInstance() ); |
|
52 | + $resultSource = ConstraintsServices::getResultsSource(MediaWikiServices::getInstance()); |
|
53 | 53 | // This job should only ever be used when caching result sources are used. |
54 | - $this->setResultsSource( $resultSource ); |
|
54 | + $this->setResultsSource($resultSource); |
|
55 | 55 | |
56 | - $this->setEntityIdParser( WikibaseRepo::getDefaultInstance()->getEntityIdParser() ); |
|
56 | + $this->setEntityIdParser(WikibaseRepo::getDefaultInstance()->getEntityIdParser()); |
|
57 | 57 | } |
58 | 58 | |
59 | - public function setResultsSource( CachingResultsSource $resultsSource ) { |
|
59 | + public function setResultsSource(CachingResultsSource $resultsSource) { |
|
60 | 60 | $this->resultsSource = $resultsSource; |
61 | 61 | } |
62 | 62 | |
63 | - public function setEntityIdParser( EntityIdParser $parser ) { |
|
63 | + public function setEntityIdParser(EntityIdParser $parser) { |
|
64 | 64 | $this->entityIdParser = $parser; |
65 | 65 | } |
66 | 66 | |
@@ -71,19 +71,19 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function run() { |
73 | 73 | try { |
74 | - $entityId = $this->entityIdParser->parse( $this->entityId ); |
|
75 | - } catch ( EntityIdParsingException $e ) { |
|
74 | + $entityId = $this->entityIdParser->parse($this->entityId); |
|
75 | + } catch (EntityIdParsingException $e) { |
|
76 | 76 | return false; |
77 | 77 | } |
78 | 78 | |
79 | - $this->checkConstraints( $entityId ); |
|
79 | + $this->checkConstraints($entityId); |
|
80 | 80 | |
81 | 81 | return true; |
82 | 82 | } |
83 | 83 | |
84 | - private function checkConstraints( EntityId $entityId ) { |
|
84 | + private function checkConstraints(EntityId $entityId) { |
|
85 | 85 | $this->resultsSource->getResults( |
86 | - [ $entityId ], |
|
86 | + [$entityId], |
|
87 | 87 | [], |
88 | 88 | null, |
89 | 89 | [] |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | /** |
27 | 27 | * @param BagOStuff $cache |
28 | 28 | */ |
29 | - public function __construct( BagOStuff $cache ) { |
|
29 | + public function __construct(BagOStuff $cache) { |
|
30 | 30 | $this->cache = $cache; |
31 | 31 | } |
32 | 32 | |
@@ -37,17 +37,17 @@ discard block |
||
37 | 37 | * |
38 | 38 | * @throws \Wikimedia\Assert\ParameterTypeException |
39 | 39 | */ |
40 | - private function makeKey( $id ) { |
|
41 | - if ( empty( trim( $id ) ) ) { |
|
42 | - throw new ParameterTypeException( '$id', 'non-empty string' ); |
|
40 | + private function makeKey($id) { |
|
41 | + if (empty(trim($id))) { |
|
42 | + throw new ParameterTypeException('$id', 'non-empty string'); |
|
43 | 43 | } |
44 | 44 | |
45 | - Assert::parameterType( 'string', $id, '$id' ); |
|
45 | + Assert::parameterType('string', $id, '$id'); |
|
46 | 46 | |
47 | 47 | return $this->cache->makeKey( |
48 | 48 | 'WikibaseQualityConstraints', |
49 | 49 | 'ExpiryLock', |
50 | - (string)$id |
|
50 | + (string) $id |
|
51 | 51 | ); |
52 | 52 | } |
53 | 53 | |
@@ -59,11 +59,11 @@ discard block |
||
59 | 59 | * |
60 | 60 | * @throws \Wikimedia\Assert\ParameterTypeException |
61 | 61 | */ |
62 | - public function lock( $id, ConvertibleTimestamp $expiryTimestamp ) { |
|
62 | + public function lock($id, ConvertibleTimestamp $expiryTimestamp) { |
|
63 | 63 | |
64 | - $cacheId = $this->makeKey( $id ); |
|
64 | + $cacheId = $this->makeKey($id); |
|
65 | 65 | |
66 | - if ( !$this->isLockedInternal( $cacheId ) ) { |
|
66 | + if (!$this->isLockedInternal($cacheId)) { |
|
67 | 67 | return $this->cache->set( |
68 | 68 | $cacheId, |
69 | 69 | $expiryTimestamp->getTimestamp(), |
@@ -81,20 +81,20 @@ discard block |
||
81 | 81 | * |
82 | 82 | * @throws \Wikimedia\Assert\ParameterTypeException |
83 | 83 | */ |
84 | - private function isLockedInternal( $cacheId ) { |
|
85 | - $expiryTime = $this->cache->get( $cacheId ); |
|
86 | - if ( !$expiryTime ) { |
|
84 | + private function isLockedInternal($cacheId) { |
|
85 | + $expiryTime = $this->cache->get($cacheId); |
|
86 | + if (!$expiryTime) { |
|
87 | 87 | return false; |
88 | 88 | } |
89 | 89 | |
90 | 90 | try { |
91 | - $lockExpiryTimeStamp = new ConvertibleTimestamp( $expiryTime ); |
|
92 | - } catch ( TimestampException $exception ) { |
|
91 | + $lockExpiryTimeStamp = new ConvertibleTimestamp($expiryTime); |
|
92 | + } catch (TimestampException $exception) { |
|
93 | 93 | return false; |
94 | 94 | } |
95 | 95 | |
96 | 96 | $now = new ConvertibleTimestamp(); |
97 | - if ( $now->timestamp < $lockExpiryTimeStamp->timestamp ) { |
|
97 | + if ($now->timestamp < $lockExpiryTimeStamp->timestamp) { |
|
98 | 98 | return true; |
99 | 99 | } else { |
100 | 100 | return false; |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | * |
109 | 109 | * @throws \Wikimedia\Assert\ParameterTypeException |
110 | 110 | */ |
111 | - public function isLocked( $id ) { |
|
112 | - return $this->isLockedInternal( $this->makeKey( $id ) ); |
|
111 | + public function isLocked($id) { |
|
112 | + return $this->isLockedInternal($this->makeKey($id)); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | } |
@@ -38,90 +38,90 @@ |
||
38 | 38 | const RESULTS_SOURCE = 'WBQC_ResultsSource'; |
39 | 39 | const EXPIRY_LOCK = 'WBQC_ExpiryLock'; |
40 | 40 | |
41 | - private static function getService( MediaWikiServices $services = null, $name ) { |
|
42 | - if ( $services === null ) { |
|
41 | + private static function getService(MediaWikiServices $services = null, $name) { |
|
42 | + if ($services === null) { |
|
43 | 43 | $services = MediaWikiServices::getInstance(); |
44 | 44 | } |
45 | - return $services->getService( $name ); |
|
45 | + return $services->getService($name); |
|
46 | 46 | } |
47 | 47 | |
48 | - public static function getLoggingHelper( MediaWikiServices $services = null ): LoggingHelper { |
|
49 | - return self::getService( $services, self::LOGGING_HELPER ); |
|
48 | + public static function getLoggingHelper(MediaWikiServices $services = null): LoggingHelper { |
|
49 | + return self::getService($services, self::LOGGING_HELPER); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | public static function getConstraintRepository( |
53 | 53 | MediaWikiServices $services = null |
54 | 54 | ): ConstraintRepository { |
55 | - return self::getService( $services, self::CONSTRAINT_REPOSITORY ); |
|
55 | + return self::getService($services, self::CONSTRAINT_REPOSITORY); |
|
56 | 56 | } |
57 | 57 | |
58 | - public static function getConstraintLookup( MediaWikiServices $services = null ): ConstraintLookup { |
|
59 | - return self::getService( $services, self::CONSTRAINT_LOOKUP ); |
|
58 | + public static function getConstraintLookup(MediaWikiServices $services = null): ConstraintLookup { |
|
59 | + return self::getService($services, self::CONSTRAINT_LOOKUP); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | public static function getCheckResultSerializer( |
63 | 63 | MediaWikiServices $services = null |
64 | 64 | ): CheckResultSerializer { |
65 | - return self::getService( $services, self::CHECK_RESULT_SERIALIZER ); |
|
65 | + return self::getService($services, self::CHECK_RESULT_SERIALIZER); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public static function getCheckResultDeserializer( |
69 | 69 | MediaWikiServices $services = null |
70 | 70 | ): CheckResultDeserializer { |
71 | - return self::getService( $services, self::CHECK_RESULT_DESERIALIZER ); |
|
71 | + return self::getService($services, self::CHECK_RESULT_DESERIALIZER); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | public static function getViolationMessageSerializer( |
75 | 75 | MediaWikiServices $services = null |
76 | 76 | ): ViolationMessageSerializer { |
77 | - return self::getService( $services, self::VIOLATION_MESSAGE_SERIALIZER ); |
|
77 | + return self::getService($services, self::VIOLATION_MESSAGE_SERIALIZER); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | public static function getViolationMessageDeserializer( |
81 | 81 | MediaWikiServices $services = null |
82 | 82 | ): ViolationMessageDeserializer { |
83 | - return self::getService( $services, self::VIOLATION_MESSAGE_DESERIALIZER ); |
|
83 | + return self::getService($services, self::VIOLATION_MESSAGE_DESERIALIZER); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | public static function getConstraintParameterParser( |
87 | 87 | MediaWikiServices $services = null |
88 | 88 | ): ConstraintParameterParser { |
89 | - return self::getService( $services, self::CONSTRAINT_PARAMETER_PARSER ); |
|
89 | + return self::getService($services, self::CONSTRAINT_PARAMETER_PARSER); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | public static function getConnectionCheckerHelper( |
93 | 93 | MediaWikiServices $services = null |
94 | 94 | ): ConnectionCheckerHelper { |
95 | - return self::getService( $services, self::CONNECTION_CHECKER_HELPER ); |
|
95 | + return self::getService($services, self::CONNECTION_CHECKER_HELPER); |
|
96 | 96 | } |
97 | 97 | |
98 | - public static function getRangeCheckerHelper( MediaWikiServices $services = null ): RangeCheckerHelper { |
|
99 | - return self::getService( $services, self::RANGE_CHECKER_HELPER ); |
|
98 | + public static function getRangeCheckerHelper(MediaWikiServices $services = null): RangeCheckerHelper { |
|
99 | + return self::getService($services, self::RANGE_CHECKER_HELPER); |
|
100 | 100 | } |
101 | 101 | |
102 | - public static function getSparqlHelper( MediaWikiServices $services = null ): SparqlHelper { |
|
103 | - return self::getService( $services, self::SPARQL_HELPER ); |
|
102 | + public static function getSparqlHelper(MediaWikiServices $services = null): SparqlHelper { |
|
103 | + return self::getService($services, self::SPARQL_HELPER); |
|
104 | 104 | } |
105 | 105 | |
106 | - public static function getTypeCheckerHelper( MediaWikiServices $services = null ): TypeCheckerHelper { |
|
107 | - return self::getService( $services, self::TYPE_CHECKER_HELPER ); |
|
106 | + public static function getTypeCheckerHelper(MediaWikiServices $services = null): TypeCheckerHelper { |
|
107 | + return self::getService($services, self::TYPE_CHECKER_HELPER); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | public static function getDelegatingConstraintChecker( |
111 | 111 | MediaWikiServices $services = null |
112 | 112 | ): DelegatingConstraintChecker { |
113 | - return self::getService( $services, self::DELEGATING_CONSTRAINT_CHECKER ); |
|
113 | + return self::getService($services, self::DELEGATING_CONSTRAINT_CHECKER); |
|
114 | 114 | } |
115 | 115 | |
116 | - public static function getResultsSource( MediaWikiServices $services = null ): ResultsSource { |
|
117 | - return self::getService( $services, self::RESULTS_SOURCE ); |
|
116 | + public static function getResultsSource(MediaWikiServices $services = null): ResultsSource { |
|
117 | + return self::getService($services, self::RESULTS_SOURCE); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
121 | 121 | * @return ExpiryLock |
122 | 122 | */ |
123 | - public static function getExpiryLock( MediaWikiServices $services = null ) { |
|
124 | - return self::getService( $services, self::EXPIRY_LOCK ); |
|
123 | + public static function getExpiryLock(MediaWikiServices $services = null) { |
|
124 | + return self::getService($services, self::EXPIRY_LOCK); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | } |
@@ -65,6 +65,7 @@ discard block |
||
65 | 65 | * and return it along with the associated log level. |
66 | 66 | * |
67 | 67 | * @param float $durationSeconds |
68 | + * @param double[] $limits |
|
68 | 69 | * @return array [ $limitSeconds, $logLevel ] |
69 | 70 | */ |
70 | 71 | private function findLimit( $limits, $durationSeconds ) { |
@@ -174,6 +175,7 @@ discard block |
||
174 | 175 | * @param EntityId $entityId |
175 | 176 | * @param CheckResult[] $checkResults |
176 | 177 | * @param float $durationSeconds |
178 | + * @param string $method |
|
177 | 179 | */ |
178 | 180 | public function logConstraintCheckOnEntity( |
179 | 181 | EntityId $entityId, |
@@ -53,12 +53,12 @@ discard block |
||
53 | 53 | $this->dataFactory = $dataFactory; |
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 | |
@@ -69,23 +69,23 @@ discard block |
||
69 | 69 | * @param float $durationSeconds |
70 | 70 | * @return array [ $limitSeconds, $logLevel ] |
71 | 71 | */ |
72 | - private function findLimit( $limits, $durationSeconds ) { |
|
72 | + private function findLimit($limits, $durationSeconds) { |
|
73 | 73 | $limitSeconds = null; |
74 | 74 | $logLevel = null; |
75 | 75 | |
76 | - foreach ( $limits as $level => $limit ) { |
|
76 | + foreach ($limits as $level => $limit) { |
|
77 | 77 | if ( |
78 | 78 | // duration exceeds this limit |
79 | - isset( $limit ) && $durationSeconds > $limit && |
|
79 | + isset($limit) && $durationSeconds > $limit && |
|
80 | 80 | // this limit is longer than previous longest limit |
81 | - ( $limitSeconds === null || $limit > $limitSeconds ) |
|
81 | + ($limitSeconds === null || $limit > $limitSeconds) |
|
82 | 82 | ) { |
83 | 83 | $limitSeconds = $limit; |
84 | 84 | $logLevel = $level; |
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - return [ $limitSeconds, $logLevel ]; |
|
88 | + return [$limitSeconds, $logLevel]; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -110,31 +110,31 @@ discard block |
||
110 | 110 | $durationSeconds, |
111 | 111 | $method |
112 | 112 | ) { |
113 | - $constraintCheckerClassShortName = substr( strrchr( $constraintCheckerClass, '\\' ), 1 ); |
|
113 | + $constraintCheckerClassShortName = substr(strrchr($constraintCheckerClass, '\\'), 1); |
|
114 | 114 | $constraintTypeItemId = $constraint->getConstraintTypeItemId(); |
115 | 115 | |
116 | 116 | $this->dataFactory->timing( |
117 | - 'wikibase.quality.constraints.check.timing.' . |
|
118 | - $constraintTypeItemId . '-' . |
|
117 | + 'wikibase.quality.constraints.check.timing.'. |
|
118 | + $constraintTypeItemId.'-'. |
|
119 | 119 | $constraintCheckerClassShortName, |
120 | 120 | $durationSeconds * 1000 |
121 | 121 | ); |
122 | 122 | |
123 | 123 | // find the longest limit (and associated log level) that the duration exceeds |
124 | - list( $limitSeconds, $logLevel ) = $this->findLimit( |
|
124 | + list($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,13 +153,13 @@ 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(), |
160 | 160 | 'statementGuid' => $context->getSnakStatement()->getGuid(), |
161 | 161 | 'resultStatus' => $result->getStatus(), |
162 | - 'resultParameters' => json_encode( $result->getParameters() ), |
|
162 | + 'resultParameters' => json_encode($result->getParameters()), |
|
163 | 163 | 'resultMessage' => $resultMessageKey, |
164 | 164 | ] |
165 | 165 | ); |
@@ -189,18 +189,18 @@ discard block |
||
189 | 189 | ); |
190 | 190 | |
191 | 191 | // find the longest limit (and associated log level) that the duration exceeds |
192 | - list( $limitSeconds, $logLevel ) = $this->findLimit( |
|
192 | + list($limitSeconds, $logLevel) = $this->findLimit( |
|
193 | 193 | $this->constraintCheckOnEntityDurationLimits, |
194 | 194 | $durationSeconds |
195 | 195 | ); |
196 | - if ( $limitSeconds === null ) { |
|
196 | + if ($limitSeconds === null) { |
|
197 | 197 | return; |
198 | 198 | } |
199 | 199 | |
200 | 200 | $this->logger->log( |
201 | 201 | $logLevel, |
202 | - 'Full constraint check on {entityId} ' . |
|
203 | - 'took longer than {limitSeconds} second(s) ' . |
|
202 | + 'Full constraint check on {entityId} '. |
|
203 | + 'took longer than {limitSeconds} second(s) '. |
|
204 | 204 | '(duration: {durationSeconds} seconds).', |
205 | 205 | [ |
206 | 206 | 'method' => $method, |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * |
219 | 219 | * @param EntityId $entityId |
220 | 220 | */ |
221 | - public function logCheckConstraintsCacheHit( EntityId $entityId ) { |
|
221 | + public function logCheckConstraintsCacheHit(EntityId $entityId) { |
|
222 | 222 | $this->dataFactory->increment( |
223 | 223 | 'wikibase.quality.constraints.cache.entity.hit' |
224 | 224 | ); |
@@ -229,10 +229,10 @@ discard block |
||
229 | 229 | * |
230 | 230 | * @param EntityId[] $entityIds |
231 | 231 | */ |
232 | - public function logCheckConstraintsCacheMisses( array $entityIds ) { |
|
232 | + public function logCheckConstraintsCacheMisses(array $entityIds) { |
|
233 | 233 | $this->dataFactory->updateCount( |
234 | 234 | 'wikibase.quality.constraints.cache.entity.miss', |
235 | - count( $entityIds ) |
|
235 | + count($entityIds) |
|
236 | 236 | ); |
237 | 237 | } |
238 | 238 | |
@@ -259,17 +259,17 @@ discard block |
||
259 | 259 | * @param EntityId[] $entityIds |
260 | 260 | * @param int $maxRevisionIds |
261 | 261 | */ |
262 | - public function logHugeDependencyMetadata( array $entityIds, $maxRevisionIds ) { |
|
262 | + public function logHugeDependencyMetadata(array $entityIds, $maxRevisionIds) { |
|
263 | 263 | $this->logger->log( |
264 | 264 | 'warning', |
265 | - 'Dependency metadata for constraint check result has huge set of entity IDs ' . |
|
266 | - '(count ' . count( $entityIds ) . ', limit ' . $maxRevisionIds . '); ' . |
|
265 | + 'Dependency metadata for constraint check result has huge set of entity IDs '. |
|
266 | + '(count '.count($entityIds).', limit '.$maxRevisionIds.'); '. |
|
267 | 267 | 'caching disabled for this check result.', |
268 | 268 | [ |
269 | 269 | 'loggingMethod' => __METHOD__, |
270 | 270 | 'entityIds' => json_encode( |
271 | 271 | array_map( |
272 | - function ( EntityId $entityId ) { |
|
272 | + function(EntityId $entityId) { |
|
273 | 273 | return $entityId->getSerialization(); |
274 | 274 | }, |
275 | 275 | $entityIds |
@@ -280,22 +280,22 @@ discard block |
||
280 | 280 | ); |
281 | 281 | } |
282 | 282 | |
283 | - public function logSparqlHelperTooManyRequestsRetryAfterPresent( ConvertibleTimestamp $retryAfterTime, MWHttpRequest $request ) { |
|
283 | + public function logSparqlHelperTooManyRequestsRetryAfterPresent(ConvertibleTimestamp $retryAfterTime, MWHttpRequest $request) { |
|
284 | 284 | $this->logger->notice( |
285 | 285 | 'Sparql API replied with status 429 and a retry-after header. Requesting to retry after {retryAfterTime}', |
286 | 286 | [ |
287 | 287 | 'retryAfterTime' => $retryAfterTime, |
288 | - 'responseHeaders' => json_encode( $request->getResponseHeaders() ), |
|
288 | + 'responseHeaders' => json_encode($request->getResponseHeaders()), |
|
289 | 289 | 'responseContent' => $request->getContent(), |
290 | 290 | ] |
291 | 291 | ); |
292 | 292 | } |
293 | 293 | |
294 | - public function logSparqlHelperTooManyRequestsRetryAfterInvalid( MWHttpRequest $request ) { |
|
294 | + public function logSparqlHelperTooManyRequestsRetryAfterInvalid(MWHttpRequest $request) { |
|
295 | 295 | $this->logger->warning( |
296 | 296 | 'Sparql API replied with status 429 and no valid retry-after header.', |
297 | 297 | [ |
298 | - 'responseHeaders' => json_encode( $request->getResponseHeaders() ), |
|
298 | + 'responseHeaders' => json_encode($request->getResponseHeaders()), |
|
299 | 299 | 'responseContent' => $request->getContent(), |
300 | 300 | ] |
301 | 301 | ); |
@@ -8,7 +8,7 @@ |
||
8 | 8 | class TooManySparqlRequestsException extends SparqlHelperException { |
9 | 9 | |
10 | 10 | public function __construct() { |
11 | - parent::__construct( 'The SPARQL query endpoint reports too many requests.' ); |
|
11 | + parent::__construct('The SPARQL query endpoint reports too many requests.'); |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | } |
@@ -9,8 +9,8 @@ |
||
9 | 9 | */ |
10 | 10 | class SparqlHelperException extends RuntimeException { |
11 | 11 | |
12 | - public function __construct( $msg = 'The SPARQL query endpoint returned an error.' ) { |
|
13 | - parent::__construct( $msg ); |
|
12 | + public function __construct($msg = 'The SPARQL query endpoint returned an error.') { |
|
13 | + parent::__construct($msg); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | } |
@@ -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 | } |