Merge pull request #567 from alcohol/fix-templates

Fix templates

src/Packagist/WebBundle/Controller/ApiController.php

@@ -36,8 +36,8 @@ use Symfony\Component\HttpFoundation\Response;
 class ApiController extends Controller
 {
     /**
-     * @Template()
      * @Route("/packages.json", name="packages", defaults={"_format" = "json"})
+     * @Method({"GET"})
      */
     public function packagesAction(Request $req)
     {
@@ -72,7 +72,7 @@ class ApiController extends Controller
         $package->setRouter($this->get('router'));
         $user = $this->findUser($request);
         $package->addMaintainer($user);
-        $package->repository = $url;
+        $package->setRepository($url);
         $errors = $this->get('validator')->validate($package);
         if (count($errors) > 0) {
             foreach ($errors as $error) {
@@ -181,6 +181,11 @@ class ApiController extends Controller
         return new JsonResponse(array('status' => 'success'), 201);
     }
 
+    /**
+     * @param string $name
+     * @param string $version
+     * @return array
+     */
     protected function getPackageAndVersionId($name, $version)
     {
         return $this->get('doctrine.dbal.default_connection')->fetchAssoc(
@@ -249,6 +254,7 @@ class ApiController extends Controller
         $io->loadConfiguration($config);
 
         try {
+            /** @var Package $package */
             foreach ($packages as $package) {
                 $em->transactional(function($em) use ($package, $updater, $io, $config) {
                     // prepare dependencies

src/Packagist/WebBundle/Controller/PackageController.php

@@ -37,7 +37,7 @@ use Pagerfanta\Pagerfanta;
 class PackageController extends Controller
 {
     /**
-     * @Template("PackagistWebBundle:Web:browse.html.twig")
+     * @Template("PackagistWebBundle:Package:browse.html.twig")
      * @Route("/packages/", name="allPackages")
      * @Cache(smaxage=900)
      */
@@ -550,10 +550,10 @@ class PackageController extends Controller
                     $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);
+                        'status' => 'error',
+                        'message' => '['.get_class($e).'] '.$e->getMessage(),
+                        'details' => '<pre>'.$io->getOutput().'</pre>',
+                    )), 400);
                 }
             }
 

src/Packagist/WebBundle/Controller/UserController.php

@@ -49,6 +49,10 @@ class UserController extends Controller
         );
     }
 
+    /**
+     * @param Request $req
+     * @return Response
+     */
     public function myProfileAction(Request $req)
     {
         $user = $this->container->get('security.token_storage')->getToken()->getUser();
@@ -158,6 +162,11 @@ class UserController extends Controller
         return new Response('{"status": "success"}', 204);
     }
 
+    /**
+     * @param Request $req
+     * @param User $user
+     * @return Pagerfanta
+     */
     protected function getUserPackages($req, $user)
     {
         $packages = $this->getDoctrine()