@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | * |
39 | 39 | * @throws InvalidArgumentException |
40 | 40 | */ |
41 | - public function __construct( $content, array $attributes = [], $isRawContent = false ) { |
|
42 | - Assert::parameterType( 'string', $content, '$content' ); |
|
43 | - Assert::parameterType( 'boolean', $isRawContent, '$isRawContent' ); |
|
41 | + public function __construct($content, array $attributes = [], $isRawContent = false) { |
|
42 | + Assert::parameterType('string', $content, '$content'); |
|
43 | + Assert::parameterType('boolean', $isRawContent, '$isRawContent'); |
|
44 | 44 | |
45 | 45 | $this->content = $content; |
46 | 46 | $this->attributes = $attributes; |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | * @return string HTML |
66 | 66 | */ |
67 | 67 | public function toHtml() { |
68 | - if ( $this->isRawContent ) { |
|
69 | - return Html::rawElement( 'td', $this->getAttributes(), $this->content ); |
|
68 | + if ($this->isRawContent) { |
|
69 | + return Html::rawElement('td', $this->getAttributes(), $this->content); |
|
70 | 70 | } else { |
71 | - return Html::element( 'td', $this->getAttributes(), $this->content ); |
|
71 | + return Html::element('td', $this->getAttributes(), $this->content); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 |
@@ -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,34 +122,34 @@ 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 jquery-tablesort'; |
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( 'tr' ); |
|
132 | - foreach ( $this->headers as $header ) { |
|
131 | + $html .= Html::openElement('tr'); |
|
132 | + foreach ($this->headers as $header) { |
|
133 | 133 | $html .= $header->toHtml(); |
134 | 134 | } |
135 | - $html .= Html::closeElement( 'tr' ); |
|
135 | + $html .= Html::closeElement('tr'); |
|
136 | 136 | |
137 | 137 | // Write rows |
138 | - foreach ( $this->rows as $row ) { |
|
139 | - $html .= Html::openElement( 'tr' ); |
|
138 | + foreach ($this->rows as $row) { |
|
139 | + $html .= Html::openElement('tr'); |
|
140 | 140 | |
141 | 141 | /** |
142 | 142 | * @var HtmlTableCellBuilder $cell |
143 | 143 | */ |
144 | - foreach ( $row as $cell ) { |
|
144 | + foreach ($row as $cell) { |
|
145 | 145 | $html .= $cell->toHtml(); |
146 | 146 | } |
147 | 147 | |
148 | - $html .= Html::closeElement( 'tr' ); |
|
148 | + $html .= Html::closeElement('tr'); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | // Close table |
152 | - $html .= Html::closeElement( 'table' ); |
|
152 | + $html .= Html::closeElement('table'); |
|
153 | 153 | |
154 | 154 | return $html; |
155 | 155 | } |
@@ -31,25 +31,25 @@ discard block |
||
31 | 31 | /** |
32 | 32 | * @param DatabaseUpdater $updater |
33 | 33 | */ |
34 | - public static function onCreateSchema( DatabaseUpdater $updater ) { |
|
34 | + public static function onCreateSchema(DatabaseUpdater $updater) { |
|
35 | 35 | $updater->addExtensionTable( |
36 | 36 | 'wbqc_constraints', |
37 | - __DIR__ . '/../sql/create_wbqc_constraints.sql' |
|
37 | + __DIR__.'/../sql/create_wbqc_constraints.sql' |
|
38 | 38 | ); |
39 | 39 | $updater->addExtensionField( |
40 | 40 | 'wbqc_constraints', |
41 | 41 | 'constraint_id', |
42 | - __DIR__ . '/../sql/patch-wbqc_constraints-constraint_id.sql' |
|
42 | + __DIR__.'/../sql/patch-wbqc_constraints-constraint_id.sql' |
|
43 | 43 | ); |
44 | 44 | $updater->addExtensionIndex( |
45 | 45 | 'wbqc_constraints', |
46 | 46 | 'wbqc_constraints_guid_uniq', |
47 | - __DIR__ . '/../sql/patch-wbqc_constraints-wbqc_constraints_guid_uniq.sql' |
|
47 | + __DIR__.'/../sql/patch-wbqc_constraints-wbqc_constraints_guid_uniq.sql' |
|
48 | 48 | ); |
49 | 49 | } |
50 | 50 | |
51 | - public static function onWikibaseChange( Change $change ) { |
|
52 | - if ( !( $change instanceof EntityChange ) ) { |
|
51 | + public static function onWikibaseChange(Change $change) { |
|
52 | + if (!($change instanceof EntityChange)) { |
|
53 | 53 | return; |
54 | 54 | } |
55 | 55 | |
@@ -58,44 +58,44 @@ discard block |
||
58 | 58 | |
59 | 59 | // If jobs are enabled and the results would be stored in some way run a job. |
60 | 60 | if ( |
61 | - $config->get( 'WBQualityConstraintsEnableConstraintsCheckJobs' ) && |
|
62 | - $config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) && |
|
61 | + $config->get('WBQualityConstraintsEnableConstraintsCheckJobs') && |
|
62 | + $config->get('WBQualityConstraintsCacheCheckConstraintsResults') && |
|
63 | 63 | self::isSelectedForJobRunBasedOnPercentage() |
64 | 64 | ) { |
65 | - $params = [ 'entityId' => $change->getEntityId()->getSerialization() ]; |
|
65 | + $params = ['entityId' => $change->getEntityId()->getSerialization()]; |
|
66 | 66 | JobQueueGroup::singleton()->push( |
67 | - new JobSpecification( CheckConstraintsJob::COMMAND, $params ) |
|
67 | + new JobSpecification(CheckConstraintsJob::COMMAND, $params) |
|
68 | 68 | ); |
69 | 69 | } |
70 | 70 | |
71 | - if ( $config->get( 'WBQualityConstraintsEnableConstraintsImportFromStatements' ) && |
|
72 | - self::isConstraintStatementsChange( $config, $change ) |
|
71 | + if ($config->get('WBQualityConstraintsEnableConstraintsImportFromStatements') && |
|
72 | + self::isConstraintStatementsChange($config, $change) |
|
73 | 73 | ) { |
74 | - $params = [ 'propertyId' => $change->getEntityId()->getSerialization() ]; |
|
74 | + $params = ['propertyId' => $change->getEntityId()->getSerialization()]; |
|
75 | 75 | JobQueueGroup::singleton()->push( |
76 | - new JobSpecification( 'constraintsTableUpdate', $params ) |
|
76 | + new JobSpecification('constraintsTableUpdate', $params) |
|
77 | 77 | ); |
78 | 78 | } |
79 | 79 | } |
80 | 80 | |
81 | 81 | private static function isSelectedForJobRunBasedOnPercentage() { |
82 | 82 | $config = MediaWikiServices::getInstance()->getMainConfig(); |
83 | - $percentage = $config->get( 'WBQualityConstraintsEnableConstraintsCheckJobsRatio' ); |
|
83 | + $percentage = $config->get('WBQualityConstraintsEnableConstraintsCheckJobsRatio'); |
|
84 | 84 | |
85 | - return mt_rand( 1, 100 ) <= $percentage; |
|
85 | + return mt_rand(1, 100) <= $percentage; |
|
86 | 86 | } |
87 | 87 | |
88 | - public static function isConstraintStatementsChange( Config $config, Change $change ) { |
|
89 | - if ( !( $change instanceof EntityChange ) || |
|
88 | + public static function isConstraintStatementsChange(Config $config, Change $change) { |
|
89 | + if (!($change instanceof EntityChange) || |
|
90 | 90 | $change->getAction() !== EntityChange::UPDATE || |
91 | - !( $change->getEntityId() instanceof PropertyId ) |
|
91 | + !($change->getEntityId() instanceof PropertyId) |
|
92 | 92 | ) { |
93 | 93 | return false; |
94 | 94 | } |
95 | 95 | |
96 | 96 | $info = $change->getInfo(); |
97 | 97 | |
98 | - if ( !array_key_exists( 'compactDiff', $info ) ) { |
|
98 | + if (!array_key_exists('compactDiff', $info)) { |
|
99 | 99 | // the non-compact diff ($info['diff']) does not contain statement diffs (T110996), |
100 | 100 | // so we only know that the change *might* affect the constraint statements |
101 | 101 | return true; |
@@ -104,46 +104,46 @@ discard block |
||
104 | 104 | /** @var EntityDiffChangedAspects $aspects */ |
105 | 105 | $aspects = $info['compactDiff']; |
106 | 106 | |
107 | - $propertyConstraintId = $config->get( 'WBQualityConstraintsPropertyConstraintId' ); |
|
108 | - return in_array( $propertyConstraintId, $aspects->getStatementChanges() ); |
|
107 | + $propertyConstraintId = $config->get('WBQualityConstraintsPropertyConstraintId'); |
|
108 | + return in_array($propertyConstraintId, $aspects->getStatementChanges()); |
|
109 | 109 | } |
110 | 110 | |
111 | - public static function onArticlePurge( WikiPage $wikiPage ) { |
|
111 | + public static function onArticlePurge(WikiPage $wikiPage) { |
|
112 | 112 | $repo = WikibaseRepo::getDefaultInstance(); |
113 | 113 | |
114 | 114 | $entityContentFactory = $repo->getEntityContentFactory(); |
115 | - if ( $entityContentFactory->isEntityContentModel( $wikiPage->getContentModel() ) ) { |
|
116 | - $entityId = $entityContentFactory->getEntityIdForTitle( $wikiPage->getTitle() ); |
|
117 | - if ( $entityId !== null ) { |
|
115 | + if ($entityContentFactory->isEntityContentModel($wikiPage->getContentModel())) { |
|
116 | + $entityId = $entityContentFactory->getEntityIdForTitle($wikiPage->getTitle()); |
|
117 | + if ($entityId !== null) { |
|
118 | 118 | $resultsCache = ResultsCache::getDefaultInstance(); |
119 | - $resultsCache->delete( $entityId ); |
|
119 | + $resultsCache->delete($entityId); |
|
120 | 120 | } |
121 | 121 | } |
122 | 122 | } |
123 | 123 | |
124 | - public static function onBeforePageDisplay( OutputPage $out, Skin $skin ) { |
|
124 | + public static function onBeforePageDisplay(OutputPage $out, Skin $skin) { |
|
125 | 125 | $repo = WikibaseRepo::getDefaultInstance(); |
126 | 126 | |
127 | 127 | $lookup = $repo->getEntityNamespaceLookup(); |
128 | 128 | $title = $out->getTitle(); |
129 | - if ( $title === null ) { |
|
129 | + if ($title === null) { |
|
130 | 130 | return; |
131 | 131 | } |
132 | 132 | |
133 | - if ( !$lookup->isEntityNamespace( $title->getNamespace() ) ) { |
|
133 | + if (!$lookup->isEntityNamespace($title->getNamespace())) { |
|
134 | 134 | return; |
135 | 135 | } |
136 | - if ( empty( $out->getJsConfigVars()['wbIsEditView'] ) ) { |
|
136 | + if (empty($out->getJsConfigVars()['wbIsEditView'])) { |
|
137 | 137 | return; |
138 | 138 | } |
139 | 139 | |
140 | - $out->addModules( 'wikibase.quality.constraints.suggestions' ); |
|
140 | + $out->addModules('wikibase.quality.constraints.suggestions'); |
|
141 | 141 | |
142 | - if ( !$out->getUser()->isLoggedIn() ) { |
|
142 | + if (!$out->getUser()->isLoggedIn()) { |
|
143 | 143 | return; |
144 | 144 | } |
145 | 145 | |
146 | - $out->addModules( 'wikibase.quality.constraints.gadget' ); |
|
146 | + $out->addModules('wikibase.quality.constraints.gadget'); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | /** |
@@ -152,10 +152,10 @@ discard block |
||
152 | 152 | * @param User $user |
153 | 153 | * @param array[] &$prefs |
154 | 154 | */ |
155 | - public static function onGetBetaFeaturePreferences( User $user, array &$prefs ) { |
|
155 | + public static function onGetBetaFeaturePreferences(User $user, array &$prefs) { |
|
156 | 156 | $config = MediaWikiServices::getInstance()->getMainConfig(); |
157 | - $extensionAssetsPath = $config->get( 'ExtensionAssetsPath' ); |
|
158 | - if ( $config->get( 'WBQualityConstraintsSuggestionsBetaFeature' ) ) { |
|
157 | + $extensionAssetsPath = $config->get('ExtensionAssetsPath'); |
|
158 | + if ($config->get('WBQualityConstraintsSuggestionsBetaFeature')) { |
|
159 | 159 | $prefs['constraint-suggestions'] = [ |
160 | 160 | 'label-message' => 'wbqc-beta-feature-label-message', |
161 | 161 | 'desc-message' => 'wbqc-beta-feature-description-message', |
@@ -179,20 +179,20 @@ discard block |
||
179 | 179 | * @param array &$vars |
180 | 180 | * @param OutputPage $out |
181 | 181 | */ |
182 | - public static function addVariables( &$vars, OutputPage $out ) { |
|
182 | + public static function addVariables(&$vars, OutputPage $out) { |
|
183 | 183 | $config = MediaWikiServices::getInstance()->getMainConfig(); |
184 | 184 | |
185 | - $vars['wbQualityConstraintsPropertyConstraintId'] = $config->get( 'WBQualityConstraintsPropertyConstraintId' ); |
|
186 | - $vars['wbQualityConstraintsOneOfConstraintId'] = $config->get( 'WBQualityConstraintsOneOfConstraintId' ); |
|
187 | - $vars['wbQualityConstraintsAllowedQualifierConstraintId'] = $config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' ); |
|
188 | - $vars['wbQualityConstraintsPropertyId'] = $config->get( 'WBQualityConstraintsPropertyId' ); |
|
189 | - $vars['wbQualityConstraintsQualifierOfPropertyConstraintId'] = $config->get( 'WBQualityConstraintsQualifierOfPropertyConstraintId' ); |
|
185 | + $vars['wbQualityConstraintsPropertyConstraintId'] = $config->get('WBQualityConstraintsPropertyConstraintId'); |
|
186 | + $vars['wbQualityConstraintsOneOfConstraintId'] = $config->get('WBQualityConstraintsOneOfConstraintId'); |
|
187 | + $vars['wbQualityConstraintsAllowedQualifierConstraintId'] = $config->get('WBQualityConstraintsAllowedQualifiersConstraintId'); |
|
188 | + $vars['wbQualityConstraintsPropertyId'] = $config->get('WBQualityConstraintsPropertyId'); |
|
189 | + $vars['wbQualityConstraintsQualifierOfPropertyConstraintId'] = $config->get('WBQualityConstraintsQualifierOfPropertyConstraintId'); |
|
190 | 190 | |
191 | 191 | $vars['wbQualityConstraintsSuggestionsGloballyEnabled'] = false; |
192 | 192 | |
193 | - if ( $config->get( 'WBQualityConstraintsSuggestionsBetaFeature' ) && |
|
194 | - ExtensionRegistry::getInstance()->isLoaded( 'BetaFeatures' ) && |
|
195 | - BetaFeatures::isFeatureEnabled( $out->getUser(), 'constraint-suggestions' ) |
|
193 | + if ($config->get('WBQualityConstraintsSuggestionsBetaFeature') && |
|
194 | + ExtensionRegistry::getInstance()->isLoaded('BetaFeatures') && |
|
195 | + BetaFeatures::isFeatureEnabled($out->getUser(), 'constraint-suggestions') |
|
196 | 196 | ) { |
197 | 197 | $vars['wbQualityConstraintsSuggestionsGloballyEnabled'] = true; |
198 | 198 | } |
@@ -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 | [] |
@@ -76,6 +76,7 @@ |
||
76 | 76 | |
77 | 77 | /** |
78 | 78 | * @param string the converted $cacheId |
79 | + * @param string $cacheId |
|
79 | 80 | * |
80 | 81 | * @return boolean representing if the Lock is Locked |
81 | 82 | * |
@@ -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 | ); |
@@ -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,44 +130,44 @@ 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 | - $start1 = microtime( true ); |
|
136 | - $isSubclass = $this->isSubclassOf( $comparativeClass, $classesToCheck ); |
|
137 | - $end1 = microtime( true ); |
|
135 | + $start1 = microtime(true); |
|
136 | + $isSubclass = $this->isSubclassOf($comparativeClass, $classesToCheck); |
|
137 | + $end1 = microtime(true); |
|
138 | 138 | $this->dataFactory->timing( |
139 | 139 | 'wikibase.quality.constraints.type.php.success.timing', |
140 | - ( $end1 - $start1 ) * 1000 |
|
140 | + ($end1 - $start1) * 1000 |
|
141 | 141 | ); |
142 | 142 | |
143 | - return new CachedBool( $isSubclass, Metadata::blank() ); |
|
144 | - } catch ( OverflowException $e ) { |
|
145 | - $end1 = microtime( true ); |
|
143 | + return new CachedBool($isSubclass, Metadata::blank()); |
|
144 | + } catch (OverflowException $e) { |
|
145 | + $end1 = microtime(true); |
|
146 | 146 | $this->dataFactory->timing( |
147 | 147 | 'wikibase.quality.constraints.type.php.overflow.timing', |
148 | - ( $end1 - $start1 ) * 1000 |
|
148 | + ($end1 - $start1) * 1000 |
|
149 | 149 | ); |
150 | 150 | |
151 | - if ( !( $this->sparqlHelper instanceof DummySparqlHelper ) ) { |
|
151 | + if (!($this->sparqlHelper instanceof DummySparqlHelper)) { |
|
152 | 152 | $this->dataFactory->increment( |
153 | 153 | 'wikibase.quality.constraints.sparql.typeFallback' |
154 | 154 | ); |
155 | 155 | |
156 | - $start2 = microtime( true ); |
|
156 | + $start2 = microtime(true); |
|
157 | 157 | $hasType = $this->sparqlHelper->hasType( |
158 | 158 | $comparativeClass->getSerialization(), |
159 | 159 | $classesToCheck, |
160 | 160 | /* withInstance = */ false |
161 | 161 | ); |
162 | - $end2 = microtime( true ); |
|
162 | + $end2 = microtime(true); |
|
163 | 163 | $this->dataFactory->timing( |
164 | 164 | 'wikibase.quality.constraints.type.sparql.success.timing', |
165 | - ( $end2 - $start2 ) * 1000 |
|
165 | + ($end2 - $start2) * 1000 |
|
166 | 166 | ); |
167 | 167 | |
168 | 168 | return $hasType; |
169 | 169 | } else { |
170 | - return new CachedBool( false, Metadata::blank() ); |
|
170 | + return new CachedBool(false, Metadata::blank()); |
|
171 | 171 | } |
172 | 172 | } |
173 | 173 | } |
@@ -185,13 +185,13 @@ discard block |
||
185 | 185 | * @return CachedBool |
186 | 186 | * @throws SparqlHelperException if SPARQL is used and the query times out or some other error occurs |
187 | 187 | */ |
188 | - public function hasClassInRelation( StatementList $statements, array $relationIds, array $classesToCheck ) { |
|
188 | + public function hasClassInRelation(StatementList $statements, array $relationIds, array $classesToCheck) { |
|
189 | 189 | $metadatas = []; |
190 | 190 | |
191 | - foreach ( $this->getStatementsByPropertyIds( $statements, $relationIds ) as $statement ) { |
|
191 | + foreach ($this->getStatementsByPropertyIds($statements, $relationIds) as $statement) { |
|
192 | 192 | $mainSnak = $statement->getMainSnak(); |
193 | 193 | |
194 | - if ( !$this->hasCorrectType( $mainSnak ) ) { |
|
194 | + if (!$this->hasCorrectType($mainSnak)) { |
|
195 | 195 | continue; |
196 | 196 | } |
197 | 197 | /** @var PropertyValueSnak $mainSnak */ |
@@ -200,28 +200,28 @@ discard block |
||
200 | 200 | $dataValue = $mainSnak->getDataValue(); |
201 | 201 | $comparativeClass = $dataValue->getEntityId(); |
202 | 202 | |
203 | - if ( in_array( $comparativeClass->getSerialization(), $classesToCheck ) ) { |
|
203 | + if (in_array($comparativeClass->getSerialization(), $classesToCheck)) { |
|
204 | 204 | // discard $metadatas, we know this is fresh |
205 | - return new CachedBool( true, Metadata::blank() ); |
|
205 | + return new CachedBool(true, Metadata::blank()); |
|
206 | 206 | } |
207 | 207 | |
208 | - $result = $this->isSubclassOfWithSparqlFallback( $comparativeClass, $classesToCheck ); |
|
208 | + $result = $this->isSubclassOfWithSparqlFallback($comparativeClass, $classesToCheck); |
|
209 | 209 | $metadatas[] = $result->getMetadata(); |
210 | - if ( $result->getBool() ) { |
|
210 | + if ($result->getBool()) { |
|
211 | 211 | return new CachedBool( |
212 | 212 | true, |
213 | - Metadata::merge( $metadatas ) |
|
213 | + Metadata::merge($metadatas) |
|
214 | 214 | ); |
215 | 215 | } |
216 | 216 | } |
217 | 217 | |
218 | 218 | return new CachedBool( |
219 | 219 | false, |
220 | - Metadata::merge( $metadatas ) |
|
220 | + Metadata::merge($metadatas) |
|
221 | 221 | ); |
222 | 222 | } |
223 | 223 | |
224 | - private function hasCorrectType( Snak $mainSnak ) { |
|
224 | + private function hasCorrectType(Snak $mainSnak) { |
|
225 | 225 | return $mainSnak instanceof PropertyValueSnak |
226 | 226 | && $mainSnak->getDataValue()->getType() === 'wikibase-entityid'; |
227 | 227 | } |
@@ -238,12 +238,12 @@ discard block |
||
238 | 238 | ) { |
239 | 239 | $statementArrays = []; |
240 | 240 | |
241 | - foreach ( $propertyIdSerializations as $propertyIdSerialization ) { |
|
242 | - $propertyId = new PropertyId( $propertyIdSerialization ); |
|
243 | - $statementArrays[] = $statements->getByPropertyId( $propertyId )->toArray(); |
|
241 | + foreach ($propertyIdSerializations as $propertyIdSerialization) { |
|
242 | + $propertyId = new PropertyId($propertyIdSerialization); |
|
243 | + $statementArrays[] = $statements->getByPropertyId($propertyId)->toArray(); |
|
244 | 244 | } |
245 | 245 | |
246 | - return call_user_func_array( 'array_merge', $statementArrays ); |
|
246 | + return call_user_func_array('array_merge', $statementArrays); |
|
247 | 247 | } |
248 | 248 | |
249 | 249 | /** |
@@ -255,10 +255,10 @@ discard block |
||
255 | 255 | * |
256 | 256 | * @return ViolationMessage |
257 | 257 | */ |
258 | - public function getViolationMessage( PropertyId $propertyId, EntityId $entityId, array $classes, $checker, $relation ) { |
|
258 | + public function getViolationMessage(PropertyId $propertyId, EntityId $entityId, array $classes, $checker, $relation) { |
|
259 | 259 | $classes = array_map( |
260 | - function( $itemIdSerialization ) { |
|
261 | - return new ItemId( $itemIdSerialization ); |
|
260 | + function($itemIdSerialization) { |
|
261 | + return new ItemId($itemIdSerialization); |
|
262 | 262 | }, |
263 | 263 | $classes |
264 | 264 | ); |
@@ -270,10 +270,10 @@ discard block |
||
270 | 270 | // wbqc-violation-message-valueType-instance |
271 | 271 | // wbqc-violation-message-valueType-subclass |
272 | 272 | // wbqc-violation-message-valueType-instanceOrSubclass |
273 | - return ( new ViolationMessage( 'wbqc-violation-message-' . $checker . '-' . $relation ) ) |
|
274 | - ->withEntityId( $propertyId, Role::CONSTRAINT_PROPERTY ) |
|
275 | - ->withEntityId( $entityId, Role::SUBJECT ) |
|
276 | - ->withEntityIdList( $classes, Role::OBJECT ); |
|
273 | + return (new ViolationMessage('wbqc-violation-message-'.$checker.'-'.$relation)) |
|
274 | + ->withEntityId($propertyId, Role::CONSTRAINT_PROPERTY) |
|
275 | + ->withEntityId($entityId, Role::SUBJECT) |
|
276 | + ->withEntityIdList($classes, Role::OBJECT); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | } |
@@ -161,18 +161,18 @@ discard block |
||
161 | 161 | $this->loggingHelper = $loggingHelper; |
162 | 162 | $this->defaultUserAgent = $defaultUserAgent; |
163 | 163 | $this->requestFactory = $requestFactory; |
164 | - $this->entityPrefix = $rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY ); |
|
164 | + $this->entityPrefix = $rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY); |
|
165 | 165 | $this->prefixes = <<<EOT |
166 | -PREFIX wd: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY )}> |
|
167 | -PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}> |
|
168 | -PREFIX wdt: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_DIRECT_CLAIM )}> |
|
169 | -PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}> |
|
170 | -PREFIX p: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM )}> |
|
171 | -PREFIX ps: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM_STATEMENT )}> |
|
172 | -PREFIX pq: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER )}> |
|
173 | -PREFIX pqv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER_VALUE )}> |
|
174 | -PREFIX pr: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE )}> |
|
175 | -PREFIX prv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE_VALUE )}> |
|
166 | +PREFIX wd: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY)}> |
|
167 | +PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}> |
|
168 | +PREFIX wdt: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_DIRECT_CLAIM)}> |
|
169 | +PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}> |
|
170 | +PREFIX p: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM)}> |
|
171 | +PREFIX ps: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM_STATEMENT)}> |
|
172 | +PREFIX pq: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER)}> |
|
173 | +PREFIX pqv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER_VALUE)}> |
|
174 | +PREFIX pr: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE)}> |
|
175 | +PREFIX prv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE_VALUE)}> |
|
176 | 176 | PREFIX wikibase: <http://wikiba.se/ontology#> |
177 | 177 | PREFIX wikibase-beta: <http://wikiba.se/ontology-beta#> |
178 | 178 | EOT; |
@@ -187,21 +187,21 @@ discard block |
||
187 | 187 | * @return CachedBool |
188 | 188 | * @throws SparqlHelperException if the query times out or some other error occurs |
189 | 189 | */ |
190 | - public function hasType( $id, array $classes, $withInstance ) { |
|
191 | - $instanceOfId = $this->config->get( 'WBQualityConstraintsInstanceOfId' ); |
|
192 | - $subclassOfId = $this->config->get( 'WBQualityConstraintsSubclassOfId' ); |
|
190 | + public function hasType($id, array $classes, $withInstance) { |
|
191 | + $instanceOfId = $this->config->get('WBQualityConstraintsInstanceOfId'); |
|
192 | + $subclassOfId = $this->config->get('WBQualityConstraintsSubclassOfId'); |
|
193 | 193 | |
194 | - $path = ( $withInstance ? "wdt:$instanceOfId/" : "" ) . "wdt:$subclassOfId*"; |
|
194 | + $path = ($withInstance ? "wdt:$instanceOfId/" : "")."wdt:$subclassOfId*"; |
|
195 | 195 | |
196 | 196 | $metadatas = []; |
197 | 197 | |
198 | - foreach ( array_chunk( $classes, 20 ) as $classesChunk ) { |
|
199 | - $classesValues = implode( ' ', array_map( |
|
200 | - function( $class ) { |
|
201 | - return 'wd:' . $class; |
|
198 | + foreach (array_chunk($classes, 20) as $classesChunk) { |
|
199 | + $classesValues = implode(' ', array_map( |
|
200 | + function($class) { |
|
201 | + return 'wd:'.$class; |
|
202 | 202 | }, |
203 | 203 | $classesChunk |
204 | - ) ); |
|
204 | + )); |
|
205 | 205 | |
206 | 206 | $query = <<<EOF |
207 | 207 | ASK { |
@@ -212,19 +212,19 @@ discard block |
||
212 | 212 | EOF; |
213 | 213 | // TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually |
214 | 214 | |
215 | - $result = $this->runQuery( $query ); |
|
215 | + $result = $this->runQuery($query); |
|
216 | 216 | $metadatas[] = $result->getMetadata(); |
217 | - if ( $result->getArray()['boolean'] ) { |
|
217 | + if ($result->getArray()['boolean']) { |
|
218 | 218 | return new CachedBool( |
219 | 219 | true, |
220 | - Metadata::merge( $metadatas ) |
|
220 | + Metadata::merge($metadatas) |
|
221 | 221 | ); |
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
225 | 225 | return new CachedBool( |
226 | 226 | false, |
227 | - Metadata::merge( $metadatas ) |
|
227 | + Metadata::merge($metadatas) |
|
228 | 228 | ); |
229 | 229 | } |
230 | 230 | |
@@ -240,10 +240,10 @@ discard block |
||
240 | 240 | $ignoreDeprecatedStatements |
241 | 241 | ) { |
242 | 242 | $pid = $statement->getPropertyId()->serialize(); |
243 | - $guid = str_replace( '$', '-', $statement->getGuid() ); |
|
243 | + $guid = str_replace('$', '-', $statement->getGuid()); |
|
244 | 244 | |
245 | 245 | $deprecatedFilter = ''; |
246 | - if ( $ignoreDeprecatedStatements ) { |
|
246 | + if ($ignoreDeprecatedStatements) { |
|
247 | 247 | $deprecatedFilter .= 'MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }'; |
248 | 248 | $deprecatedFilter .= 'MINUS { ?otherStatement wikibase-beta:rank wikibase-beta:DeprecatedRank. }'; |
249 | 249 | } |
@@ -263,9 +263,9 @@ discard block |
||
263 | 263 | LIMIT 10 |
264 | 264 | EOF; |
265 | 265 | |
266 | - $result = $this->runQuery( $query ); |
|
266 | + $result = $this->runQuery($query); |
|
267 | 267 | |
268 | - return $this->getOtherEntities( $result ); |
|
268 | + return $this->getOtherEntities($result); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | /** |
@@ -290,16 +290,15 @@ discard block |
||
290 | 290 | $dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty( |
291 | 291 | $snak->getPropertyId() |
292 | 292 | ); |
293 | - list( $value, $isFullValue ) = $this->getRdfLiteral( $dataType, $dataValue ); |
|
294 | - if ( $isFullValue ) { |
|
293 | + list($value, $isFullValue) = $this->getRdfLiteral($dataType, $dataValue); |
|
294 | + if ($isFullValue) { |
|
295 | 295 | $prefix .= 'v'; |
296 | 296 | } |
297 | 297 | $path = $type === Context::TYPE_QUALIFIER ? |
298 | - "$prefix:$pid" : |
|
299 | - "prov:wasDerivedFrom/$prefix:$pid"; |
|
298 | + "$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid"; |
|
300 | 299 | |
301 | 300 | $deprecatedFilter = ''; |
302 | - if ( $ignoreDeprecatedStatements ) { |
|
301 | + if ($ignoreDeprecatedStatements) { |
|
303 | 302 | $deprecatedFilter = <<< EOF |
304 | 303 | MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. } |
305 | 304 | MINUS { ?otherStatement wikibase-beta:rank wikibase-beta:DeprecatedRank. } |
@@ -320,9 +319,9 @@ discard block |
||
320 | 319 | LIMIT 10 |
321 | 320 | EOF; |
322 | 321 | |
323 | - $result = $this->runQuery( $query ); |
|
322 | + $result = $this->runQuery($query); |
|
324 | 323 | |
325 | - return $this->getOtherEntities( $result ); |
|
324 | + return $this->getOtherEntities($result); |
|
326 | 325 | } |
327 | 326 | |
328 | 327 | /** |
@@ -332,8 +331,8 @@ discard block |
||
332 | 331 | * |
333 | 332 | * @return string |
334 | 333 | */ |
335 | - private function stringLiteral( $text ) { |
|
336 | - return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"'; |
|
334 | + private function stringLiteral($text) { |
|
335 | + return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"'; |
|
337 | 336 | } |
338 | 337 | |
339 | 338 | /** |
@@ -343,17 +342,17 @@ discard block |
||
343 | 342 | * |
344 | 343 | * @return CachedEntityIds |
345 | 344 | */ |
346 | - private function getOtherEntities( CachedQueryResults $results ) { |
|
347 | - return new CachedEntityIds( array_map( |
|
348 | - function ( $resultBindings ) { |
|
345 | + private function getOtherEntities(CachedQueryResults $results) { |
|
346 | + return new CachedEntityIds(array_map( |
|
347 | + function($resultBindings) { |
|
349 | 348 | $entityIRI = $resultBindings['otherEntity']['value']; |
350 | - $entityPrefixLength = strlen( $this->entityPrefix ); |
|
351 | - if ( substr( $entityIRI, 0, $entityPrefixLength ) === $this->entityPrefix ) { |
|
349 | + $entityPrefixLength = strlen($this->entityPrefix); |
|
350 | + if (substr($entityIRI, 0, $entityPrefixLength) === $this->entityPrefix) { |
|
352 | 351 | try { |
353 | 352 | return $this->entityIdParser->parse( |
354 | - substr( $entityIRI, $entityPrefixLength ) |
|
353 | + substr($entityIRI, $entityPrefixLength) |
|
355 | 354 | ); |
356 | - } catch ( EntityIdParsingException $e ) { |
|
355 | + } catch (EntityIdParsingException $e) { |
|
357 | 356 | // fall through |
358 | 357 | } |
359 | 358 | } |
@@ -361,7 +360,7 @@ discard block |
||
361 | 360 | return null; |
362 | 361 | }, |
363 | 362 | $results->getArray()['results']['bindings'] |
364 | - ), $results->getMetadata() ); |
|
363 | + ), $results->getMetadata()); |
|
365 | 364 | } |
366 | 365 | |
367 | 366 | // @codingStandardsIgnoreStart cyclomatic complexity of this function is too high |
@@ -374,47 +373,47 @@ discard block |
||
374 | 373 | * @return array the literal or IRI as a string in SPARQL syntax, |
375 | 374 | * and a boolean indicating whether it refers to a full value node or not |
376 | 375 | */ |
377 | - private function getRdfLiteral( $dataType, DataValue $dataValue ) { |
|
378 | - switch ( $dataType ) { |
|
376 | + private function getRdfLiteral($dataType, DataValue $dataValue) { |
|
377 | + switch ($dataType) { |
|
379 | 378 | case 'string': |
380 | 379 | case 'external-id': |
381 | - return [ $this->stringLiteral( $dataValue->getValue() ), false ]; |
|
380 | + return [$this->stringLiteral($dataValue->getValue()), false]; |
|
382 | 381 | case 'commonsMedia': |
383 | - $url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() ); |
|
384 | - return [ '<' . $url . '>', false ]; |
|
382 | + $url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue()); |
|
383 | + return ['<'.$url.'>', false]; |
|
385 | 384 | case 'geo-shape': |
386 | - $url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() ); |
|
387 | - return [ '<' . $url . '>', false ]; |
|
385 | + $url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue()); |
|
386 | + return ['<'.$url.'>', false]; |
|
388 | 387 | case 'tabular-data': |
389 | - $url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() ); |
|
390 | - return [ '<' . $url . '>', false ]; |
|
388 | + $url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue()); |
|
389 | + return ['<'.$url.'>', false]; |
|
391 | 390 | case 'url': |
392 | 391 | $url = $dataValue->getValue(); |
393 | - if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) { |
|
392 | + if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) { |
|
394 | 393 | // not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF) |
395 | 394 | // such an URL should never reach us, so just throw |
396 | - throw new InvalidArgumentException( 'invalid URL: ' . $url ); |
|
395 | + throw new InvalidArgumentException('invalid URL: '.$url); |
|
397 | 396 | } |
398 | - return [ '<' . $url . '>', false ]; |
|
397 | + return ['<'.$url.'>', false]; |
|
399 | 398 | case 'wikibase-item': |
400 | 399 | case 'wikibase-property': |
401 | 400 | /** @var EntityIdValue $dataValue */ |
402 | - return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ]; |
|
401 | + return ['wd:'.$dataValue->getEntityId()->getSerialization(), false]; |
|
403 | 402 | case 'monolingualtext': |
404 | 403 | /** @var MonolingualTextValue $dataValue */ |
405 | 404 | $lang = $dataValue->getLanguageCode(); |
406 | - if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) { |
|
405 | + if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) { |
|
407 | 406 | // not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG) |
408 | 407 | // such a language tag should never reach us, so just throw |
409 | - throw new InvalidArgumentException( 'invalid language tag: ' . $lang ); |
|
408 | + throw new InvalidArgumentException('invalid language tag: '.$lang); |
|
410 | 409 | } |
411 | - return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ]; |
|
410 | + return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false]; |
|
412 | 411 | case 'globe-coordinate': |
413 | 412 | case 'quantity': |
414 | 413 | case 'time': |
415 | - return [ 'wdv:' . $dataValue->getHash(), true ]; |
|
414 | + return ['wdv:'.$dataValue->getHash(), true]; |
|
416 | 415 | default: |
417 | - throw new InvalidArgumentException( 'unknown data type: ' . $dataType ); |
|
416 | + throw new InvalidArgumentException('unknown data type: '.$dataType); |
|
418 | 417 | } |
419 | 418 | } |
420 | 419 | // @codingStandardsIgnoreEnd |
@@ -427,44 +426,44 @@ discard block |
||
427 | 426 | * @throws SparqlHelperException if the query times out or some other error occurs |
428 | 427 | * @throws ConstraintParameterException if the $regex is invalid |
429 | 428 | */ |
430 | - public function matchesRegularExpression( $text, $regex ) { |
|
429 | + public function matchesRegularExpression($text, $regex) { |
|
431 | 430 | // caching wrapper around matchesRegularExpressionWithSparql |
432 | 431 | |
433 | - $textHash = hash( 'sha256', $text ); |
|
432 | + $textHash = hash('sha256', $text); |
|
434 | 433 | $cacheKey = $this->cache->makeKey( |
435 | 434 | 'WikibaseQualityConstraints', // extension |
436 | 435 | 'regex', // action |
437 | 436 | 'WDQS-Java', // regex flavor |
438 | - hash( 'sha256', $regex ) |
|
437 | + hash('sha256', $regex) |
|
439 | 438 | ); |
440 | - $cacheMapSize = $this->config->get( 'WBQualityConstraintsFormatCacheMapSize' ); |
|
439 | + $cacheMapSize = $this->config->get('WBQualityConstraintsFormatCacheMapSize'); |
|
441 | 440 | |
442 | 441 | $cacheMapArray = $this->cache->getWithSetCallback( |
443 | 442 | $cacheKey, |
444 | 443 | WANObjectCache::TTL_DAY, |
445 | - function( $cacheMapArray ) use ( $text, $regex, $textHash, $cacheMapSize ) { |
|
444 | + function($cacheMapArray) use ($text, $regex, $textHash, $cacheMapSize) { |
|
446 | 445 | // Initialize the cache map if not set |
447 | - if ( $cacheMapArray === false ) { |
|
446 | + if ($cacheMapArray === false) { |
|
448 | 447 | $key = 'wikibase.quality.constraints.regex.cache.refresh.init'; |
449 | - $this->dataFactory->increment( $key ); |
|
448 | + $this->dataFactory->increment($key); |
|
450 | 449 | return []; |
451 | 450 | } |
452 | 451 | |
453 | 452 | $key = 'wikibase.quality.constraints.regex.cache.refresh'; |
454 | - $this->dataFactory->increment( $key ); |
|
455 | - $cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $cacheMapSize ); |
|
456 | - if ( $cacheMap->has( $textHash ) ) { |
|
453 | + $this->dataFactory->increment($key); |
|
454 | + $cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $cacheMapSize); |
|
455 | + if ($cacheMap->has($textHash)) { |
|
457 | 456 | $key = 'wikibase.quality.constraints.regex.cache.refresh.hit'; |
458 | - $this->dataFactory->increment( $key ); |
|
459 | - $cacheMap->get( $textHash ); // ping cache |
|
457 | + $this->dataFactory->increment($key); |
|
458 | + $cacheMap->get($textHash); // ping cache |
|
460 | 459 | } else { |
461 | 460 | $key = 'wikibase.quality.constraints.regex.cache.refresh.miss'; |
462 | - $this->dataFactory->increment( $key ); |
|
461 | + $this->dataFactory->increment($key); |
|
463 | 462 | try { |
464 | - $matches = $this->matchesRegularExpressionWithSparql( $text, $regex ); |
|
465 | - } catch ( ConstraintParameterException $e ) { |
|
466 | - $matches = $this->serializeConstraintParameterException( $e ); |
|
467 | - } catch ( SparqlHelperException $e ) { |
|
463 | + $matches = $this->matchesRegularExpressionWithSparql($text, $regex); |
|
464 | + } catch (ConstraintParameterException $e) { |
|
465 | + $matches = $this->serializeConstraintParameterException($e); |
|
466 | + } catch (SparqlHelperException $e) { |
|
468 | 467 | // don’t cache this |
469 | 468 | return $cacheMap->toArray(); |
470 | 469 | } |
@@ -488,42 +487,42 @@ discard block |
||
488 | 487 | ] |
489 | 488 | ); |
490 | 489 | |
491 | - if ( isset( $cacheMapArray[$textHash] ) ) { |
|
490 | + if (isset($cacheMapArray[$textHash])) { |
|
492 | 491 | $key = 'wikibase.quality.constraints.regex.cache.hit'; |
493 | - $this->dataFactory->increment( $key ); |
|
492 | + $this->dataFactory->increment($key); |
|
494 | 493 | $matches = $cacheMapArray[$textHash]; |
495 | - if ( is_bool( $matches ) ) { |
|
494 | + if (is_bool($matches)) { |
|
496 | 495 | return $matches; |
497 | - } elseif ( is_array( $matches ) && |
|
498 | - $matches['type'] == ConstraintParameterException::class ) { |
|
499 | - throw $this->deserializeConstraintParameterException( $matches ); |
|
496 | + } elseif (is_array($matches) && |
|
497 | + $matches['type'] == ConstraintParameterException::class) { |
|
498 | + throw $this->deserializeConstraintParameterException($matches); |
|
500 | 499 | } else { |
501 | 500 | throw new MWException( |
502 | - 'Value of unknown type in object cache (' . |
|
503 | - 'cache key: ' . $cacheKey . ', ' . |
|
504 | - 'cache map key: ' . $textHash . ', ' . |
|
505 | - 'value type: ' . gettype( $matches ) . ')' |
|
501 | + 'Value of unknown type in object cache ('. |
|
502 | + 'cache key: '.$cacheKey.', '. |
|
503 | + 'cache map key: '.$textHash.', '. |
|
504 | + 'value type: '.gettype($matches).')' |
|
506 | 505 | ); |
507 | 506 | } |
508 | 507 | } else { |
509 | 508 | $key = 'wikibase.quality.constraints.regex.cache.miss'; |
510 | - $this->dataFactory->increment( $key ); |
|
511 | - return $this->matchesRegularExpressionWithSparql( $text, $regex ); |
|
509 | + $this->dataFactory->increment($key); |
|
510 | + return $this->matchesRegularExpressionWithSparql($text, $regex); |
|
512 | 511 | } |
513 | 512 | } |
514 | 513 | |
515 | - private function serializeConstraintParameterException( ConstraintParameterException $cpe ) { |
|
514 | + private function serializeConstraintParameterException(ConstraintParameterException $cpe) { |
|
516 | 515 | return [ |
517 | 516 | 'type' => ConstraintParameterException::class, |
518 | - 'violationMessage' => $this->violationMessageSerializer->serialize( $cpe->getViolationMessage() ), |
|
517 | + 'violationMessage' => $this->violationMessageSerializer->serialize($cpe->getViolationMessage()), |
|
519 | 518 | ]; |
520 | 519 | } |
521 | 520 | |
522 | - private function deserializeConstraintParameterException( array $serialization ) { |
|
521 | + private function deserializeConstraintParameterException(array $serialization) { |
|
523 | 522 | $message = $this->violationMessageDeserializer->deserialize( |
524 | 523 | $serialization['violationMessage'] |
525 | 524 | ); |
526 | - return new ConstraintParameterException( $message ); |
|
525 | + return new ConstraintParameterException($message); |
|
527 | 526 | } |
528 | 527 | |
529 | 528 | /** |
@@ -537,25 +536,25 @@ discard block |
||
537 | 536 | * @throws SparqlHelperException if the query times out or some other error occurs |
538 | 537 | * @throws ConstraintParameterException if the $regex is invalid |
539 | 538 | */ |
540 | - public function matchesRegularExpressionWithSparql( $text, $regex ) { |
|
541 | - $textStringLiteral = $this->stringLiteral( $text ); |
|
542 | - $regexStringLiteral = $this->stringLiteral( '^(?:' . $regex . ')$' ); |
|
539 | + public function matchesRegularExpressionWithSparql($text, $regex) { |
|
540 | + $textStringLiteral = $this->stringLiteral($text); |
|
541 | + $regexStringLiteral = $this->stringLiteral('^(?:'.$regex.')$'); |
|
543 | 542 | |
544 | 543 | $query = <<<EOF |
545 | 544 | SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {} |
546 | 545 | EOF; |
547 | 546 | |
548 | - $result = $this->runQuery( $query, false ); |
|
547 | + $result = $this->runQuery($query, false); |
|
549 | 548 | |
550 | 549 | $vars = $result->getArray()['results']['bindings'][0]; |
551 | - if ( array_key_exists( 'matches', $vars ) ) { |
|
550 | + if (array_key_exists('matches', $vars)) { |
|
552 | 551 | // true or false ⇒ regex okay, text matches or not |
553 | 552 | return $vars['matches']['value'] === 'true'; |
554 | 553 | } else { |
555 | 554 | // empty result: regex broken |
556 | 555 | throw new ConstraintParameterException( |
557 | - ( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) ) |
|
558 | - ->withInlineCode( $regex, Role::CONSTRAINT_PARAMETER_VALUE ) |
|
556 | + (new ViolationMessage('wbqc-violation-message-parameter-regex')) |
|
557 | + ->withInlineCode($regex, Role::CONSTRAINT_PARAMETER_VALUE) |
|
559 | 558 | ); |
560 | 559 | } |
561 | 560 | } |
@@ -567,14 +566,14 @@ discard block |
||
567 | 566 | * |
568 | 567 | * @return boolean |
569 | 568 | */ |
570 | - public function isTimeout( $responseContent ) { |
|
571 | - $timeoutRegex = implode( '|', array_map( |
|
572 | - function ( $fqn ) { |
|
573 | - return preg_quote( $fqn, '/' ); |
|
569 | + public function isTimeout($responseContent) { |
|
570 | + $timeoutRegex = implode('|', array_map( |
|
571 | + function($fqn) { |
|
572 | + return preg_quote($fqn, '/'); |
|
574 | 573 | }, |
575 | - $this->config->get( 'WBQualityConstraintsSparqlTimeoutExceptionClasses' ) |
|
576 | - ) ); |
|
577 | - return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent ); |
|
574 | + $this->config->get('WBQualityConstraintsSparqlTimeoutExceptionClasses') |
|
575 | + )); |
|
576 | + return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent); |
|
578 | 577 | } |
579 | 578 | |
580 | 579 | /** |
@@ -586,17 +585,17 @@ discard block |
||
586 | 585 | * @return int|boolean the max-age (in seconds) |
587 | 586 | * or a plain boolean if no max-age can be determined |
588 | 587 | */ |
589 | - public function getCacheMaxAge( $responseHeaders ) { |
|
588 | + public function getCacheMaxAge($responseHeaders) { |
|
590 | 589 | if ( |
591 | - array_key_exists( 'x-cache-status', $responseHeaders ) && |
|
592 | - preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] ) |
|
590 | + array_key_exists('x-cache-status', $responseHeaders) && |
|
591 | + preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0]) |
|
593 | 592 | ) { |
594 | 593 | $maxage = []; |
595 | 594 | if ( |
596 | - array_key_exists( 'cache-control', $responseHeaders ) && |
|
597 | - preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage ) |
|
595 | + array_key_exists('cache-control', $responseHeaders) && |
|
596 | + preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage) |
|
598 | 597 | ) { |
599 | - return intval( $maxage[1] ); |
|
598 | + return intval($maxage[1]); |
|
600 | 599 | } else { |
601 | 600 | return true; |
602 | 601 | } |
@@ -618,33 +617,33 @@ discard block |
||
618 | 617 | * or SparlHelper::INVALID_RETRY_AFTER if there is something wrong with the format |
619 | 618 | * |
620 | 619 | */ |
621 | - public function getThrottling( array $responseHeaders ) { |
|
622 | - if ( !array_key_exists( 'Retry-After', $responseHeaders ) ) { |
|
620 | + public function getThrottling(array $responseHeaders) { |
|
621 | + if (!array_key_exists('Retry-After', $responseHeaders)) { |
|
623 | 622 | return self::NO_RETRY_AFTER; |
624 | 623 | } |
625 | 624 | |
626 | - $trimmedRetryAfterValue = trim( $responseHeaders[ 'Retry-After' ] ); |
|
627 | - if ( empty( $trimmedRetryAfterValue ) ) { |
|
625 | + $trimmedRetryAfterValue = trim($responseHeaders['Retry-After']); |
|
626 | + if (empty($trimmedRetryAfterValue)) { |
|
628 | 627 | return self::EMPTY_RETRY_AFTER; |
629 | 628 | } |
630 | 629 | |
631 | - if ( is_numeric( $trimmedRetryAfterValue ) ) { |
|
632 | - $delaySeconds = (int)$trimmedRetryAfterValue; |
|
633 | - if ( $delaySeconds >= 0 ) { |
|
634 | - return $this->getTimestampInFuture( new DateInterval( 'PT' . $delaySeconds . 'S' ) ); |
|
630 | + if (is_numeric($trimmedRetryAfterValue)) { |
|
631 | + $delaySeconds = (int) $trimmedRetryAfterValue; |
|
632 | + if ($delaySeconds >= 0) { |
|
633 | + return $this->getTimestampInFuture(new DateInterval('PT'.$delaySeconds.'S')); |
|
635 | 634 | } |
636 | 635 | } else { |
637 | - $return = strtotime( $responseHeaders[ 'Retry-After' ] ); |
|
638 | - if ( !empty( $return ) ) { |
|
639 | - return new ConvertibleTimestamp( $return ); |
|
636 | + $return = strtotime($responseHeaders['Retry-After']); |
|
637 | + if (!empty($return)) { |
|
638 | + return new ConvertibleTimestamp($return); |
|
640 | 639 | } |
641 | 640 | } |
642 | 641 | return self::INVALID_RETRY_AFTER; |
643 | 642 | } |
644 | 643 | |
645 | - private function getTimestampInFuture( DateInterval $delta ) { |
|
644 | + private function getTimestampInFuture(DateInterval $delta) { |
|
646 | 645 | $now = new ConvertibleTimestamp(); |
647 | - return new ConvertibleTimestamp( $now->timestamp->add( $delta ) ); |
|
646 | + return new ConvertibleTimestamp($now->timestamp->add($delta)); |
|
648 | 647 | } |
649 | 648 | |
650 | 649 | /** |
@@ -658,93 +657,92 @@ discard block |
||
658 | 657 | * |
659 | 658 | * @throws SparqlHelperException if the query times out or some other error occurs |
660 | 659 | */ |
661 | - public function runQuery( $query, $needsPrefixes = true ) { |
|
660 | + public function runQuery($query, $needsPrefixes = true) { |
|
662 | 661 | |
663 | - if ( $this->throttlingLock->isLocked( self::EXPIRY_LOCK_ID ) ) { |
|
664 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' ); |
|
662 | + if ($this->throttlingLock->isLocked(self::EXPIRY_LOCK_ID)) { |
|
663 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling'); |
|
665 | 664 | throw new TooManySparqlRequestsException(); |
666 | 665 | } |
667 | 666 | |
668 | - $endpoint = $this->config->get( 'WBQualityConstraintsSparqlEndpoint' ); |
|
669 | - $maxQueryTimeMillis = $this->config->get( 'WBQualityConstraintsSparqlMaxMillis' ); |
|
670 | - $fallbackBlockDuration = (int)$this->config->get( 'WBQualityConstraintsSparqlThrottlingFallbackDuration' ); |
|
667 | + $endpoint = $this->config->get('WBQualityConstraintsSparqlEndpoint'); |
|
668 | + $maxQueryTimeMillis = $this->config->get('WBQualityConstraintsSparqlMaxMillis'); |
|
669 | + $fallbackBlockDuration = (int) $this->config->get('WBQualityConstraintsSparqlThrottlingFallbackDuration'); |
|
671 | 670 | |
672 | - if ( $fallbackBlockDuration < 0 ) { |
|
673 | - throw new InvalidArgumentException( 'Fallback duration must be positive int but is: '. |
|
674 | - $fallbackBlockDuration ); |
|
671 | + if ($fallbackBlockDuration < 0) { |
|
672 | + throw new InvalidArgumentException('Fallback duration must be positive int but is: '. |
|
673 | + $fallbackBlockDuration); |
|
675 | 674 | } |
676 | 675 | |
677 | - if ( $needsPrefixes ) { |
|
678 | - $query = $this->prefixes . $query; |
|
676 | + if ($needsPrefixes) { |
|
677 | + $query = $this->prefixes.$query; |
|
679 | 678 | } |
680 | - $query = "#wbqc\n" . $query; |
|
679 | + $query = "#wbqc\n".$query; |
|
681 | 680 | |
682 | - $url = $endpoint . '?' . http_build_query( |
|
681 | + $url = $endpoint.'?'.http_build_query( |
|
683 | 682 | [ |
684 | 683 | 'query' => $query, |
685 | 684 | 'format' => 'json', |
686 | 685 | 'maxQueryTimeMillis' => $maxQueryTimeMillis, |
687 | 686 | ], |
688 | - null, ini_get( 'arg_separator.output' ), |
|
687 | + null, ini_get('arg_separator.output'), |
|
689 | 688 | // encode spaces with %20, not + |
690 | 689 | PHP_QUERY_RFC3986 |
691 | 690 | ); |
692 | 691 | |
693 | 692 | $options = [ |
694 | 693 | 'method' => 'GET', |
695 | - 'timeout' => (int)round( ( $maxQueryTimeMillis + 1000 ) / 1000 ), |
|
694 | + 'timeout' => (int) round(($maxQueryTimeMillis + 1000) / 1000), |
|
696 | 695 | 'connectTimeout' => 'default', |
697 | 696 | 'userAgent' => $this->defaultUserAgent, |
698 | 697 | ]; |
699 | - $request = $this->requestFactory->create( $url, $options ); |
|
700 | - $startTime = microtime( true ); |
|
698 | + $request = $this->requestFactory->create($url, $options); |
|
699 | + $startTime = microtime(true); |
|
701 | 700 | $status = $request->execute(); |
702 | - $endTime = microtime( true ); |
|
701 | + $endTime = microtime(true); |
|
703 | 702 | $this->dataFactory->timing( |
704 | 703 | 'wikibase.quality.constraints.sparql.timing', |
705 | - ( $endTime - $startTime ) * 1000 |
|
704 | + ($endTime - $startTime) * 1000 |
|
706 | 705 | ); |
707 | 706 | |
708 | - if ( $request->getStatus() === self::HTTP_TOO_MANY_REQUESTS ) { |
|
709 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' ); |
|
710 | - $throttlingUntil = $this->getThrottling( $request->getResponseHeaders() ); |
|
711 | - if ( !( $throttlingUntil instanceof ConvertibleTimestamp ) ) { |
|
712 | - $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid( $request ); |
|
707 | + if ($request->getStatus() === self::HTTP_TOO_MANY_REQUESTS) { |
|
708 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling'); |
|
709 | + $throttlingUntil = $this->getThrottling($request->getResponseHeaders()); |
|
710 | + if (!($throttlingUntil instanceof ConvertibleTimestamp)) { |
|
711 | + $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid($request); |
|
713 | 712 | $this->throttlingLock->lock( |
714 | 713 | self::EXPIRY_LOCK_ID, |
715 | - $this->getTimestampInFuture( new DateInterval( 'PT' . $fallbackBlockDuration . 'S' ) ) |
|
714 | + $this->getTimestampInFuture(new DateInterval('PT'.$fallbackBlockDuration.'S')) |
|
716 | 715 | ); |
717 | 716 | } else { |
718 | - $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent( $throttlingUntil, $request ); |
|
719 | - $this->throttlingLock->lock( self::EXPIRY_LOCK_ID, $throttlingUntil ); |
|
717 | + $this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent($throttlingUntil, $request); |
|
718 | + $this->throttlingLock->lock(self::EXPIRY_LOCK_ID, $throttlingUntil); |
|
720 | 719 | } |
721 | 720 | throw new TooManySparqlRequestsException(); |
722 | 721 | } |
723 | 722 | |
724 | - $maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() ); |
|
725 | - if ( $maxAge ) { |
|
726 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' ); |
|
723 | + $maxAge = $this->getCacheMaxAge($request->getResponseHeaders()); |
|
724 | + if ($maxAge) { |
|
725 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.cached'); |
|
727 | 726 | } |
728 | 727 | |
729 | - if ( $status->isOK() ) { |
|
728 | + if ($status->isOK()) { |
|
730 | 729 | $json = $request->getContent(); |
731 | - $arr = json_decode( $json, true ); |
|
730 | + $arr = json_decode($json, true); |
|
732 | 731 | return new CachedQueryResults( |
733 | 732 | $arr, |
734 | 733 | Metadata::ofCachingMetadata( |
735 | 734 | $maxAge ? |
736 | - CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) : |
|
737 | - CachingMetadata::fresh() |
|
735 | + CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh() |
|
738 | 736 | ) |
739 | 737 | ); |
740 | 738 | } else { |
741 | - $this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' ); |
|
739 | + $this->dataFactory->increment('wikibase.quality.constraints.sparql.error'); |
|
742 | 740 | |
743 | 741 | $this->dataFactory->increment( |
744 | 742 | "wikibase.quality.constraints.sparql.error.http.{$request->getStatus()}" |
745 | 743 | ); |
746 | 744 | |
747 | - if ( $this->isTimeout( $request->getContent() ) ) { |
|
745 | + if ($this->isTimeout($request->getContent())) { |
|
748 | 746 | $this->dataFactory->increment( |
749 | 747 | 'wikibase.quality.constraints.sparql.error.timeout' |
750 | 748 | ); |