@@ -8,6 +8,6 @@ |
||
8 | 8 | */ |
9 | 9 | $loader = require __DIR__.'/../vendor/autoload.php'; |
10 | 10 | |
11 | -AnnotationRegistry::registerLoader([ $loader, 'loadClass' ]); |
|
11 | +AnnotationRegistry::registerLoader([$loader, 'loadClass']); |
|
12 | 12 | |
13 | 13 | return $loader; |
@@ -27,7 +27,7 @@ |
||
27 | 27 | new AppBundle\AppBundle(), |
28 | 28 | ]; |
29 | 29 | |
30 | - if (in_array($this->getEnvironment(), [ 'dev', 'test' ], true)) { |
|
30 | + if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { |
|
31 | 31 | $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); |
32 | 32 | $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); |
33 | 33 | $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $revTable = $lh->getTable('revision', $project->getDatabaseName()); |
124 | 124 | $pageTable = $lh->getTable('page', $project->getDatabaseName()); |
125 | 125 | |
126 | - $AEBTypes = array_map(function ($AEBType) { |
|
126 | + $AEBTypes = array_map(function($AEBType) { |
|
127 | 127 | return $AEBType['regex']; |
128 | 128 | }, $this->container->getParameter('automated_tools')); |
129 | 129 | |
@@ -148,12 +148,12 @@ discard block |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | // Get diff sizes, based on length of each parent revision |
151 | - $parentRevIds = array_map(function ($edit) { |
|
151 | + $parentRevIds = array_map(function($edit) { |
|
152 | 152 | return $edit['rev_parent_id']; |
153 | 153 | }, $editData); |
154 | 154 | $query = "SELECT rev_len, rev_id |
155 | 155 | FROM revision |
156 | - WHERE rev_id IN (" . implode(',', $parentRevIds) . ")"; |
|
156 | + WHERE rev_id IN (" . implode(',', $parentRevIds).")"; |
|
157 | 157 | $diffSizeData = $conn->executeQuery($query)->fetchAll(); |
158 | 158 | |
159 | 159 | // reformat with rev_id as the key, rev_len as the value |
@@ -163,24 +163,24 @@ discard block |
||
163 | 163 | } |
164 | 164 | |
165 | 165 | // Build our array of nonautomated edits |
166 | - $editData = array_map(function ($edit) use ($namespaces, $diffSizes) { |
|
166 | + $editData = array_map(function($edit) use ($namespaces, $diffSizes) { |
|
167 | 167 | $pageTitle = $edit['page_title']; |
168 | 168 | |
169 | 169 | if ($edit['page_namespace'] !== '0') { |
170 | - $pageTitle = $namespaces[$edit['page_namespace']] . ":$pageTitle"; |
|
170 | + $pageTitle = $namespaces[$edit['page_namespace']].":$pageTitle"; |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | $diffSize = $edit['rev_len']; |
174 | 174 | if ($edit['rev_parent_id'] > 0) { |
175 | - $diffSize = $edit['rev_len'] - $diffSizes[$edit['rev_parent_id']]; |
|
175 | + $diffSize = $edit['rev_len']-$diffSizes[$edit['rev_parent_id']]; |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | return [ |
179 | 179 | 'page_title' => $pageTitle, |
180 | - 'namespace' => (int) $edit['page_namespace'], |
|
181 | - 'rev_id' => (int) $edit['rev_id'], |
|
180 | + 'namespace' => (int)$edit['page_namespace'], |
|
181 | + 'rev_id' => (int)$edit['rev_id'], |
|
182 | 182 | 'timestamp' => DateTime::createFromFormat('YmdHis', $edit['rev_timestamp']), |
183 | - 'minor_edit' => (bool) $edit['rev_minor_edit'], |
|
183 | + 'minor_edit' => (bool)$edit['rev_minor_edit'], |
|
184 | 184 | 'summary' => $edit['rev_comment'], |
185 | 185 | 'size' => $diffSize |
186 | 186 | ]; |
@@ -7,7 +7,6 @@ |
||
7 | 7 | |
8 | 8 | use DateTime; |
9 | 9 | use Symfony\Component\DependencyInjection\ContainerInterface; |
10 | -use Xtools\ProjectRepository; |
|
11 | 10 | |
12 | 11 | /** |
13 | 12 | * Helper class for getting information about semi-automated edits. |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $archiveTable = $lh->getTable('archive', $dbName); |
155 | 155 | |
156 | 156 | $condBegin = $start ? " AND rev_timestamp > :start " : null; |
157 | - $condEnd = $end ? " AND rev_timestamp < :end ": null; |
|
157 | + $condEnd = $end ? " AND rev_timestamp < :end " : null; |
|
158 | 158 | |
159 | 159 | $regexes = []; |
160 | 160 | |
@@ -248,8 +248,8 @@ discard block |
||
248 | 248 | } |
249 | 249 | |
250 | 250 | // Sort the array and do some simple math. |
251 | - uasort($results, function ($a, $b) { |
|
252 | - return $b['count'] - $a['count']; |
|
251 | + uasort($results, function($a, $b) { |
|
252 | + return $b['count']-$a['count']; |
|
253 | 253 | }); |
254 | 254 | |
255 | 255 | if ($total != 0) { |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | public function getRevisionCounts(Project $project, User $user) |
20 | 20 | { |
21 | 21 | // Set up cache. |
22 | - $cacheKey = 'revisioncounts.' . $project->getDatabaseName() . '.' . $user->getUsername(); |
|
22 | + $cacheKey = 'revisioncounts.'.$project->getDatabaseName().'.'.$user->getUsername(); |
|
23 | 23 | if ($this->cache->hasItem($cacheKey)) { |
24 | 24 | return $this->cache->getItem($cacheKey)->get(); |
25 | 25 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | public function getRevisionDates(Project $project, User $user) |
81 | 81 | { |
82 | 82 | // Set up cache. |
83 | - $cacheKey = 'revisiondates.' . $project->getDatabaseName() . '.' . $user->getUsername(); |
|
83 | + $cacheKey = 'revisiondates.'.$project->getDatabaseName().'.'.$user->getUsername(); |
|
84 | 84 | if ($this->cache->hasItem($cacheKey)) { |
85 | 85 | return $this->cache->getItem($cacheKey)->get(); |
86 | 86 | } |
@@ -152,10 +152,10 @@ discard block |
||
152 | 152 | $results = $resultQuery->fetchAll(); |
153 | 153 | |
154 | 154 | $pageCounts = array_combine( |
155 | - array_map(function ($e) { |
|
155 | + array_map(function($e) { |
|
156 | 156 | return $e['source']; |
157 | 157 | }, $results), |
158 | - array_map(function ($e) { |
|
158 | + array_map(function($e) { |
|
159 | 159 | return $e['value']; |
160 | 160 | }, $results) |
161 | 161 | ); |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | // Query. |
188 | 188 | $sql = "SELECT CONCAT(log_type, '-', log_action) AS source, COUNT(log_id) AS value |
189 | - FROM " . $this->getTableName($project->getDatabaseName(), 'logging') . " |
|
189 | + FROM " . $this->getTableName($project->getDatabaseName(), 'logging')." |
|
190 | 190 | WHERE log_user = :userId |
191 | 191 | GROUP BY log_type, log_action"; |
192 | 192 | $resultQuery = $this->getProjectsConnection()->prepare($sql); |
@@ -195,10 +195,10 @@ discard block |
||
195 | 195 | $resultQuery->execute(); |
196 | 196 | $results = $resultQuery->fetchAll(); |
197 | 197 | $logCounts = array_combine( |
198 | - array_map(function ($e) { |
|
198 | + array_map(function($e) { |
|
199 | 199 | return $e['source']; |
200 | 200 | }, $results), |
201 | - array_map(function ($e) { |
|
201 | + array_map(function($e) { |
|
202 | 202 | return $e['value']; |
203 | 203 | }, $results) |
204 | 204 | ); |
@@ -355,9 +355,9 @@ discard block |
||
355 | 355 | $resultQuery->bindParam(":id", $userId); |
356 | 356 | $resultQuery->execute(); |
357 | 357 | $results = $resultQuery->fetchAll(); |
358 | - $namespaceTotals = array_combine(array_map(function ($e) { |
|
358 | + $namespaceTotals = array_combine(array_map(function($e) { |
|
359 | 359 | return $e['page_namespace']; |
360 | - }, $results), array_map(function ($e) { |
|
360 | + }, $results), array_map(function($e) { |
|
361 | 361 | return $e['total']; |
362 | 362 | }, $results)); |
363 | 363 |
@@ -251,9 +251,9 @@ |
||
251 | 251 | $conn = $this->getProjectsConnection(); |
252 | 252 | $pageTable = $this->getTableName($project->getDatabaseName(), 'page'); |
253 | 253 | $query = "SELECT page_id " |
254 | - . " FROM $pageTable " |
|
255 | - . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 " |
|
256 | - . " LIMIT 1"; |
|
254 | + . " FROM $pageTable " |
|
255 | + . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 " |
|
256 | + . " LIMIT 1"; |
|
257 | 257 | $params = [ |
258 | 258 | 'ns' => $namespaceId, |
259 | 259 | 'title' => $pageTitle, |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | if ($projMetadata['dbname'] == "$project" |
140 | 140 | || $projMetadata['url'] == "$project" |
141 | 141 | || $projMetadata['url'] == "https://$project") { |
142 | - $this->log->debug(__METHOD__ . " Using cached data for $project"); |
|
142 | + $this->log->debug(__METHOD__." Using cached data for $project"); |
|
143 | 143 | return $projMetadata; |
144 | 144 | } |
145 | 145 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $optedIn = $this->container->getParameter('opted_in'); |
260 | 260 | // In case there's just one given. |
261 | 261 | if (!is_array($optedIn)) { |
262 | - $optedIn = [ $optedIn ]; |
|
262 | + $optedIn = [$optedIn]; |
|
263 | 263 | } |
264 | 264 | return $optedIn; |
265 | 265 | } |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Xtools; |
4 | 4 | |
5 | 5 | use Xtools\User; |
6 | -use AppBundle\Helper\AutomatedEditsHelper; |
|
7 | 6 | use DateTime; |
8 | 7 | |
9 | 8 | /** |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | $this->page = $page; |
47 | 47 | |
48 | 48 | // Copy over supported attributes |
49 | - $this->id = (int) $attrs['id']; |
|
49 | + $this->id = (int)$attrs['id']; |
|
50 | 50 | $this->timestamp = DateTime::createFromFormat('YmdHis', $attrs['timestamp']); |
51 | 51 | $this->minor = $attrs['minor'] === '1'; |
52 | - $this->length = (int) $attrs['length']; |
|
53 | - $this->length_change = (int) $attrs['length_change']; |
|
52 | + $this->length = (int)$attrs['length']; |
|
53 | + $this->length_change = (int)$attrs['length_change']; |
|
54 | 54 | $this->user = new User($attrs['username']); |
55 | 55 | $this->comment = $attrs['comment']; |
56 | 56 | } |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | public function getDiffUrl() |
180 | 180 | { |
181 | 181 | $project = $this->getProject(); |
182 | - $path = str_replace('$1', 'Special:Diff/' . $this->id, $project->getArticlePath()); |
|
183 | - return rtrim($project->getUrl(), '/') . $path; |
|
182 | + $path = str_replace('$1', 'Special:Diff/'.$this->id, $project->getArticlePath()); |
|
183 | + return rtrim($project->getUrl(), '/').$path; |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | /** |
@@ -190,8 +190,8 @@ discard block |
||
190 | 190 | public function getPermaUrl() |
191 | 191 | { |
192 | 192 | $project = $this->getProject(); |
193 | - $path = str_replace('$1', 'Special:PermaLink/' . $this->id, $project->getArticlePath()); |
|
194 | - return rtrim($project->getUrl(), '/') . $path; |
|
193 | + $path = str_replace('$1', 'Special:PermaLink/'.$this->id, $project->getArticlePath()); |
|
194 | + return rtrim($project->getUrl(), '/').$path; |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | /** |
@@ -2,13 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace AppBundle\Controller; |
4 | 4 | |
5 | -use AppBundle\Helper\AutomatedEditsHelper; |
|
6 | -use Exception; |
|
7 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
8 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
9 | -use Symfony\Component\HttpFoundation\Request; |
|
10 | 6 | use Symfony\Component\HttpFoundation\Response; |
11 | -use Symfony\Component\Debug\Exception\FatalErrorException; |
|
12 | 7 | use FOS\RestBundle\Controller\Annotations as Rest; |
13 | 8 | use FOS\RestBundle\Controller\FOSRestController; |
14 | 9 | use FOS\RestBundle\View\View; |
@@ -139,7 +139,7 @@ |
||
139 | 139 | } |
140 | 140 | |
141 | 141 | $conn = $this->getDoctrine()->getManager('default')->getConnection(); |
142 | - $date = date('Y-m-d'); |
|
142 | + $date = date('Y-m-d'); |
|
143 | 143 | |
144 | 144 | // Increment count in timeline |
145 | 145 | $existsSql = "SELECT 1 FROM usage_timeline |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function getUrl($withTrailingSlash = true) |
81 | 81 | { |
82 | - return rtrim($this->getMetadata()['url'], '/') . ($withTrailingSlash ? '/' : ''); |
|
82 | + return rtrim($this->getMetadata()['url'], '/').($withTrailingSlash ? '/' : ''); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $metadata = $this->getRepository()->getMetadata($this->getUrl()); |
137 | 137 | return isset($metadata['general']['script']) |
138 | 138 | ? $metadata['general']['script'] |
139 | - : $this->getScriptPath() . '/index.php'; |
|
139 | + : $this->getScriptPath().'/index.php'; |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | /** |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | */ |
147 | 147 | public function getApiUrl() |
148 | 148 | { |
149 | - return rtrim($this->getUrl(), '/') . $this->getRepository()->getApiPath(); |
|
149 | + return rtrim($this->getUrl(), '/').$this->getRepository()->getApiPath(); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | /** |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | */ |
179 | 179 | public function userOptInPage(User $user) |
180 | 180 | { |
181 | - $localPageName = 'User:' . $user->getUsername() . '/EditCounterOptIn.js'; |
|
181 | + $localPageName = 'User:'.$user->getUsername().'/EditCounterOptIn.js'; |
|
182 | 182 | return $localPageName; |
183 | 183 | } |
184 | 184 | |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | } |
208 | 208 | |
209 | 209 | // 3. Lastly, see if they've opted in globally on the default project or Meta. |
210 | - $globalPageName = $user->getUsername() . '/EditCounterGlobalOptIn.js'; |
|
210 | + $globalPageName = $user->getUsername().'/EditCounterGlobalOptIn.js'; |
|
211 | 211 | $globalProject = $this->getRepository()->getGlobalProject(); |
212 | 212 | if ($globalProject instanceof Project) { |
213 | 213 | $globalExists = $globalProject->getRepository() |
@@ -6,7 +6,6 @@ |
||
6 | 6 | namespace Xtools; |
7 | 7 | |
8 | 8 | use Mediawiki\Api\MediawikiApi; |
9 | -use Symfony\Component\VarDumper\VarDumper; |
|
10 | 9 | |
11 | 10 | /** |
12 | 11 | * A Project is a single wiki that XTools is querying. |