Merge pull request #560 from alcohol/refactor-mother-of-all-controllers

Refactoring web controller (and others)

src/Packagist/WebBundle/Controller/AboutController.php

@@ -14,6 +14,7 @@ namespace Packagist\WebBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
@@ -28,4 +29,12 @@ class AboutController extends Controller
     {
         return array();
     }
+
+    /**
+     * @Route("/about-composer")
+     */
+    public function aboutComposerFallbackAction()
+    {
+        return new RedirectResponse('https://getcomposer.org/', 301);
+    }
 }

src/Packagist/WebBundle/Controller/ExploreController.php

@@ -0,0 +1,151 @@
+<?php
+
+/*
+ * This file is part of Packagist.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *     Nils Adermann <naderman@naderman.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Packagist\WebBundle\Controller;
+
+use Doctrine\DBAL\ConnectionException;
+use Packagist\WebBundle\Entity\Package;
+use Packagist\WebBundle\Entity\PackageRepository;
+use Packagist\WebBundle\Entity\VersionRepository;
+use Pagerfanta\Adapter\FixedAdapter;
+use Pagerfanta\Pagerfanta;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @Route("/explore")
+ */
+class ExploreController extends Controller
+{
+    /**
+     * @Template()
+     * @Route("/", name="browse")
+     */
+    public function exploreAction()
+    {
+        /** @var PackageRepository $pkgRepo */
+        $pkgRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        /** @var VersionRepository $verRepo */
+        $verRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+        $newSubmitted = $pkgRepo->getQueryBuilderForNewestPackages()->setMaxResults(10)
+            ->getQuery()->useResultCache(true, 900, 'new_submitted_packages')->getResult();
+        $newReleases = $verRepo->getLatestReleases(10);
+        $randomIds = $this->getDoctrine()->getConnection()->fetchAll('SELECT id FROM package ORDER BY RAND() LIMIT 10');
+        $random = $pkgRepo->createQueryBuilder('p')->where('p.id IN (:ids)')->setParameter('ids', $randomIds)->getQuery()->getResult();
+        try {
+            $popular = array();
+            $popularIds = $this->get('snc_redis.default')->zrevrange('downloads:trending', 0, 9);
+            if ($popularIds) {
+                $popular = $pkgRepo->createQueryBuilder('p')->where('p.id IN (:ids)')->setParameter('ids', $popularIds)
+                    ->getQuery()->useResultCache(true, 900, 'popular_packages')->getResult();
+                usort($popular, function ($a, $b) use ($popularIds) {
+                    return array_search($a->getId(), $popularIds) > array_search($b->getId(), $popularIds) ? 1 : -1;
+                });
+            }
+        } catch (ConnectionException $e) {
+            $popular = array();
+        }
+
+        $data = array(
+            'newlySubmitted' => $newSubmitted,
+            'newlyReleased' => $newReleases,
+            'random' => $random,
+            'popular' => $popular,
+        );
+
+        return $data;
+    }
+
+    /**
+     * @Template()
+     * @Route("/popular.{_format}", name="browse_popular", defaults={"_format"="html"})
+     * @Cache(smaxage=900)
+     */
+    public function popularAction(Request $req)
+    {
+        try {
+            $redis = $this->get('snc_redis.default');
+            $perPage = $req->query->getInt('per_page', 15);
+            if ($perPage <= 0 || $perPage > 100) {
+                if ($req->getRequestFormat() === 'json') {
+                    return new JsonResponse(array(
+                        'status' => 'error',
+                        'message' => 'The optional packages per_page parameter must be an integer between 1 and 100 (default: 15)',
+                    ), 400);
+                }
+
+                $perPage = max(0, min(100, $perPage));
+            }
+
+            $popularIds = $redis->zrevrange(
+                'downloads:trending',
+                ($req->get('page', 1) - 1) * $perPage,
+                $req->get('page', 1) * $perPage - 1
+            );
+            $popular = $this->getDoctrine()->getRepository('PackagistWebBundle:Package')
+                ->createQueryBuilder('p')->where('p.id IN (:ids)')->setParameter('ids', $popularIds)
+                ->getQuery()->useResultCache(true, 900, 'popular_packages')->getResult();
+            usort($popular, function ($a, $b) use ($popularIds) {
+                return array_search($a->getId(), $popularIds) > array_search($b->getId(), $popularIds) ? 1 : -1;
+            });
+
+            $packages = new Pagerfanta(new FixedAdapter($redis->zcard('downloads:trending'), $popular));
+            $packages->setMaxPerPage($perPage);
+            $packages->setCurrentPage($req->get('page', 1), false, true);
+        } catch (ConnectionException $e) {
+            $packages = new Pagerfanta(new FixedAdapter(0, array()));
+        }
+
+        $data = array(
+            'packages' => $packages,
+        );
+        $data['meta'] = $this->getPackagesMetadata($data['packages']);
+
+        if ($req->getRequestFormat() === 'json') {
+            $result = array(
+                'packages' => array(),
+                'total' => $packages->getNbResults(),
+            );
+
+            /** @var Package $package */
+            foreach ($packages as $package) {
+                $url = $this->generateUrl('view_package', array('name' => $package->getName()), true);
+
+                $result['packages'][] = array(
+                    'name' => $package->getName(),
+                    'description' => $package->getDescription() ?: '',
+                    'url' => $url,
+                    'downloads' => $data['meta']['downloads'][$package->getId()],
+                    'favers' => $data['meta']['favers'][$package->getId()],
+                );
+            }
+
+            if ($packages->hasNextPage()) {
+                $params = array(
+                    '_format' => 'json',
+                    'page' => $packages->getNextPage(),
+                );
+                if ($perPage !== 15) {
+                    $params['per_page'] = $perPage;
+                }
+                $result['next'] = $this->generateUrl('browse_popular', $params, true);
+            }
+
+            return new JsonResponse($result);
+        }
+
+        return $data;
+    }
+}

src/Packagist/WebBundle/Controller/PackageController.php

@@ -2,24 +2,737 @@
 
 namespace Packagist\WebBundle\Controller;
 
+use Composer\Factory;
+use Composer\IO\BufferIO;
+use Composer\Package\Loader\ArrayLoader;
+use Composer\Package\Loader\ValidatingArrayLoader;
+use Composer\Repository\VcsRepository;
+use Doctrine\ORM\NoResultException;
+use Packagist\WebBundle\Entity\PackageRepository;
+use Packagist\WebBundle\Entity\VersionRepository;
+use Packagist\WebBundle\Form\Model\MaintainerRequest;
 use Packagist\WebBundle\Form\Type\AbandonedType;
 use Packagist\WebBundle\Entity\Package;
 use Packagist\WebBundle\Entity\Version;
+use Packagist\WebBundle\Form\Type\AddMaintainerRequestType;
+use Packagist\WebBundle\Form\Type\PackageType;
+use Packagist\WebBundle\Form\Type\RemoveMaintainerRequestType;
+use Predis\Connection\ConnectionException;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Composer\Package\Version\VersionParser;
 use DateTimeImmutable;
-
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Pagerfanta\Adapter\FixedAdapter;
 use Pagerfanta\Pagerfanta;
 
 class PackageController extends Controller
 {
+    /**
+     * @Template("PackagistWebBundle:Web:browse.html.twig")
+     * @Route("/packages/", name="allPackages")
+     * @Cache(smaxage=900)
+     */
+    public function allAction(Request $req)
+    {
+        $filters = array(
+            'type' => $req->query->get('type'),
+            'tag' => $req->query->get('tag'),
+        );
+
+        $data = $filters;
+        $page = $req->query->get('page', 1);
+
+        $packages = $this->getDoctrine()
+            ->getRepository('PackagistWebBundle:Package')
+            ->getFilteredQueryBuilder($filters);
+
+        $data['packages'] = $this->setupPager($packages, $page);
+        $data['meta'] = $this->getPackagesMetadata($data['packages']);
+
+        return $data;
+    }
+
+    /**
+     * @Route("/packages/list.json", name="list", defaults={"_format"="json"})
+     * @Method({"GET"})
+     * @Cache(smaxage=300)
+     */
+    public function listAction(Request $req)
+    {
+        /** @var PackageRepository $repo */
+        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $fields = (array) $req->query->get('fields', array());
+        $fields = array_intersect($fields, array('repository', 'type'));
+
+        if ($fields) {
+            $filters = array_filter(array(
+                'type' => $req->query->get('type'),
+                'vendor' => $req->query->get('vendor'),
+            ));
+
+            return new JsonResponse(array('packages' => $repo->getPackagesWithFields($filters, $fields)));
+        }
+
+        if ($req->query->get('type')) {
+            $names = $repo->getPackageNamesByType($req->query->get('type'));
+        } elseif ($req->query->get('vendor')) {
+            $names = $repo->getPackageNamesByVendor($req->query->get('vendor'));
+        } else {
+            $names = $repo->getPackageNames();
+        }
+
+        return new JsonResponse(array('packageNames' => $names));
+    }
+
+    /**
+     * @Template()
+     * @Route("/packages/submit", name="submit")
+     */
+    public function submitPackageAction(Request $req)
+    {
+        $package = new Package;
+        $package->setEntityRepository($this->getDoctrine()->getRepository('PackagistWebBundle:Package'));
+        $package->setRouter($this->get('router'));
+        $form = $this->createForm(new PackageType(), $package);
+        $user = $this->getUser();
+        $package->addMaintainer($user);
+
+        if ('POST' === $req->getMethod()) {
+            $form->bind($req);
+            if ($form->isValid()) {
+                try {
+                    $em = $this->getDoctrine()->getManager();
+                    $em->persist($package);
+                    $em->flush();
+
+                    $this->get('session')->getFlashBag()->set('success', $package->getName().' has been added to the package list, the repository will now be crawled.');
+
+                    return new RedirectResponse($this->generateUrl('view_package', array('name' => $package->getName())));
+                } catch (\Exception $e) {
+                    $this->get('logger')->crit($e->getMessage(), array('exception', $e));
+                    $this->get('session')->getFlashBag()->set('error', $package->getName().' could not be saved.');
+                }
+            }
+        }
+
+        return array('form' => $form->createView(), 'page' => 'submit');
+    }
+
+    /**
+     * @Route("/packages/fetch-info", name="submit.fetch_info", defaults={"_format"="json"})
+     */
+    public function fetchInfoAction(Request $req)
+    {
+        $package = new Package;
+        $package->setEntityRepository($this->getDoctrine()->getRepository('PackagistWebBundle:Package'));
+        $package->setRouter($this->get('router'));
+        $form = $this->createForm(new PackageType, $package);
+        $user = $this->getUser();
+        $package->addMaintainer($user);
+
+        $response = array('status' => 'error', 'reason' => 'No data posted.');
+        if ('POST' === $req->getMethod()) {
+            $form->bind($req);
+            if ($form->isValid()) {
+                list(, $name) = explode('/', $package->getName(), 2);
+
+                $existingPackages = $this->getDoctrine()
+                    ->getRepository('PackagistWebBundle:Package')
+                    ->createQueryBuilder('p')
+                    ->where('p.name LIKE ?0')
+                    ->setParameters(array('%/'.$name))
+                    ->getQuery()
+                    ->getResult();
+
+                $similar = array();
+
+                /** @var Package $existingPackage */
+                foreach ($existingPackages as $existingPackage) {
+                    $similar[] = array(
+                        'name' => $existingPackage->getName(),
+                        'url' => $this->generateUrl('view_package', array('name' => $existingPackage->getName()), true),
+                    );
+                }
+
+                $response = array('status' => 'success', 'name' => $package->getName(), 'similar' => $similar);
+            } else {
+                $errors = array();
+                if (count($form->getErrors())) {
+                    foreach ($form->getErrors() as $error) {
+                        $errors[] = $error->getMessageTemplate();
+                    }
+                }
+                foreach ($form->all() as $child) {
+                    if (count($child->getErrors())) {
+                        foreach ($child->getErrors() as $error) {
+                            $errors[] = $error->getMessageTemplate();
+                        }
+                    }
+                }
+                $response = array('status' => 'error', 'reason' => $errors);
+            }
+        }
+
+        return new JsonResponse($response);
+    }
+
+    /**
+     * @Template()
+     * @Route("/packages/{vendor}/", name="view_vendor", requirements={"vendor"="[A-Za-z0-9_.-]+"})
+     */
+    public function viewVendorAction($vendor)
+    {
+        $packages = $this->getDoctrine()
+            ->getRepository('PackagistWebBundle:Package')
+            ->createQueryBuilder('p')
+            ->where('p.name LIKE ?0')
+            ->setParameters(array($vendor.'/%'))
+            ->getQuery()
+            ->getResult();
+
+        if (!$packages) {
+            return $this->redirect($this->generateUrl('search', array('q' => $vendor, 'reason' => 'vendor_not_found')));
+        }
+
+        return array(
+            'packages' => $packages,
+            'meta' => $this->getPackagesMetadata($packages),
+            'vendor' => $vendor,
+            'paginate' => false,
+        );
+    }
+
+    /**
+     * @Route(
+     *     "/p/{name}.{_format}",
+     *     name="view_package_alias",
+     *     requirements={"name"="[A-Za-z0-9_.-]+(/[A-Za-z0-9_.-]+?)?", "_format"="(json)"},
+     *     defaults={"_format"="html"}
+     * )
+     * @Route(
+     *     "/packages/{name}",
+     *     name="view_package_alias2",
+     *     requirements={"name"="[A-Za-z0-9_.-]+(/[A-Za-z0-9_.-]+?)?/"},
+     *     defaults={"_format"="html"}
+     * )
+     * @Method({"GET"})
+     */
+    public function viewPackageAliasAction(Request $req, $name)
+    {
+        $format = $req->getRequestFormat();
+        if ($format === 'html') {
+            $format = null;
+        }
+
+        if (false === strpos(trim($name, '/'), '/')) {
+            return $this->redirect($this->generateUrl('view_vendor', array('vendor' => $name, '_format' => $format)));
+        }
+
+        return $this->redirect($this->generateUrl('view_package', array('name' => trim($name, '/'), '_format' => $format)));
+    }
+
+    /**
+     * @Template()
+     * @Route(
+     *     "/providers/{name}",
+     *     name="view_providers",
+     *     requirements={"name"="[A-Za-z0-9/_.-]+?"},
+     *     defaults={"_format"="html"}
+     * )
+     * @Method({"GET"})
+     */
+    public function viewProvidersAction(Request $req, $name)
+    {
+        /** @var PackageRepository $repo */
+        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $providers = $repo->findProviders($name);
+        if (!$providers) {
+            return $this->redirect($this->generateUrl('search', array('q' => $name, 'reason' => 'package_not_found')));
+        }
+
+        return $this->render('PackagistWebBundle:Web:providers.html.twig', array(
+            'name' => $name,
+            'packages' => $providers,
+            'meta' => $this->getPackagesMetadata($providers),
+            'paginate' => false,
+        ));
+    }
+
+    /**
+     * @Template()
+     * @Route(
+     *     "/packages/{name}.{_format}",
+     *     name="view_package",
+     *     requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?", "_format"="(json)"},
+     *     defaults={"_format"="html"}
+     * )
+     * @Method({"GET"})
+     */
+    public function viewPackageAction(Request $req, $name)
+    {
+        /** @var PackageRepository $repo */
+        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+
+        try {
+            /** @var Package $package */
+            $package = $repo->findOneByName($name);
+        } catch (NoResultException $e) {
+            if ('json' === $req->getRequestFormat()) {
+                return new JsonResponse(array('status' => 'error', 'message' => 'Package not found'), 404);
+            }
+
+            if ($providers = $repo->findProviders($name)) {
+                return $this->redirect($this->generateUrl('view_providers', array('name' => $name)));
+            }
+
+            return $this->redirect($this->generateUrl('search', array('q' => $name, 'reason' => 'package_not_found')));
+        }
+
+        if ('json' === $req->getRequestFormat()) {
+            $data = $package->toArray();
+
+            try {
+                $data['downloads'] = $this->get('packagist.download_manager')->getDownloads($package);
+                $data['favers'] = $this->get('packagist.favorite_manager')->getFaverCount($package);
+            } catch (ConnectionException $e) {
+                $data['downloads'] = null;
+                $data['favers'] = null;
+            }
+
+            // TODO invalidate cache on update and make the ttl longer
+            $response = new JsonResponse(array('package' => $data));
+            $response->setSharedMaxAge(3600);
+
+            return $response;
+        }
+
+        $version = null;
+        $expandedVersion = null;
+        $versions = $package->getVersions();
+        if (is_object($versions)) {
+            $versions = $versions->toArray();
+        }
+
+        usort($versions, Package::class.'::sortVersions');
+
+        if (count($versions)) {
+            /** @var VersionRepository $versionRepo */
+            $versionRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+            $version = $versionRepo->getFullVersion(reset($versions)->getId());
+
+            $expandedVersion = reset($versions);
+            foreach ($versions as $v) {
+                if (!$v->isDevelopment()) {
+                    $expandedVersion = $v;
+                    break;
+                }
+            }
+            $expandedVersion = $versionRepo->getFullVersion($expandedVersion->getId());
+        }
+
+        $data = array(
+            'package' => $package,
+            'version' => $version,
+            'versions' => $versions,
+            'expandedVersion' => $expandedVersion,
+        );
+
+        try {
+            $data['downloads'] = $this->get('packagist.download_manager')->getDownloads($package);
+
+            if ($this->getUser()) {
+                $data['is_favorite'] = $this->get('packagist.favorite_manager')->isMarked($this->getUser(), $package);
+            }
+        } catch (ConnectionException $e) {
+        }
+
+        $data['dependents'] = $repo->getDependentCount($package->getName());
+
+        if ($maintainerForm = $this->createAddMaintainerForm($package)) {
+            $data['addMaintainerForm'] = $maintainerForm->createView();
+        }
+        if ($removeMaintainerForm = $this->createRemoveMaintainerForm($package)) {
+            $data['removeMaintainerForm'] = $removeMaintainerForm->createView();
+        }
+        if ($deleteForm = $this->createDeletePackageForm($package)) {
+            $data['deleteForm'] = $deleteForm->createView();
+        }
+        if ($this->getUser() && (
+                $this->isGranted('ROLE_DELETE_PACKAGES')
+                || $package->getMaintainers()->contains($this->getUser())
+            )) {
+            $data['deleteVersionCsrfToken'] = $this->get('security.csrf.token_manager')->getToken('delete_version');
+        }
+
+        return $data;
+    }
+
+    /**
+     * @Template()
+     * @Route(
+     *     "/packages/{name}/downloads.{_format}",
+     *     name="package_downloads_full",
+     *     requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?", "_format"="(json)"}
+     * )
+     * @Method({"GET"})
+     */
+    public function viewPackageDownloadsAction(Request $req, $name)
+    {
+        /** @var PackageRepository $repo */
+        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+
+        try {
+            /** @var $package Package */
+            $package = $repo->findOneByName($name);
+        } catch (NoResultException $e) {
+            if ('json' === $req->getRequestFormat()) {
+                return new JsonResponse(array('status' => 'error', 'message' => 'Package not found'), 404);
+            }
+
+            if ($providers = $repo->findProviders($name)) {
+                return $this->redirect($this->generateUrl('view_providers', array('name' => $name)));
+            }
+
+            return $this->redirect($this->generateUrl('search', array('q' => $name, 'reason' => 'package_not_found')));
+        }
+
+        $versions = $package->getVersions();
+        $data = array(
+            'name' => $package->getName(),
+        );
+
+        try {
+            $data['downloads']['total'] = $this->get('packagist.download_manager')->getDownloads($package);
+            $data['favers'] = $this->get('packagist.favorite_manager')->getFaverCount($package);
+        } catch (ConnectionException $e) {
+            $data['downloads']['total'] = null;
+            $data['favers'] = null;
+        }
+
+        foreach ($versions as $version) {
+            try {
+                $data['downloads']['versions'][$version->getVersion()] = $this->get('packagist.download_manager')->getDownloads($package, $version);
+            } catch (ConnectionException $e) {
+                $data['downloads']['versions'][$version->getVersion()] = null;
+            }
+        }
+
+        $response = new Response(json_encode(array('package' => $data)), 200);
+        $response->setSharedMaxAge(3600);
+
+        return $response;
+    }
+
+    /**
+     * @Template()
+     * @Route(
+     *     "/versions/{versionId}.{_format}",
+     *     name="view_version",
+     *     requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?", "versionId"="[0-9]+", "_format"="(json)"}
+     * )
+     * @Method({"GET"})
+     */
+    public function viewPackageVersionAction(Request $req, $versionId)
+    {
+        /** @var VersionRepository $repo  */
+        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+
+        $html = $this->renderView(
+            'PackagistWebBundle:Web:versionDetails.html.twig',
+            array('version' => $repo->getFullVersion($versionId))
+        );
+
+        return new JsonResponse(array('content' => $html));
+    }
+
+    /**
+     * @Template()
+     * @Route(
+     *     "/versions/{versionId}/delete",
+     *     name="delete_version",
+     *     requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?", "versionId"="[0-9]+"}
+     * )
+     * @Method({"DELETE"})
+     */
+    public function deletePackageVersionAction(Request $req, $versionId)
+    {
+        /** @var VersionRepository $repo  */
+        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+
+        /** @var Version $version  */
+        $version = $repo->getFullVersion($versionId);
+        $package = $version->getPackage();
+
+        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->isGranted('ROLE_DELETE_PACKAGES')) {
+            throw new AccessDeniedException;
+        }
+
+        if (!$this->get('form.csrf_provider')->isCsrfTokenValid('delete_version', $req->request->get('_token'))) {
+            throw new AccessDeniedException;
+        }
+
+        $repo->remove($version);
+        $this->getDoctrine()->getManager()->flush();
+        $this->getDoctrine()->getManager()->clear();
+
+        return new Response('', 204);
+    }
+
+    /**
+     * @Template()
+     * @Route("/packages/{name}", name="update_package", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"}, defaults={"_format" = "json"})
+     * @Method({"PUT"})
+     */
+    public function updatePackageAction($name)
+    {
+        $doctrine = $this->getDoctrine();
+
+        try {
+            /** @var Package $package */
+            $package = $doctrine
+                ->getRepository('PackagistWebBundle:Package')
+                ->getPackageByName($name);
+        } catch (NoResultException $e) {
+            return new Response(json_encode(array('status' => 'error', 'message' => 'Package not found',)), 404);
+        }
+
+        $req = $this->getRequest();
+
+        $username = $req->request->has('username') ?
+            $req->request->get('username') :
+            $req->query->get('username');
+
+        $apiToken = $req->request->has('apiToken') ?
+            $req->request->get('apiToken') :
+            $req->query->get('apiToken');
+
+        $update = $req->request->get('update', $req->query->get('update'));
+        $autoUpdated = $req->request->get('autoUpdated', $req->query->get('autoUpdated'));
+        $updateEqualRefs = $req->request->get('updateAll', $req->query->get('updateAll'));
+
+        $user = $this->getUser() ?: $doctrine
+            ->getRepository('PackagistWebBundle:User')
+            ->findOneBy(array('username' => $username, 'apiToken' => $apiToken));
+
+        if (!$user) {
+            return new Response(json_encode(array('status' => 'error', 'message' => 'Invalid credentials',)), 403);
+        }
+
+        if ($package->getMaintainers()->contains($user) || $this->isGranted('ROLE_UPDATE_PACKAGES')) {
+            $req->getSession()->save();
+
+            if (null !== $autoUpdated) {
+                $package->setAutoUpdated((Boolean) $autoUpdated);
+                $doctrine->getManager()->flush();
+            }
+
+            if ($update) {
+                set_time_limit(3600);
+                $updater = $this->get('packagist.package_updater');
+
+                $io = new BufferIO('', OutputInterface::VERBOSITY_VERY_VERBOSE, new HtmlOutputFormatter(Factory::createAdditionalStyles()));
+                $config = Factory::createConfig();
+                $io->loadConfiguration($config);
+                $repository = new VcsRepository(array('url' => $package->getRepository()), $io, $config);
+                $loader = new ValidatingArrayLoader(new ArrayLoader());
+                $repository->setLoader($loader);
+
+                try {
+                    $updater->update($io, $config, $package, $repository, $updateEqualRefs ? Updater::UPDATE_EQUAL_REFS : 0);
+                } catch (\Exception $e) {
+                    return new Response(json_encode(array(
+                                                        'status' => 'error',
+                                                        'message' => '['.get_class($e).'] '.$e->getMessage(),
+                                                        'details' => '<pre>'.$io->getOutput().'</pre>',
+                                                    )), 400);
+                }
+            }
+
+            return new Response('{"status": "success"}', 202);
+        }
+
+        return new JsonResponse(array('status' => 'error', 'message' => 'Could not find a package that matches this request (does user maintain the package?)',), 404);
+    }
+
+    /**
+     * @Template()
+     * @Route("/packages/{name}", name="delete_package", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
+     * @Method({"DELETE"})
+     */
+    public function deletePackageAction(Request $req, $name)
+    {
+        $doctrine = $this->getDoctrine();
+
+        try {
+            /** @var Package $package */
+            $package = $doctrine
+                ->getRepository('PackagistWebBundle:Package')
+                ->findOneByName($name);
+        } catch (NoResultException $e) {
+            throw new NotFoundHttpException('The requested package, '.$name.', was not found.');
+        }
+
+        if (!$form = $this->createDeletePackageForm($package)) {
+            throw new AccessDeniedException;
+        }
+        $form->bind($req->request->get('form'));
+        if ($form->isValid()) {
+            $req->getSession()->save();
+
+            /** @var VersionRepository $versionRepo */
+            $versionRepo = $doctrine->getRepository('PackagistWebBundle:Version');
+            foreach ($package->getVersions() as $version) {
+                $versionRepo->remove($version);
+            }
+
+            $packageId = $package->getId();
+            $em = $doctrine->getManager();
+            $em->remove($package);
+            $em->flush();
+
+            // attempt solr cleanup
+            try {
+                /** @var \Solarium_Client $solarium */
+                $solarium = $this->get('solarium.client');
+
+                $update = $solarium->createUpdate();
+                $update->addDeleteById($packageId);
+                $update->addCommit();
+
+                $solarium->update($update);
+            } catch (\Solarium_Client_HttpException $e) {}
+
+            return new Response('', 204);
+        }
+
+        return new Response('Invalid form input', 400);
+    }
+
+    /**
+     * @Template("PackagistWebBundle:Web:viewPackage.html.twig")
+     * @Route("/packages/{name}/maintainers/", name="add_maintainer", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
+     */
+    public function createMaintainerAction(Request $req, $name)
+    {
+        /** @var $package Package */
+        $package = $this->getDoctrine()
+            ->getRepository('PackagistWebBundle:Package')
+            ->findOneByName($name);
+
+        if (!$package) {
+            throw new NotFoundHttpException('The requested package, '.$name.', was not found.');
+        }
+
+        if (!$form = $this->createAddMaintainerForm($package)) {
+            throw new AccessDeniedException('You must be a package\'s maintainer to modify maintainers.');
+        }
+
+        $data = array(
+            'package' => $package,
+            'versions' => null,
+            'expandedVersion' => null,
+            'version' => null,
+            'addMaintainerForm' => $form->createView(),
+            'show_add_maintainer_form' => true,
+        );
+
+        if ('POST' === $req->getMethod()) {
+            $form->bind($req);
+            if ($form->isValid()) {
+                try {
+                    $em = $this->getDoctrine()->getManager();
+                    $user = $form->getData()->getUser();
+
+                    if (!empty($user)) {
+                        if (!$package->getMaintainers()->contains($user)) {
+                            $package->addMaintainer($user);
+                            $this->get('packagist.package_manager')->notifyNewMaintainer($user, $package);
+                        }
+
+                        $em->persist($package);
+                        $em->flush();
+
+                        $this->get('session')->getFlashBag()->set('success', $user->getUsername().' is now a '.$package->getName().' maintainer.');
+
+                        return new RedirectResponse($this->generateUrl('view_package', array('name' => $package->getName())));
+                    }
+                    $this->get('session')->getFlashBag()->set('error', 'The user could not be found.');
+                } catch (\Exception $e) {
+                    $this->get('logger')->crit($e->getMessage(), array('exception', $e));
+                    $this->get('session')->getFlashBag()->set('error', 'The maintainer could not be added.');
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @Template("PackagistWebBundle:Web:viewPackage.html.twig")
+     * @Route("/packages/{name}/maintainers/delete", name="remove_maintainer", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
+     */
+    public function removeMaintainerAction(Request $req, $name)
+    {
+        /** @var $package Package */
+        $package = $this->getDoctrine()
+            ->getRepository('PackagistWebBundle:Package')
+            ->findOneByName($name);
+
+        if (!$package) {
+            throw new NotFoundHttpException('The requested package, '.$name.', was not found.');
+        }
+        if (!$removeMaintainerForm = $this->createRemoveMaintainerForm($package)) {
+            throw new AccessDeniedException('You must be a package\'s maintainer to modify maintainers.');
+        }
+
+        $data = array(
+            'package' => $package,
+            'versions' => null,
+            'expandedVersion' => null,
+            'version' => null,
+            'removeMaintainerForm' => $removeMaintainerForm->createView(),
+            'show_remove_maintainer_form' => true,
+        );
+
+        if ('POST' === $req->getMethod()) {
+            $removeMaintainerForm->bind($req);
+            if ($removeMaintainerForm->isValid()) {
+                try {
+                    $em = $this->getDoctrine()->getManager();
+                    $user = $removeMaintainerForm->getData()->getUser();
+
+                    if (!empty($user)) {
+                        if ($package->getMaintainers()->contains($user)) {
+                            $package->getMaintainers()->removeElement($user);
+                        }
+
+                        $em->persist($package);
+                        $em->flush();
+
+                        $this->get('session')->getFlashBag()->set('success', $user->getUsername().' is no longer a '.$package->getName().' maintainer.');
+
+                        return new RedirectResponse($this->generateUrl('view_package', array('name' => $package->getName())));
+                    }
+                    $this->get('session')->getFlashBag()->set('error', 'The user could not be found.');
+                } catch (\Exception $e) {
+                    $this->get('logger')->crit($e->getMessage(), array('exception', $e));
+                    $this->get('session')->getFlashBag()->set('error', 'The maintainer could not be removed.');
+                }
+            }
+        }
+
+        return $data;
+    }
+
     /**
      * @Template()
      * @Route(
@@ -143,6 +856,7 @@ class PackageController extends Controller
 
         if ($req->getRequestFormat() === 'json') {
             $data['versions'] = array_map(function ($version) {
+                /** @var Version $version */
                 return $version->getVersion();
             }, $data['versions']);
 
@@ -153,6 +867,7 @@ class PackageController extends Controller
 
         $expandedVersion = reset($versions);
         foreach ($versions as $v) {
+            /** @var Version $v */
             if (!$v->isDevelopment()) {
                 $expandedVersion = $v;
                 break;
@@ -175,6 +890,7 @@ class PackageController extends Controller
     {
         $page = $req->query->get('page', 1);
 
+        /** @var PackageRepository $repo */
         $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
         $depCount = $repo->getDependentCount($name);
         $packages = $repo->getDependents($name, ($page - 1) * 15, 15);
@@ -281,6 +997,58 @@ class PackageController extends Controller
         return $this->overallStatsAction($req, $package, $version);
     }
 
+    private function createAddMaintainerForm($package)
+    {
+        if (!$user = $this->getUser()) {
+            return;
+        }
+
+        if ($this->isGranted('ROLE_EDIT_PACKAGES') || $package->getMaintainers()->contains($user)) {
+            $maintainerRequest = new MaintainerRequest();
+            return $this->createForm(new AddMaintainerRequestType(), $maintainerRequest);
+        }
+    }
+
+    private function createRemoveMaintainerForm(Package $package)
+    {
+        if (!($user = $this->getUser()) || 1 == $package->getMaintainers()->count()) {
+            return;
+        }
+
+        if ($this->isGranted('ROLE_EDIT_PACKAGES') || $package->getMaintainers()->contains($user)) {
+            $maintainerRequest = new MaintainerRequest();
+            return $this->createForm(new RemoveMaintainerRequestType(), $maintainerRequest, array('package'=>$package));
+        }
+    }
+
+    private function createDeletePackageForm(Package $package)
+    {
+        if (!$user = $this->getUser()) {
+            return;
+        }
+
+        // super admins bypass additional checks
+        if (!$this->isGranted('ROLE_DELETE_PACKAGES')) {
+            // non maintainers can not delete
+            if (!$package->getMaintainers()->contains($user)) {
+                return;
+            }
+
+            try {
+                $downloads = $this->get('packagist.download_manager')->getTotalDownloads($package);
+            } catch (ConnectionException $e) {
+                return;
+            }
+
+            // more than 100 downloads = established package, do not allow deletion by maintainers
+            if ($downloads > 100) {
+                return;
+            }
+        }
+
+        return $this->createFormBuilder(array())->getForm();
+    }
+
     private function createDatePoints(DateTimeImmutable $from, DateTimeImmutable $to, $average, Package $package, Version $version = null)
     {
         $interval = $this->getStatsInterval($average);

src/Packagist/WebBundle/Controller/WebController.php

@@ -12,39 +12,17 @@
 
 namespace Packagist\WebBundle\Controller;
 
-use Composer\Console\HtmlOutputFormatter;
-use Composer\Factory;
-use Composer\IO\BufferIO;
-use Composer\Package\Loader\ArrayLoader;
-use Composer\Package\Loader\ValidatingArrayLoader;
-use Composer\Repository\VcsRepository;
-use Doctrine\ORM\NoResultException;
-use Packagist\WebBundle\Entity\Package;
-use Packagist\WebBundle\Entity\Version;
-use Packagist\WebBundle\Form\Model\MaintainerRequest;
 use Packagist\WebBundle\Form\Model\SearchQuery;
-use Packagist\WebBundle\Form\Type\AddMaintainerRequestType;
-use Packagist\WebBundle\Form\Type\PackageType;
-use Packagist\WebBundle\Form\Type\RemoveMaintainerRequestType;
 use Packagist\WebBundle\Form\Type\SearchQueryType;
-use Packagist\WebBundle\Package\Updater;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
-use Pagerfanta\Adapter\FixedAdapter;
 use Pagerfanta\Adapter\SolariumAdapter;
 use Pagerfanta\Pagerfanta;
 use Predis\Connection\ConnectionException;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
@@ -60,179 +38,6 @@ class WebController extends Controller
         return array('page' => 'home');
     }
 
-    /**
-     * @Template("PackagistWebBundle:Web:browse.html.twig")
-     * @Route("/packages/", name="allPackages")
-     * @Cache(smaxage=900)
-     */
-    public function allAction(Request $req)
-    {
-        $filters = array(
-            'type' => $req->query->get('type'),
-            'tag' => $req->query->get('tag'),
-        );
-
-        $data = $filters;
-        $page = $req->query->get('page', 1);
-
-        $packages = $this->getDoctrine()
-            ->getRepository('PackagistWebBundle:Package')
-            ->getFilteredQueryBuilder($filters);
-
-        $data['packages'] = $this->setupPager($packages, $page);
-        $data['meta'] = $this->getPackagesMetadata($data['packages']);
-
-        return $data;
-    }
-
-    /**
-     * @Template()
-     * @Route("/explore/", name="browse")
-     */
-    public function exploreAction(Request $req)
-    {
-        $pkgRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
-        $verRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
-        $newSubmitted = $pkgRepo->getQueryBuilderForNewestPackages()->setMaxResults(10)
-            ->getQuery()->useResultCache(true, 900, 'new_submitted_packages')->getResult();
-        $newReleases = $verRepo->getLatestReleases(10);
-        $randomIds = $this->getDoctrine()->getConnection()->fetchAll('SELECT id FROM package ORDER BY RAND() LIMIT 10');
-        $random = $pkgRepo->createQueryBuilder('p')->where('p.id IN (:ids)')->setParameter('ids', $randomIds)->getQuery()->getResult();
-        try {
-            $popular = array();
-            $popularIds = $this->get('snc_redis.default')->zrevrange('downloads:trending', 0, 9);
-            if ($popularIds) {
-                $popular = $pkgRepo->createQueryBuilder('p')->where('p.id IN (:ids)')->setParameter('ids', $popularIds)
-                    ->getQuery()->useResultCache(true, 900, 'popular_packages')->getResult();
-                usort($popular, function ($a, $b) use ($popularIds) {
-                    return array_search($a->getId(), $popularIds) > array_search($b->getId(), $popularIds) ? 1 : -1;
-                });
-            }
-        } catch (ConnectionException $e) {
-            $popular = array();
-        }
-
-        $data = array(
-            'newlySubmitted' => $newSubmitted,
-            'newlyReleased' => $newReleases,
-            'random' => $random,
-            'popular' => $popular,
-        );
-
-        return $data;
-    }
-
-    /**
-     * @Template()
-     * @Route("/explore/popular.{_format}", name="browse_popular", defaults={"_format"="html"})
-     * @Cache(smaxage=900)
-     */
-    public function popularAction(Request $req)
-    {
-        try {
-            $redis = $this->get('snc_redis.default');
-            $perPage = $req->query->getInt('per_page', 15);
-            if ($perPage <= 0 || $perPage > 100) {
-                if ($req->getRequestFormat() === 'json') {
-                    return new JsonResponse(array(
-                        'status' => 'error',
-                        'message' => 'The optional packages per_page parameter must be an integer between 1 and 100 (default: 15)',
-                    ), 400);
-                }
-
-                $perPage = max(0, min(100, $perPage));
-            }
-
-            $popularIds = $redis->zrevrange(
-                'downloads:trending',
-                ($req->get('page', 1) - 1) * $perPage,
-                $req->get('page', 1) * $perPage - 1
-            );
-            $popular = $this->getDoctrine()->getRepository('PackagistWebBundle:Package')
-                ->createQueryBuilder('p')->where('p.id IN (:ids)')->setParameter('ids', $popularIds)
-                ->getQuery()->useResultCache(true, 900, 'popular_packages')->getResult();
-            usort($popular, function ($a, $b) use ($popularIds) {
-                return array_search($a->getId(), $popularIds) > array_search($b->getId(), $popularIds) ? 1 : -1;
-            });
-
-            $packages = new Pagerfanta(new FixedAdapter($redis->zcard('downloads:trending'), $popular));
-            $packages->setMaxPerPage($perPage);
-            $packages->setCurrentPage($req->get('page', 1), false, true);
-        } catch (ConnectionException $e) {
-            $packages = new Pagerfanta(new FixedAdapter(0, array()));
-        }
-
-        $data = array(
-            'packages' => $packages,
-        );
-        $data['meta'] = $this->getPackagesMetadata($data['packages']);
-
-        if ($req->getRequestFormat() === 'json') {
-            $result = array(
-                'packages' => array(),
-                'total' => $packages->getNbResults(),
-            );
-
-            foreach ($packages as $package) {
-                $url = $this->generateUrl('view_package', array('name' => $package->getName()), true);
-
-                $result['packages'][] = array(
-                    'name' => $package->getName(),
-                    'description' => $package->getDescription() ?: '',
-                    'url' => $url,
-                    'downloads' => $data['meta']['downloads'][$package->getId()],
-                    'favers' => $data['meta']['favers'][$package->getId()],
-                );
-            }
-
-            if ($packages->hasNextPage()) {
-                $params = array(
-                    '_format' => 'json',
-                    'page' => $packages->getNextPage()
-                );
-                if ($perPage !== 15) {
-                    $params['per_page'] = $perPage;
-                }
-                $result['next'] = $this->generateUrl('browse_popular', $params, true);
-            }
-
-            return new JsonResponse($result);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @Route("/packages/list.json", name="list", defaults={"_format"="json"})
-     * @Method({"GET"})
-     * @Cache(smaxage=300)
-     */
-    public function listAction(Request $req)
-    {
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
-        $fields = (array) $req->query->get('fields', array());
-        $fields = array_intersect($fields, array('repository', 'type'));
-
-        if ($fields) {
-            $filters = array_filter(array(
-                'type' => $req->query->get('type'),
-                'vendor' => $req->query->get('vendor'),
-            ));
-
-            return new JsonResponse(array('packages' => $repo->getPackagesWithFields($filters, $fields)));
-        }
-
-        if ($req->query->get('type')) {
-            $names = $repo->getPackageNamesByType($req->query->get('type'));
-        } elseif ($req->query->get('vendor')) {
-            $names = $repo->getPackageNamesByVendor($req->query->get('vendor'));
-        } else {
-            $names = $repo->getPackageNames();
-        }
-
-        return new JsonResponse(array('packageNames' => $names));
-    }
-
     public function searchFormAction(Request $req)
     {
         $form = $this->createForm(new SearchQueryType, new SearchQuery);
@@ -431,637 +236,6 @@ class WebController extends Controller
         return $this->render('PackagistWebBundle:Web:search.html.twig');
     }
 
-    /**
-     * @Template()
-     * @Route("/packages/submit", name="submit")
-     */
-    public function submitPackageAction(Request $req)
-    {
-        $package = new Package;
-        $package->setEntityRepository($this->getDoctrine()->getRepository('PackagistWebBundle:Package'));
-        $package->setRouter($this->get('router'));
-        $form = $this->createForm(new PackageType, $package);
-        $user = $this->getUser();
-        $package->addMaintainer($user);
-
-        if ('POST' === $req->getMethod()) {
-            $form->bind($req);
-            if ($form->isValid()) {
-                try {
-                    $em = $this->getDoctrine()->getManager();
-                    $em->persist($package);
-                    $em->flush();
-
-                    $this->get('session')->getFlashBag()->set('success', $package->getName().' has been added to the package list, the repository will now be crawled.');
-
-                    return new RedirectResponse($this->generateUrl('view_package', array('name' => $package->getName())));
-                } catch (\Exception $e) {
-                    $this->get('logger')->crit($e->getMessage(), array('exception', $e));
-                    $this->get('session')->getFlashBag()->set('error', $package->getName().' could not be saved.');
-                }
-            }
-        }
-
-        return array('form' => $form->createView(), 'page' => 'submit');
-    }
-
-    /**
-     * @Route("/packages/fetch-info", name="submit.fetch_info", defaults={"_format"="json"})
-     */
-    public function fetchInfoAction(Request $req)
-    {
-        $package = new Package;
-        $package->setEntityRepository($this->getDoctrine()->getRepository('PackagistWebBundle:Package'));
-        $package->setRouter($this->get('router'));
-        $form = $this->createForm(new PackageType, $package);
-        $user = $this->getUser();
-        $package->addMaintainer($user);
-
-        $response = array('status' => 'error', 'reason' => 'No data posted.');
-        if ('POST' === $req->getMethod()) {
-            $form->bind($req);
-            if ($form->isValid()) {
-                list(, $name) = explode('/', $package->getName(), 2);
-
-                $existingPackages = $this->getDoctrine()
-                    ->getRepository('PackagistWebBundle:Package')
-                    ->createQueryBuilder('p')
-                    ->where('p.name LIKE ?0')
-                    ->setParameters(array('%/'.$name))
-                    ->getQuery()
-                    ->getResult();
-
-                $similar = array();
-
-                foreach ($existingPackages as $existingPackage) {
-                    $similar[] = array(
-                        'name' => $existingPackage->getName(),
-                        'url' => $this->generateUrl('view_package', array('name' => $existingPackage->getName()), true),
-                    );
-                }
-
-                $response = array('status' => 'success', 'name' => $package->getName(), 'similar' => $similar);
-            } else {
-                $errors = array();
-                if (count($form->getErrors())) {
-                    foreach ($form->getErrors() as $error) {
-                        $errors[] = $error->getMessageTemplate();
-                    }
-                }
-                foreach ($form->all() as $child) {
-                    if (count($child->getErrors())) {
-                        foreach ($child->getErrors() as $error) {
-                            $errors[] = $error->getMessageTemplate();
-                        }
-                    }
-                }
-                $response = array('status' => 'error', 'reason' => $errors);
-            }
-        }
-
-        return new JsonResponse($response);
-    }
-
-    /**
-     * @Template()
-     * @Route("/packages/{vendor}/", name="view_vendor", requirements={"vendor"="[A-Za-z0-9_.-]+"})
-     */
-    public function viewVendorAction($vendor)
-    {
-        $packages = $this->getDoctrine()
-            ->getRepository('PackagistWebBundle:Package')
-            ->createQueryBuilder('p')
-            ->where('p.name LIKE ?0')
-            ->setParameters(array($vendor.'/%'))
-            ->getQuery()
-            ->getResult();
-
-        if (!$packages) {
-            return $this->redirect($this->generateUrl('search', array('q' => $vendor, 'reason' => 'vendor_not_found')));
-        }
-
-        return array(
-            'packages' => $packages,
-            'meta' => $this->getPackagesMetadata($packages),
-            'vendor' => $vendor,
-            'paginate' => false
-        );
-    }
-
-    /**
-     * @Route(
-     *     "/p/{name}.{_format}",
-     *     name="view_package_alias",
-     *     requirements={"name"="[A-Za-z0-9_.-]+(/[A-Za-z0-9_.-]+?)?", "_format"="(json)"},
-     *     defaults={"_format"="html"}
-     * )
-     * @Route(
-     *     "/packages/{name}",
-     *     name="view_package_alias2",
-     *     requirements={"name"="[A-Za-z0-9_.-]+(/[A-Za-z0-9_.-]+?)?/"},
-     *     defaults={"_format"="html"}
-     * )
-     * @Method({"GET"})
-     */
-    public function viewPackageAliasAction(Request $req, $name)
-    {
-        $format = $req->getRequestFormat();
-        if ($format === 'html') {
-            $format = null;
-        }
-
-        if (false === strpos(trim($name, '/'), '/')) {
-            return $this->redirect($this->generateUrl('view_vendor', array('vendor' => $name, '_format' => $format)));
-        }
-
-        return $this->redirect($this->generateUrl('view_package', array('name' => trim($name, '/'), '_format' => $format)));
-    }
-
-    /**
-     * @Template()
-     * @Route(
-     *     "/providers/{name}",
-     *     name="view_providers",
-     *     requirements={"name"="[A-Za-z0-9/_.-]+?"},
-     *     defaults={"_format"="html"}
-     * )
-     * @Method({"GET"})
-     */
-    public function viewProvidersAction(Request $req, $name)
-    {
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
-        $providers = $repo->findProviders($name);
-        if (!$providers) {
-            return $this->redirect($this->generateUrl('search', array('q' => $name, 'reason' => 'package_not_found')));
-        }
-
-        return $this->render('PackagistWebBundle:Web:providers.html.twig', array(
-            'name' => $name,
-            'packages' => $providers,
-            'meta' => $this->getPackagesMetadata($providers),
-            'paginate' => false
-        ));
-    }
-
-    /**
-     * @Template()
-     * @Route(
-     *     "/packages/{name}.{_format}",
-     *     name="view_package",
-     *     requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?", "_format"="(json)"},
-     *     defaults={"_format"="html"}
-     * )
-     * @Method({"GET"})
-     */
-    public function viewPackageAction(Request $req, $name)
-    {
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
-
-        try {
-            /** @var $package Package */
-            $package = $repo->findOneByName($name);
-        } catch (NoResultException $e) {
-            if ('json' === $req->getRequestFormat()) {
-                return new JsonResponse(array('status' => 'error', 'message' => 'Package not found'), 404);
-            }
-
-            if ($providers = $repo->findProviders($name)) {
-                return $this->redirect($this->generateUrl('view_providers', array('name' => $name)));
-            }
-
-            return $this->redirect($this->generateUrl('search', array('q' => $name, 'reason' => 'package_not_found')));
-        }
-
-        if ('json' === $req->getRequestFormat()) {
-            $data = $package->toArray();
-
-            try {
-                $data['downloads'] = $this->get('packagist.download_manager')->getDownloads($package);
-                $data['favers'] = $this->get('packagist.favorite_manager')->getFaverCount($package);
-            } catch (ConnectionException $e) {
-                $data['downloads'] = null;
-                $data['favers'] = null;
-            }
-
-            // TODO invalidate cache on update and make the ttl longer
-            $response = new JsonResponse(array('package' => $data));
-            $response->setSharedMaxAge(3600);
-
-            return $response;
-        }
-
-        $version = null;
-        $expandedVersion = null;
-        $versions = $package->getVersions();
-        if (is_object($versions)) {
-            $versions = $versions->toArray();
-        }
-
-        usort($versions, Package::class.'::sortVersions');
-
-        if (count($versions)) {
-            $versionRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
-            $version = $versionRepo->getFullVersion(reset($versions)->getId());
-
-            $expandedVersion = reset($versions);
-            foreach ($versions as $v) {
-                if (!$v->isDevelopment()) {
-                    $expandedVersion = $v;
-                    break;
-                }
-            }
-            $expandedVersion = $versionRepo->getFullVersion($expandedVersion->getId());
-        }
-
-        $data = array(
-            'package' => $package,
-            'version' => $version,
-            'versions' => $versions,
-            'expandedVersion' => $expandedVersion,
-        );
-
-        try {
-            $data['downloads'] = $this->get('packagist.download_manager')->getDownloads($package);
-
-            if ($this->getUser()) {
-                $data['is_favorite'] = $this->get('packagist.favorite_manager')->isMarked($this->getUser(), $package);
-            }
-        } catch (ConnectionException $e) {
-        }
-
-        $data['dependents'] = $repo->getDependentCount($package->getName());
-
-        if ($maintainerForm = $this->createAddMaintainerForm($package)) {
-            $data['addMaintainerForm'] = $maintainerForm->createView();
-        }
-        if ($removeMaintainerForm = $this->createRemoveMaintainerForm($package)) {
-            $data['removeMaintainerForm'] = $removeMaintainerForm->createView();
-        }
-        if ($deleteForm = $this->createDeletePackageForm($package)) {
-            $data['deleteForm'] = $deleteForm->createView();
-        }
-        if ($this->getUser() && (
-            $this->isGranted('ROLE_DELETE_PACKAGES')
-            || $package->getMaintainers()->contains($this->getUser())
-        )) {
-            $data['deleteVersionCsrfToken'] = $this->get('security.csrf.token_manager')->getToken('delete_version');
-        }
-
-        return $data;
-    }
-
-    /**
-     * @Template()
-     * @Route(
-     *     "/packages/{name}/downloads.{_format}",
-     *     name="package_downloads_full",
-     *     requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?", "_format"="(json)"}
-     * )
-     * @Method({"GET"})
-     */
-    public function viewPackageDownloadsAction(Request $req, $name)
-    {
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
-
-        try {
-            /** @var $package Package */
-            $package = $repo->findOneByName($name);
-        } catch (NoResultException $e) {
-            if ('json' === $req->getRequestFormat()) {
-                return new JsonResponse(array('status' => 'error', 'message' => 'Package not found'), 404);
-            }
-
-            if ($providers = $repo->findProviders($name)) {
-                return $this->redirect($this->generateUrl('view_providers', array('name' => $name)));
-            }
-
-            return $this->redirect($this->generateUrl('search', array('q' => $name, 'reason' => 'package_not_found')));
-        }
-
-        $versions = $package->getVersions();
-        $data = array(
-            'name' => $package->getName(),
-        );
-
-        try {
-            $data['downloads']['total'] = $this->get('packagist.download_manager')->getDownloads($package);
-            $data['favers'] = $this->get('packagist.favorite_manager')->getFaverCount($package);
-        } catch (ConnectionException $e) {
-            $data['downloads']['total'] = null;
-            $data['favers'] = null;
-        }
-
-        foreach ($versions as $version) {
-            try {
-                $data['downloads']['versions'][$version->getVersion()] = $this->get('packagist.download_manager')->getDownloads($package, $version);
-            } catch (ConnectionException $e) {
-                $data['downloads']['versions'][$version->getVersion()] = null;
-            }
-        }
-
-        $response = new Response(json_encode(array('package' => $data)), 200);
-        $response->setSharedMaxAge(3600);
-
-        return $response;
-    }
-
-    /**
-     * @Template()
-     * @Route(
-     *     "/versions/{versionId}.{_format}",
-     *     name="view_version",
-     *     requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?", "versionId"="[0-9]+", "_format"="(json)"}
-     * )
-     * @Method({"GET"})
-     */
-    public function viewPackageVersionAction(Request $req, $versionId)
-    {
-        /** @var \Packagist\WebBundle\Entity\VersionRepository $repo  */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
-
-        $html = $this->renderView(
-            'PackagistWebBundle:Web:versionDetails.html.twig',
-            array('version' => $repo->getFullVersion($versionId))
-        );
-
-        return new JsonResponse(array('content' => $html));
-    }
-
-    /**
-     * @Template()
-     * @Route(
-     *     "/versions/{versionId}/delete",
-     *     name="delete_version",
-     *     requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?", "versionId"="[0-9]+"}
-     * )
-     * @Method({"DELETE"})
-     */
-    public function deletePackageVersionAction(Request $req, $versionId)
-    {
-        /** @var \Packagist\WebBundle\Entity\VersionRepository $repo  */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
-
-        /** @var Version $version  */
-        $version = $repo->getFullVersion($versionId);
-        $package = $version->getPackage();
-
-        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->isGranted('ROLE_DELETE_PACKAGES')) {
-            throw new AccessDeniedException;
-        }
-
-        if (!$this->get('form.csrf_provider')->isCsrfTokenValid('delete_version', $req->request->get('_token'))) {
-            throw new AccessDeniedException;
-        }
-
-        $repo->remove($version);
-        $this->getDoctrine()->getManager()->flush();
-        $this->getDoctrine()->getManager()->clear();
-
-        return new Response('', 204);
-    }
-
-    /**
-     * @Template()
-     * @Route("/packages/{name}", name="update_package", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"}, defaults={"_format" = "json"})
-     * @Method({"PUT"})
-     */
-    public function updatePackageAction($name)
-    {
-        $doctrine = $this->getDoctrine();
-
-        try {
-            $package = $doctrine
-                ->getRepository('PackagistWebBundle:Package')
-                ->getPackageByName($name);
-        } catch (NoResultException $e) {
-            return new Response(json_encode(array('status' => 'error', 'message' => 'Package not found',)), 404);
-        }
-
-        $req = $this->getRequest();
-
-        $username = $req->request->has('username') ?
-            $req->request->get('username') :
-            $req->query->get('username');
-
-        $apiToken = $req->request->has('apiToken') ?
-            $req->request->get('apiToken') :
-            $req->query->get('apiToken');
-
-        $update = $req->request->get('update', $req->query->get('update'));
-        $autoUpdated = $req->request->get('autoUpdated', $req->query->get('autoUpdated'));
-        $updateEqualRefs = $req->request->get('updateAll', $req->query->get('updateAll'));
-
-        $user = $this->getUser() ?: $doctrine
-            ->getRepository('PackagistWebBundle:User')
-            ->findOneBy(array('username' => $username, 'apiToken' => $apiToken));
-
-        if (!$user) {
-            return new Response(json_encode(array('status' => 'error', 'message' => 'Invalid credentials',)), 403);
-        }
-
-        if ($package->getMaintainers()->contains($user) || $this->isGranted('ROLE_UPDATE_PACKAGES')) {
-            $req->getSession()->save();
-
-            if (null !== $autoUpdated) {
-                $package->setAutoUpdated((Boolean) $autoUpdated);
-                $doctrine->getManager()->flush();
-            }
-
-            if ($update) {
-                set_time_limit(3600);
-                $updater = $this->get('packagist.package_updater');
-
-                $io = new BufferIO('', OutputInterface::VERBOSITY_VERY_VERBOSE, new HtmlOutputFormatter(Factory::createAdditionalStyles()));
-                $config = Factory::createConfig();
-                $io->loadConfiguration($config);
-                $repository = new VcsRepository(array('url' => $package->getRepository()), $io, $config);
-                $loader = new ValidatingArrayLoader(new ArrayLoader());
-                $repository->setLoader($loader);
-
-                try {
-                    $updater->update($io, $config, $package, $repository, $updateEqualRefs ? Updater::UPDATE_EQUAL_REFS : 0);
-                } catch (\Exception $e) {
-                    return new Response(json_encode(array(
-                        'status' => 'error',
-                        'message' => '['.get_class($e).'] '.$e->getMessage(),
-                        'details' => '<pre>'.$io->getOutput().'</pre>'
-                    )), 400);
-                }
-            }
-
-            return new Response('{"status": "success"}', 202);
-        }
-
-        return new JsonResponse(array('status' => 'error', 'message' => 'Could not find a package that matches this request (does user maintain the package?)',), 404);
-    }
-
-    /**
-     * @Template()
-     * @Route("/packages/{name}", name="delete_package", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
-     * @Method({"DELETE"})
-     */
-    public function deletePackageAction(Request $req, $name)
-    {
-        $doctrine = $this->getDoctrine();
-
-        try {
-            $package = $doctrine
-                ->getRepository('PackagistWebBundle:Package')
-                ->findOneByName($name);
-        } catch (NoResultException $e) {
-            throw new NotFoundHttpException('The requested package, '.$name.', was not found.');
-        }
-
-        if (!$form = $this->createDeletePackageForm($package)) {
-            throw new AccessDeniedException;
-        }
-        $form->bind($req->request->get('form'));
-        if ($form->isValid()) {
-            $req->getSession()->save();
-
-            $versionRepo = $doctrine->getRepository('PackagistWebBundle:Version');
-            foreach ($package->getVersions() as $version) {
-                $versionRepo->remove($version);
-            }
-
-            $packageId = $package->getId();
-            $em = $doctrine->getManager();
-            $em->remove($package);
-            $em->flush();
-
-            // attempt solr cleanup
-            try {
-                $solarium = $this->get('solarium.client');
-
-                $update = $solarium->createUpdate();
-                $update->addDeleteById($packageId);
-                $update->addCommit();
-
-                $solarium->update($update);
-            } catch (\Solarium_Client_HttpException $e) {}
-
-            return new Response('', 204);
-        }
-
-        return new Response('Invalid form input', 400);
-    }
-
-    /**
-     * @Template("PackagistWebBundle:Web:viewPackage.html.twig")
-     * @Route("/packages/{name}/maintainers/", name="add_maintainer", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
-     */
-    public function createMaintainerAction(Request $req, $name)
-    {
-        /** @var $package Package */
-        $package = $this->getDoctrine()
-            ->getRepository('PackagistWebBundle:Package')
-            ->findOneByName($name);
-
-        if (!$package) {
-            throw new NotFoundHttpException('The requested package, '.$name.', was not found.');
-        }
-
-        if (!$form = $this->createAddMaintainerForm($package)) {
-            throw new AccessDeniedException('You must be a package\'s maintainer to modify maintainers.');
-        }
-
-        $data = array(
-            'package' => $package,
-            'versions' => null,
-            'expandedVersion' => null,
-            'version' => null,
-            'addMaintainerForm' => $form->createView(),
-            'show_add_maintainer_form' => true,
-        );
-
-        if ('POST' === $req->getMethod()) {
-            $form->bind($req);
-            if ($form->isValid()) {
-                try {
-                    $em = $this->getDoctrine()->getManager();
-                    $user = $form->getData()->getUser();
-
-                    if (!empty($user)) {
-                        if (!$package->getMaintainers()->contains($user)) {
-                            $package->addMaintainer($user);
-                            $this->get('packagist.package_manager')->notifyNewMaintainer($user, $package);
-                        }
-
-                        $em->persist($package);
-                        $em->flush();
-
-                        $this->get('session')->getFlashBag()->set('success', $user->getUsername().' is now a '.$package->getName().' maintainer.');
-
-                        return new RedirectResponse($this->generateUrl('view_package', array('name' => $package->getName())));
-                    }
-                    $this->get('session')->getFlashBag()->set('error', 'The user could not be found.');
-                } catch (\Exception $e) {
-                    $this->get('logger')->crit($e->getMessage(), array('exception', $e));
-                    $this->get('session')->getFlashBag()->set('error', 'The maintainer could not be added.');
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @Template("PackagistWebBundle:Web:viewPackage.html.twig")
-     * @Route("/packages/{name}/maintainers/delete", name="remove_maintainer", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
-     */
-    public function removeMaintainerAction(Request $req, $name)
-    {
-        /** @var $package Package */
-        $package = $this->getDoctrine()
-            ->getRepository('PackagistWebBundle:Package')
-            ->findOneByName($name);
-
-        if (!$package) {
-            throw new NotFoundHttpException('The requested package, '.$name.', was not found.');
-        }
-        if (!$removeMaintainerForm = $this->createRemoveMaintainerForm($package)) {
-            throw new AccessDeniedException('You must be a package\'s maintainer to modify maintainers.');
-        }
-
-        $data = array(
-            'package' => $package,
-            'versions' => null,
-            'expandedVersion' => null,
-            'version' => null,
-            'removeMaintainerForm' => $removeMaintainerForm->createView(),
-            'show_remove_maintainer_form' => true,
-        );
-
-        if ('POST' === $req->getMethod()) {
-            $removeMaintainerForm->bind($req);
-            if ($removeMaintainerForm->isValid()) {
-                try {
-                    $em = $this->getDoctrine()->getManager();
-                    $user = $removeMaintainerForm->getData()->getUser();
-
-                    if (!empty($user)) {
-                        if ($package->getMaintainers()->contains($user)) {
-                            $package->getMaintainers()->removeElement($user);
-                        }
-
-                        $em->persist($package);
-                        $em->flush();
-
-                        $this->get('session')->getFlashBag()->set('success', $user->getUsername().' is no longer a '.$package->getName().' maintainer.');
-
-                        return new RedirectResponse($this->generateUrl('view_package', array('name' => $package->getName())));
-                    }
-                    $this->get('session')->getFlashBag()->set('error', 'The user could not be found.');
-                } catch (\Exception $e) {
-                    $this->get('logger')->crit($e->getMessage(), array('exception', $e));
-                    $this->get('session')->getFlashBag()->set('error', 'The maintainer could not be removed.');
-                }
-            }
-        }
-
-        return $data;
-    }
-
     /**
      * @Route("/statistics", name="stats")
      * @Template
@@ -1158,67 +332,7 @@ class WebController extends Controller
     }
 
     /**
-     * @Route("/about-composer")
-     */
-    public function aboutComposerFallbackAction()
-    {
-        return new RedirectResponse('https://getcomposer.org/', 301);
-    }
-
-    private function createAddMaintainerForm($package)
-    {
-        if (!$user = $this->getUser()) {
-            return;
-        }
-
-        if ($this->isGranted('ROLE_EDIT_PACKAGES') || $package->getMaintainers()->contains($user)) {
-            $maintainerRequest = new MaintainerRequest;
-            return $this->createForm(new AddMaintainerRequestType, $maintainerRequest);
-        }
-    }
-
-    private function createRemoveMaintainerForm(Package $package)
-    {
-        if (!($user = $this->getUser()) || 1 == $package->getMaintainers()->count()) {
-            return;
-        }
-
-        if ($this->isGranted('ROLE_EDIT_PACKAGES') || $package->getMaintainers()->contains($user)) {
-            $maintainerRequest = new MaintainerRequest;
-            return $this->createForm(new RemoveMaintainerRequestType(), $maintainerRequest, array('package'=>$package));
-        }
-    }
-
-    private function createDeletePackageForm(Package $package)
-    {
-        if (!$user = $this->getUser()) {
-            return;
-        }
-
-        // super admins bypass additional checks
-        if (!$this->isGranted('ROLE_DELETE_PACKAGES')) {
-            // non maintainers can not delete
-            if (!$package->getMaintainers()->contains($user)) {
-                return;
-            }
-
-            try {
-                $downloads = $this->get('packagist.download_manager')->getTotalDownloads($package);
-            } catch (ConnectionException $e) {
-                return;
-            }
-
-            // more than 100 downloads = established package, do not allow deletion by maintainers
-            if ($downloads > 100) {
-                return;
-            }
-        }
-
-        return $this->createFormBuilder(array())->getForm();
-    }
-
-    /**
-     * @param array $orderBys
+     * @param Request $req
      *
      * @return array
      */
@@ -1274,7 +388,13 @@ class WebController extends Controller
         return $normalizedOrderBys;
     }
 
-    protected function getOrderBysViewModel(Request $req, $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])) {
@@ -1331,6 +451,10 @@ class WebController extends Controller
         );
     }
 
+    /**
+     * @param Request $req
+     * @param array $filteredOrderBys
+     */
     private function computeSearchQuery(Request $req, array $filteredOrderBys)
     {
         // transform q=search shortcut