Merge pull request #982 from smoench/dead-code

remove dead code

src/Packagist/WebBundle/Command/CompileStatsCommand.php

@@ -52,7 +52,6 @@ class CompileStatsCommand extends ContainerAwareCommand
         $yesterday = new \DateTime('yesterday 00:00:00');
 
         // fetch existing ids
-        $doctrine = $this->getContainer()->get('doctrine');
         $packages = $conn->fetchAll('SELECT id FROM package ORDER BY id ASC');
         $ids = array();
         foreach ($packages as $row) {

src/Packagist/WebBundle/Command/MigrateDownloadCountsCommand.php

@@ -37,7 +37,6 @@ class MigrateDownloadCountsCommand extends ContainerAwareCommand
         $signal = SignalHandler::create(null, $logger);
         $downloadManager = $this->getContainer()->get('packagist.download_manager');
         $doctrine = $this->getContainer()->get('doctrine');
-        $packageRepo = $doctrine->getRepository(Package::class);
 
         try {
             // might be a large-ish dataset coming through here

src/Packagist/WebBundle/Command/UpdatePackagesCommand.php

@@ -58,7 +58,6 @@ class UpdatePackagesCommand extends ContainerAwareCommand
         $package = $input->getArgument('package');
 
         $doctrine = $this->getContainer()->get('doctrine');
-        $router = $this->getContainer()->get('router');
         $deleteBefore = false;
         $updateEqualRefs = false;
         $randomTimes = true;

src/Packagist/WebBundle/Controller/ApiController.php

@@ -16,7 +16,6 @@ use Packagist\WebBundle\Entity\Package;
 use Packagist\WebBundle\Entity\User;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\NotFoundHttpException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -180,7 +179,7 @@ class ApiController extends Controller
     /**
      * @Route("/jobs/{id}", name="get_job", requirements={"id"="[a-f0-9]+"}, defaults={"_format" = "json"}, methods={"GET"})
      */
-    public function getJobAction(Request $request, string $id)
+    public function getJobAction(string $id)
     {
         return new JsonResponse($this->get('scheduler')->getJobStatus($id), 200);
     }

src/Packagist/WebBundle/Controller/PackageController.php

@@ -37,7 +37,7 @@ class PackageController extends Controller
     /**
      * @Route("/packages/", name="allPackages")
      */
-    public function allAction(Request $req)
+    public function allAction()
     {
         return new RedirectResponse($this->generateUrl('browse'), Response::HTTP_MOVED_PERMANENTLY);
     }
@@ -82,7 +82,6 @@ class PackageController extends Controller
             return new JsonResponse(['error' => 'Missing "since" query parameter with the latest timestamp you got from this endpoint'], 400);
         }
 
-        $now = time();
         try {
             $since = new DateTimeImmutable('@'.$since);
         } catch (\Exception $e) {
@@ -971,7 +970,7 @@ class PackageController extends Controller
             $downloads = $this->getDoctrine()->getRepository('PackagistWebBundle:Download')->findOneBy(['id' => $package->getId(), 'type' => Download::TYPE_PACKAGE]);
         }
 
-        $datePoints = $this->createDatePoints($from, $to, $average, $package, $version);
+        $datePoints = $this->createDatePoints($from, $to, $average);
         $dlData = $downloads ? $downloads->getData() : [];
 
         foreach ($datePoints as $label => $values) {
@@ -1089,7 +1088,7 @@ class PackageController extends Controller
         return $this->createFormBuilder(array())->getForm();
     }
 
-    private function createDatePoints(DateTimeImmutable $from, DateTimeImmutable $to, $average, Package $package, Version $version = null)
+    private function createDatePoints(DateTimeImmutable $from, DateTimeImmutable $to, $average)
     {
         $interval = $this->getStatsInterval($average);
 

src/Packagist/WebBundle/Controller/UserController.php

@@ -17,6 +17,7 @@ use FOS\UserBundle\Model\UserInterface;
 use Packagist\WebBundle\Entity\Job;
 use Packagist\WebBundle\Entity\Package;
 use Packagist\WebBundle\Entity\User;
+use Packagist\WebBundle\Entity\VersionRepository;
 use Packagist\WebBundle\Model\RedisAdapter;
 use Pagerfanta\Adapter\DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
@@ -52,11 +53,11 @@ class UserController extends Controller
     /**
      * @Route("/trigger-github-sync/", name="user_github_sync")
      */
-    public function triggerGitHubSyncAction(Request $req)
+    public function triggerGitHubSyncAction()
     {
         $user = $this->getUser();
         if (!$user) {
-            throw new \AccessDeniedException();
+            throw new AccessDeniedException();
         }
 
         if (!$user->getGithubToken()) {

src/Packagist/WebBundle/Controller/WebController.php

@@ -46,13 +46,11 @@ class WebController extends Controller
         ]);
 
         $filteredOrderBys = $this->getFilteredOrderedBys($req);
-        $normalizedOrderBys = $this->getNormalizedOrderBys($filteredOrderBys);
 
         $this->computeSearchQuery($req, $filteredOrderBys);
 
         $form->handleRequest($req);
 
-        $orderBysViewModel = $this->getOrderBysViewModel($req, $normalizedOrderBys);
         return $this->render('PackagistWebBundle:Web:searchForm.html.twig', array(
             'searchQuery' => $req->query->get('search_query')['query'] ?? '',
         ));
@@ -67,7 +65,6 @@ class WebController extends Controller
         $form = $this->createForm(SearchQueryType::class, new SearchQuery());
 
         $filteredOrderBys = $this->getFilteredOrderedBys($req);
-        $normalizedOrderBys = $this->getNormalizedOrderBys($filteredOrderBys);
 
         $this->computeSearchQuery($req, $filteredOrderBys);
 
@@ -332,85 +329,6 @@ class WebController extends Controller
         return $filteredOrderBys;
     }
 
-    /**
-     * @param array $orderBys
-     *
-     * @return array
-     */
-    protected function getNormalizedOrderBys(array $orderBys)
-    {
-        $normalizedOrderBys = array();
-
-        foreach ($orderBys as $sort) {
-            $normalizedOrderBys[$sort['sort']] = $sort['order'];
-        }
-
-        return $normalizedOrderBys;
-    }
-
-    /**
-     * @param Request $req
-     * @param array $normalizedOrderBys
-     *
-     * @return array
-     */
-    protected function getOrderBysViewModel(Request $req, array $normalizedOrderBys)
-    {
-        $makeDefaultArrow = function ($sort) use ($normalizedOrderBys) {
-            if (isset($normalizedOrderBys[$sort])) {
-                if (strtolower($normalizedOrderBys[$sort]) === 'asc') {
-                    $val = 'glyphicon-arrow-up';
-                } else {
-                    $val = 'glyphicon-arrow-down';
-                }
-            } else {
-                $val = '';
-            }
-
-            return $val;
-        };
-
-        $makeDefaultHref = function ($sort) use ($req, $normalizedOrderBys) {
-            if (isset($normalizedOrderBys[$sort])) {
-                if (strtolower($normalizedOrderBys[$sort]) === 'asc') {
-                    $order = 'desc';
-                } else {
-                    $order = 'asc';
-                }
-            } else {
-                $order = 'desc';
-            }
-
-            $query = $req->query->get('search_query');
-            $query = $query['query'] ?? '';
-
-            return '?' . http_build_query(array(
-                'q' => $query,
-                'orderBys' => array(
-                    array(
-                        'sort' => $sort,
-                        'order' => $order
-                    )
-                )
-            ));
-        };
-
-        return array(
-            'downloads' => array(
-                'title' => 'Sort by downloads',
-                'class' => 'glyphicon-arrow-down',
-                'arrowClass' => $makeDefaultArrow('downloads'),
-                'href' => $makeDefaultHref('downloads')
-            ),
-            'favers' => array(
-                'title' => 'Sort by favorites',
-                'class' => 'glyphicon-star',
-                'arrowClass' => $makeDefaultArrow('favers'),
-                'href' => $makeDefaultHref('favers')
-            ),
-        );
-    }
-
     /**
      * @param Request $req
      * @param array $filteredOrderBys

src/Packagist/WebBundle/Package/Updater.php

@@ -188,7 +188,6 @@ class Updater
         $existingVersions = $versionRepository->getVersionMetadataForUpdate($package);
 
         $processedVersions = [];
-        $lastUpdated = true;
         $lastProcessed = null;
         $idsToMarkUpdated = [];
         foreach ($versions as $version) {

src/Packagist/WebBundle/Service/UpdaterWorker.php

@@ -227,7 +227,6 @@ class UpdaterWorker
                         // remove packages with very low downloads and that are 404
                         && $this->downloadManager->getTotalDownloads($package) <= 100
                     ) {
-                        $name = $package->getName();
                         $this->packageManager->deletePackage($package);
 
                         return [