Browse Source

Reordered update args, fixed some phpdoc, removed $logger and some unused use statements.

Beau Simensen 13 years ago
parent
commit
19a7b01bd6

+ 1 - 2
src/Packagist/WebBundle/Command/UpdatePackagesCommand.php

@@ -59,7 +59,6 @@ class UpdatePackagesCommand extends ContainerAwareCommand
         $package = $input->getArgument('package');
 
         $doctrine = $this->getContainer()->get('doctrine');
-        $logger = $this->getContainer()->get('logger');
 
         if ($package) {
             $packages = array($doctrine->getRepository('PackagistWebBundle:Package')->findOneByName($package));
@@ -77,7 +76,7 @@ class UpdatePackagesCommand extends ContainerAwareCommand
                 $output->writeln('Importing '.$package->getRepository());
             }
             try {
-                $updater->update($package, $start, $force);
+                $updater->update($package, $force, $start);
             } catch (\Exception $e) {
                 $output->writeln('<error>Exception: '.$e->getMessage().', skipping package '.$package->getName().'.</error>');
             }

+ 1 - 6
src/Packagist/WebBundle/Controller/ApiController.php

@@ -12,13 +12,7 @@
 
 namespace Packagist\WebBundle\Controller;
 
-use Composer\Package\PackageInterface;
-use Composer\Repository\VcsRepository;
-use Packagist\WebBundle\Entity\Author;
-use Packagist\WebBundle\Entity\Tag;
-use Packagist\WebBundle\Entity\Version;
 use Packagist\WebBundle\Package\Updater;
-use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
@@ -90,6 +84,7 @@ class ApiController extends Controller
                 return new Response('{ "status": "success" }', 202);
             }
         }
+
         return new Response(json_encode(array('status' => 'error', 'message' => 'Could not find a package that matches this request (does user maintain the package?)',)), 404);
     }
 }

+ 2 - 2
src/Packagist/WebBundle/Package/Updater.php

@@ -49,7 +49,6 @@ class Updater
      * Constructor
      * 
      * @param RegistryInterface $doctrine
-     * @param \DateTime $start
      */
     public function __construct(RegistryInterface $doctrine)
     {
@@ -61,8 +60,9 @@ class Updater
      *
      * @param PackageInterface $package
      * @param boolean $clearExistingVersions
+     * @param DateTime $start
      */
-    public function update(Package $package, \DateTime $start = null, $clearExistingVersions = false)
+    public function update(Package $package, $clearExistingVersions = false, \DateTime $start = null)
     {
         if (null === $start) {
             $start = new \DateTime();