Browse Source

Fixed the update command for the changes done in Composer

Christophe Coevoet 13 years ago
parent
commit
bb32542b65

+ 1 - 1
deps.lock

@@ -8,7 +8,7 @@ swiftmailer v4.1.5
 assetic v1.0.2
 twig-extensions 1dfff8e793f50f651c4f74f796c2c68a4aee3147
 metadata 1.0.0
-composer 15dddf44fa283efd7deb4d7f5671975634261664
+composer 9f2efee207998d7a55929f354f59250cd7ad41ea
 SensioFrameworkExtraBundle 638f545b7020b9e9d5944a7e3167f60ed848250d
 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
 SensioGeneratorBundle dd37fc4487bc09ac01bdcf89e0ff4ee4484b7fab

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

@@ -23,7 +23,7 @@ use Symfony\Component\Finder\Finder;
 use Packagist\WebBundle\Entity\Version;
 use Packagist\WebBundle\Entity\Tag;
 use Packagist\WebBundle\Entity\Author;
-use Packagist\WebBundle\Repository\Repository\RepositoryInterface;
+use Composer\IO\NullIO;
 use Composer\Package\Version\VersionParser;
 use Composer\Repository\VcsRepository;
 use Composer\Package\PackageInterface;
@@ -84,19 +84,13 @@ class UpdatePackagesCommand extends ContainerAwareCommand
 
         $start = new \DateTime();
 
-        $repositoryManager = new RepositoryManager;
-        $repositoryManager->setRepositoryClass('composer', 'Composer\Repository\ComposerRepository');
-        $repositoryManager->setRepositoryClass('vcs', 'Composer\Repository\VcsRepository');
-        $repositoryManager->setRepositoryClass('pear', 'Composer\Repository\PearRepository');
-        $repositoryManager->setRepositoryClass('package', 'Composer\Repository\PackageRepository');
-
         foreach ($packages as $package) {
             if ($verbose) {
                 $output->writeln('Importing '.$package->getRepository());
             }
 
             try {
-                $repository = new VcsRepository(array('url' => $package->getRepository()));
+                $repository = new VcsRepository(array('url' => $package->getRepository()), new NullIO());
                 if ($verbose) {
                     $repository->setDebug(true);
                 }

+ 2 - 7
src/Packagist/WebBundle/Entity/Package.php

@@ -16,6 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\ExecutionContext;
 use Doctrine\Common\Collections\ArrayCollection;
+use Composer\IO\NullIO;
 use Composer\Repository\VcsRepository;
 use Composer\Repository\RepositoryManager;
 
@@ -274,14 +275,8 @@ class Package
             return;
         }
 
-        $repositoryManager = new RepositoryManager;
-        $repositoryManager->setRepositoryClass('composer', 'Composer\Repository\ComposerRepository');
-        $repositoryManager->setRepositoryClass('vcs', 'Composer\Repository\VcsRepository');
-        $repositoryManager->setRepositoryClass('pear', 'Composer\Repository\PearRepository');
-        $repositoryManager->setRepositoryClass('package', 'Composer\Repository\PackageRepository');
-
         try {
-            $repository = new VcsRepository(array('url' => $repository));
+            $repository = new VcsRepository(array('url' => $repository), new NullIO());
 
             $repo = $this->repositoryClass = $repository->getDriver();
             if (!$repo) {