@@ -12,7 +12,7 @@ |
||
12 | 12 | // Feel free to remove this, extend it, or make something more sophisticated. |
13 | 13 | if (isset($_SERVER['HTTP_CLIENT_IP']) |
14 | 14 | || isset($_SERVER['HTTP_X_FORWARDED_FOR']) |
15 | - || !( in_array(@$_SERVER['REMOTE_ADDR'], [ '127.0.0.1', 'fe80::1', '::1' ]) || php_sapi_name() === 'cli-server' ) |
|
15 | + || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server') |
|
16 | 16 | ) { |
17 | 17 | header('HTTP/1.0 403 Forbidden'); |
18 | 18 | exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | $title = str_replace(' ', '_', $title); |
13 | 13 | $client = new GuzzleHttp\Client(); |
14 | 14 | |
15 | - $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/' . |
|
16 | - "$project/all-access/user/" . rawurlencode($title) . '/daily/' . $start . '/' . $end; |
|
15 | + $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/'. |
|
16 | + "$project/all-access/user/".rawurlencode($title).'/daily/'.$start.'/'.$end; |
|
17 | 17 | |
18 | 18 | $res = $client->request('GET', $url); |
19 | 19 | return json_decode($res->getBody()->getContents()); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $data = $this->getLastDays($project, $title, $days); |
33 | 33 | |
34 | 34 | // FIXME: needs to handle gotchas |
35 | - return array_sum(array_map(function ($item) { |
|
35 | + return array_sum(array_map(function($item) { |
|
36 | 36 | return $item->views; |
37 | 37 | }, $data->items)); |
38 | 38 | } |
@@ -45,7 +45,7 @@ |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | // Find the path, and complain if English doesn't exist. |
48 | - $path = $this->container->getParameter("kernel.root_dir") . '/../i18n'; |
|
48 | + $path = $this->container->getParameter("kernel.root_dir").'/../i18n'; |
|
49 | 49 | if (!file_exists("$path/en.json")) { |
50 | 50 | throw new Exception("Language directory doesn't exist: $path"); |
51 | 51 | } |
@@ -176,7 +176,7 @@ |
||
176 | 176 | |
177 | 177 | // Iterate over query results, loading each user id into the array |
178 | 178 | while ($row = $res->fetch()) { |
179 | - $adminIdArr[] = $row["user_id"] ; |
|
179 | + $adminIdArr[] = $row["user_id"]; |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | // Set the query results to be useful in a sql statement. |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | 'quote/all.html.twig', |
112 | 112 | [ |
113 | 113 | 'base_dir' => realpath( |
114 | - $this->getParameter('kernel.root_dir') . '/..' |
|
114 | + $this->getParameter('kernel.root_dir').'/..' |
|
115 | 115 | ), |
116 | 116 | 'xtPage' => 'bash', |
117 | 117 | 'quotes' => $quotes, |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | 'quote/view.html.twig', |
161 | 161 | [ |
162 | 162 | 'base_dir' => realpath( |
163 | - $this->getParameter('kernel.root_dir') . '/..' |
|
163 | + $this->getParameter('kernel.root_dir').'/..' |
|
164 | 164 | ), |
165 | 165 | "xtPage" => "bash", |
166 | 166 | "text" => $text, |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | public function loginAction() |
91 | 91 | { |
92 | 92 | try { |
93 | - list( $next, $token ) = $this->getOauthClient()->initiate(); |
|
93 | + list($next, $token) = $this->getOauthClient()->initiate(); |
|
94 | 94 | } catch (Exception $oauthException) { |
95 | 95 | throw $oauthException; |
96 | 96 | // @TODO Make this work. |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | . '/index.php?title=Special:OAuth'; |
156 | 156 | $conf = new ClientConfig($endpoint); |
157 | 157 | $consumerKey = $this->getParameter('oauth_key'); |
158 | - $consumerSecret = $this->getParameter('oauth_secret'); |
|
158 | + $consumerSecret = $this->getParameter('oauth_secret'); |
|
159 | 159 | $conf->setConsumer(new Consumer($consumerKey, $consumerSecret)); |
160 | 160 | $this->oauthClient = new Client($conf); |
161 | 161 | // Callback URL is hardcoded in the consumer registration. |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $end = $request->query->get('end'); |
32 | 32 | |
33 | 33 | if ($start != '' && $end != '') { |
34 | - return $this->redirectToRoute('MetaResult', [ 'start' => $start, 'end' => $end ]); |
|
34 | + return $this->redirectToRoute('MetaResult', ['start' => $start, 'end' => $end]); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | return $this->render('meta/index.html.twig', [ |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $timeline = []; |
74 | 74 | $startObj = new DateTime($start); |
75 | 75 | $endObj = new DateTime($end); |
76 | - $numDays = (int) $endObj->diff($startObj)->format("%a"); |
|
76 | + $numDays = (int)$endObj->diff($startObj)->format("%a"); |
|
77 | 77 | $grandSum = 0; |
78 | 78 | |
79 | 79 | // Generate array of date labels |
@@ -85,17 +85,17 @@ discard block |
||
85 | 85 | |
86 | 86 | foreach ($data as $entry) { |
87 | 87 | if (!isset($totals[$entry['tool']])) { |
88 | - $totals[$entry['tool']] = (int) $entry['count']; |
|
88 | + $totals[$entry['tool']] = (int)$entry['count']; |
|
89 | 89 | |
90 | 90 | // Create arrays for each tool, filled with zeros for each date in the timeline |
91 | 91 | $timeline[$entry['tool']] = array_fill(0, $numDays, 0); |
92 | 92 | } else { |
93 | - $totals[$entry['tool']] += (int) $entry['count']; |
|
93 | + $totals[$entry['tool']] += (int)$entry['count']; |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | $date = new DateTime($entry['date']); |
97 | - $dateIndex = (int) $date->diff($startObj)->format("%a"); |
|
98 | - $timeline[$entry['tool']][$dateIndex] = (int) $entry['count']; |
|
97 | + $dateIndex = (int)$date->diff($startObj)->format("%a"); |
|
98 | + $timeline[$entry['tool']][$dateIndex] = (int)$entry['count']; |
|
99 | 99 | |
100 | 100 | $grandSum += $entry['count']; |
101 | 101 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | public function groups($project, $username) |
66 | 66 | { |
67 | 67 | $this->setUp($project); |
68 | - $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ]; |
|
68 | + $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"]; |
|
69 | 69 | $query = new SimpleRequest('query', $params); |
70 | 70 | $result = []; |
71 | 71 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | public function globalGroups($project, $username) |
92 | 92 | { |
93 | 93 | $this->setUp($project); |
94 | - $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ]; |
|
94 | + $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"]; |
|
95 | 95 | $query = new SimpleRequest('query', $params); |
96 | 96 | $result = []; |
97 | 97 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $groups[] = "B"; |
142 | 142 | } |
143 | 143 | if (in_array("steward", $admin["groups"])) { |
144 | - $groups[] = "S" ; |
|
144 | + $groups[] = "S"; |
|
145 | 145 | } |
146 | 146 | if (in_array("checkuser", $admin["groups"])) { |
147 | 147 | $groups[] = "CU"; |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | if (in_array("bot", $admin["groups"])) { |
153 | 153 | $groups[] = "Bot"; |
154 | 154 | } |
155 | - $result[ $admin["name"] ] = [ |
|
155 | + $result[$admin["name"]] = [ |
|
156 | 156 | "groups" => implode('/', $groups) |
157 | 157 | ]; |
158 | 158 | } |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | $normalized = []; |
228 | 228 | if (isset($result['query']['normalized'])) { |
229 | 229 | array_map( |
230 | - function ($e) use (&$normalized) { |
|
230 | + function($e) use (&$normalized) { |
|
231 | 231 | $normalized[$e['to']] = $e['from']; |
232 | 232 | }, |
233 | 233 | $result['query']['normalized'] |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | $query = FluentRequest::factory()->setAction('query')->setParams($requestData); |
313 | 313 | $innerPromise = $this->api->getRequestAsync($query); |
314 | 314 | |
315 | - $innerPromise->then(function ($result) use (&$data) { |
|
315 | + $innerPromise->then(function($result) use (&$data) { |
|
316 | 316 | // some failures come back as 200s, so we still resolve and let the outer function handle it |
317 | 317 | if (isset($result['error']) || !isset($result['query'])) { |
318 | 318 | return $data['promise']->resolve($data); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | // If we've got a project and user, redirect to results. |
50 | 50 | if ($projectName != '' && $username != '') { |
51 | - $routeParams = [ 'project' => $projectName, 'username' => $username ]; |
|
51 | + $routeParams = ['project' => $projectName, 'username' => $username]; |
|
52 | 52 | return $this->redirectToRoute('SimpleEditCounterResult', $routeParams); |
53 | 53 | } |
54 | 54 | |
@@ -120,8 +120,8 @@ discard block |
||
120 | 120 | $resultQuery->execute(); |
121 | 121 | |
122 | 122 | if ($resultQuery->errorCode() > 0) { |
123 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
124 | - return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]); |
|
123 | + $this->addFlash('notice', ['no-result', $username]); |
|
124 | + return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | // Fetch the result data |
@@ -145,16 +145,16 @@ discard block |
||
145 | 145 | $rev = $row['value']; |
146 | 146 | } |
147 | 147 | if ($row['source'] == 'groups') { |
148 | - $groups .= $row['value']. ', '; |
|
148 | + $groups .= $row['value'].', '; |
|
149 | 149 | } |
150 | 150 | } |
151 | 151 | |
152 | 152 | // Unknown user - If the user is created the $results variable will have 3 entries. |
153 | 153 | // This is a workaround to detect non-existent IPs. |
154 | 154 | if (count($results) < 3 && $arch == 0 && $rev == 0) { |
155 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
155 | + $this->addFlash('notice', ['no-result', $username]); |
|
156 | 156 | |
157 | - return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]); |
|
157 | + return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | // Remove the last comma and space |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | 'project' => $project, |
184 | 184 | 'id' => $id, |
185 | 185 | 'arch' => $arch, |
186 | - 'rev' => $rev + $arch, |
|
186 | + 'rev' => $rev+$arch, |
|
187 | 187 | 'live' => $rev, |
188 | 188 | 'groups' => $groups, |
189 | 189 | 'globalGroups' => $globalGroups, |