| @@ -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.'); | 
| @@ -15,11 +15,11 @@ | ||
| 15 | 15 | $data = json_decode($file, true); | 
| 16 | 16 | |
| 17 | 17 | // Output the contents to the piped file | 
| 18 | -print ( "parameters: | |
| 18 | +print ("parameters: | |
| 19 | 19 | automated_tools:\r\n" ); | 
| 20 | 20 |  foreach ($data as $row) { | 
| 21 | - print " - " . $row["name"] . ": '" . $row["regex"] . "'\r\n"; | |
| 21 | + print " - ".$row["name"].": '".$row["regex"]."'\r\n"; | |
| 22 | 22 | } | 
| 23 | -print ( " | |
| 23 | +print (" | |
| 24 | 24 | |
| 25 | - semi-automated edits source: $url" ); | |
| 25 | + semi-automated edits source: $url"); | |
| @@ -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. | 
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 
| 6 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 
| 7 | -use Symfony\Component\Debug\Exception\ContextErrorException; | |
| 8 | 7 | use Symfony\Component\Routing\Exception\InvalidParameterException; | 
| 9 | 8 | use Symfony\Component\HttpFoundation\Request; | 
| 10 | 9 | |
| @@ -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, | 
| @@ -14,25 +14,25 @@ discard block | ||
| 14 | 14 | |
| 15 | 15 | public function intuitionMessage($message = "", $vars = []) | 
| 16 | 16 |      { | 
| 17 | - return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]); | |
| 17 | + return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]); | |
| 18 | 18 | } | 
| 19 | 19 | |
| 20 | 20 | /*********************************** FUNCTIONS ***********************************/ | 
| 21 | 21 | |
| 22 | 22 | public function getFunctions() | 
| 23 | 23 |      { | 
| 24 | - $options = [ 'is_safe' => [ 'html']]; | |
| 24 | + $options = ['is_safe' => ['html']]; | |
| 25 | 25 | return [ | 
| 26 | -            new Twig_SimpleFunction('wiki_link', [ $this, 'wikiLink' ], $options), | |
| 27 | -            new Twig_SimpleFunction('user_link', [ $this, 'userLink' ], $options), | |
| 28 | -            new Twig_SimpleFunction('user_log_link', [ $this, 'userLogLink' ], $options), | |
| 29 | -            new Twig_SimpleFunction('group_link', [ $this, 'groupLink' ], $options), | |
| 30 | -            new Twig_SimpleFunction('wiki_history_link', [ $this, 'wikiHistoryLink' ], $options), | |
| 31 | -            new Twig_SimpleFunction('wiki_log_link', [ $this, 'wikiLogLink' ], $options), | |
| 32 | -            new Twig_SimpleFunction('pageviews_links', [ $this, 'pageviewsLinks' ], $options), | |
| 33 | -            new Twig_SimpleFunction('diff_link', [ $this, 'diffLink' ], $options), | |
| 34 | -            new Twig_SimpleFunction('perma_link', [ $this, 'permaLink' ], $options), | |
| 35 | -            new Twig_SimpleFunction('edit_link', [ $this, 'editLink' ], $options), | |
| 26 | +            new Twig_SimpleFunction('wiki_link', [$this, 'wikiLink'], $options), | |
| 27 | +            new Twig_SimpleFunction('user_link', [$this, 'userLink'], $options), | |
| 28 | +            new Twig_SimpleFunction('user_log_link', [$this, 'userLogLink'], $options), | |
| 29 | +            new Twig_SimpleFunction('group_link', [$this, 'groupLink'], $options), | |
| 30 | +            new Twig_SimpleFunction('wiki_history_link', [$this, 'wikiHistoryLink'], $options), | |
| 31 | +            new Twig_SimpleFunction('wiki_log_link', [$this, 'wikiLogLink'], $options), | |
| 32 | +            new Twig_SimpleFunction('pageviews_links', [$this, 'pageviewsLinks'], $options), | |
| 33 | +            new Twig_SimpleFunction('diff_link', [$this, 'diffLink'], $options), | |
| 34 | +            new Twig_SimpleFunction('perma_link', [$this, 'permaLink'], $options), | |
| 35 | +            new Twig_SimpleFunction('edit_link', [$this, 'editLink'], $options), | |
| 36 | 36 | ]; | 
| 37 | 37 | } | 
| 38 | 38 | |
| @@ -244,8 +244,8 @@ discard block | ||
| 244 | 244 | public function getFilters() | 
| 245 | 245 |      { | 
| 246 | 246 | return [ | 
| 247 | -            new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]), | |
| 248 | -            new \Twig_SimpleFilter('wikify_comment', [ $this, 'wikifyComment' ], [ 'is_safe' => [ 'html' ] ]), | |
| 247 | +            new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]), | |
| 248 | +            new \Twig_SimpleFilter('wikify_comment', [$this, 'wikifyComment'], ['is_safe' => ['html']]), | |
| 249 | 249 | ]; | 
| 250 | 250 | } | 
| 251 | 251 | |
| @@ -284,7 +284,7 @@ discard block | ||
| 284 | 284 |          if ($isSection) { | 
| 285 | 285 | $sectionTitle = $sectionMatch[1][0]; | 
| 286 | 286 |              $sectionTitleLink = str_replace(' ', '_', $sectionTitle); | 
| 287 | - $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>→</a>" . | |
| 287 | + $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>→</a>". | |
| 288 | 288 | "<em class='text-muted'>$sectionTitle:</em> "; | 
| 289 | 289 | $wikitext = str_replace($sectionMatch[0][0], $sectionWikitext, $wikitext); | 
| 290 | 290 | } | 
| @@ -7,7 +7,6 @@ | ||
| 7 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 
| 8 | 8 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 
| 9 | 9 | use Symfony\Component\HttpFoundation\Request; | 
| 10 | -use Symfony\Component\VarDumper\VarDumper; | |
| 11 | 10 | use Xtools\Page; | 
| 12 | 11 | use Xtools\PagesRepository; | 
| 13 | 12 | use Xtools\Project; | 
| @@ -55,7 +55,7 @@ discard block | ||
| 55 | 55 | 'username' => $username, | 
| 56 | 56 | ]); | 
| 57 | 57 |          } elseif ($projectName != "") { | 
| 58 | -            return $this->redirectToRoute("TopEditsResults", [ 'project'=>$projectName ]); | |
| 58 | +            return $this->redirectToRoute("TopEditsResults", ['project'=>$projectName]); | |
| 59 | 59 | } | 
| 60 | 60 | |
| 61 | 61 | // Set default project so we can populate the namespace selector. | 
| @@ -131,11 +131,11 @@ discard block | ||
| 131 | 131 | } | 
| 132 | 132 | |
| 133 | 133 | // Get page info about these 100 pages, so we can use their display title. | 
| 134 | -        $titles = array_map(function ($e) use ($namespaces) { | |
| 134 | +        $titles = array_map(function($e) use ($namespaces) { | |
| 135 | 135 | // If non-mainspace, prepend namespace to the titles. | 
| 136 | 136 | $ns = $e['page_namespace']; | 
| 137 | - $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']] . ':' : ''; | |
| 138 | - return $nsTitle . $e['page_title']; | |
| 137 | + $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']].':' : ''; | |
| 138 | + return $nsTitle.$e['page_title']; | |
| 139 | 139 | }, $editData); | 
| 140 | 140 | /** @var ApiHelper $apiHelper */ | 
| 141 | 141 |          $apiHelper = $this->get('app.api_helper'); | 
| @@ -146,8 +146,8 @@ discard block | ||
| 146 | 146 |          foreach ($editData as $editDatum) { | 
| 147 | 147 | // If non-mainspace, prepend namespace to the titles. | 
| 148 | 148 | $ns = $editDatum['page_namespace']; | 
| 149 | - $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']] . ':' : ''; | |
| 150 | - $pageTitle = $nsTitle . $editDatum['page_title']; | |
| 149 | + $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']].':' : ''; | |
| 150 | + $pageTitle = $nsTitle.$editDatum['page_title']; | |
| 151 | 151 | $editDatum['displaytitle'] = $displayTitles[$pageTitle]; | 
| 152 | 152 | // $editDatum['page_title'] is retained without the namespace | 
| 153 | 153 | // so we can link to TopEdits for that page | 
| @@ -3,12 +3,7 @@ | ||
| 3 | 3 | namespace AppBundle\Helper; | 
| 4 | 4 | |
| 5 | 5 | use DateTime; | 
| 6 | -use Doctrine\DBAL\Connection; | |
| 7 | -use Psr\Cache\CacheItemPoolInterface; | |
| 8 | -use Symfony\Component\Config\Definition\Exception\Exception; | |
| 9 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; | |
| 10 | 6 | use Symfony\Component\DependencyInjection\ContainerInterface; | 
| 11 | -use Symfony\Component\VarDumper\VarDumper; | |
| 12 | 7 | use Xtools\ProjectRepository; | 
| 13 | 8 | |
| 14 | 9 | class AutomatedEditsHelper extends HelperBase | 
| @@ -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 | ]; |