Jordi Boggiano 13 anni fa
parent
commit
933677324d

+ 1 - 1
deps.lock

@@ -8,7 +8,7 @@ swiftmailer v4.1.5
 assetic v1.0.2
 twig-extensions 4c831657215e51568fcb31bb9142e827f9a69bd5
 metadata 1.0.0
-composer 3bdee3aabed551200f9a2b3629ed0c7f85eab68a
+composer 14f7d10478a2316802ee826dd8e2a15636546149
 SensioFrameworkExtraBundle 638f545b7020b9e9d5944a7e3167f60ed848250d
 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
 SensioGeneratorBundle b1ccb78c1743f30817b0fce9bb5c6baff6ed7bf8

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

@@ -19,6 +19,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Output\OutputInterface;
 use Packagist\WebBundle\Package\Updater;
 use Composer\Repository\VcsRepository;
+use Composer\Factory;
 use Composer\IO\NullIO;
 use Composer\IO\ConsoleIO;
 
@@ -89,7 +90,8 @@ class UpdatePackagesCommand extends ContainerAwareCommand
                     $output->writeln('Importing '.$package->getRepository());
                 }
                 try {
-                    $repository = new VcsRepository(array('url' => $package->getRepository()), $io);
+                    $config = Factory::createConfig();
+                    $repository = new VcsRepository(array('url' => $package->getRepository()), $io, $config);
                     $updater->update($package, $repository, $flags, $start);
                 } catch (\Exception $e) {
                     $output->writeln('<error>Exception: '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().', skipping package '.$package->getName().'.</error>');

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

@@ -13,6 +13,7 @@
 namespace Packagist\WebBundle\Controller;
 
 use Composer\IO\NullIO;
+use Composer\Factory;
 use Composer\Repository\VcsRepository;
 use Packagist\WebBundle\Package\Updater;
 use Packagist\WebBundle\Entity\Package;
@@ -102,7 +103,8 @@ class ApiController extends Controller
                 // We found the package that was referenced.
                 $updater = new Updater($doctrine);
 
-                $repository = new VcsRepository(array('url' => $package->getRepository()), new NullIO);
+                $config = Factory::createConfig();
+                $repository = new VcsRepository(array('url' => $package->getRepository()), new NullIO, $config);
                 $package->setAutoUpdated(true);
                 $doctrine->getEntityManager()->flush();
                 $updater->update($package, $repository);

+ 3 - 1
src/Packagist/WebBundle/Controller/WebController.php

@@ -13,6 +13,7 @@
 namespace Packagist\WebBundle\Controller;
 
 use Composer\IO\NullIO;
+use Composer\Factory;
 use Composer\Repository\VcsRepository;
 use Doctrine\ORM\NoResultException;
 use Packagist\WebBundle\Form\Type\AddMaintainerRequestType;
@@ -317,7 +318,8 @@ class WebController extends Controller
             if ($update) {
                 $updater = new Updater($doctrine);
 
-                $repository = new VcsRepository(array('url' => $package->getRepository()), new NullIO);
+                $config = Factory::createConfig();
+                $repository = new VcsRepository(array('url' => $package->getRepository()), new NullIO, $config);
                 $updater->update($package, $repository, Updater::UPDATE_TAGS);
             }
 

+ 3 - 1
src/Packagist/WebBundle/Entity/Package.php

@@ -17,6 +17,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\ExecutionContext;
 use Doctrine\Common\Collections\ArrayCollection;
 use Composer\IO\NullIO;
+use Composer\Factory;
 use Composer\Repository\VcsRepository;
 use Composer\Repository\RepositoryManager;
 
@@ -291,7 +292,8 @@ class Package
         }
 
         try {
-            $repository = new VcsRepository(array('url' => $repository), new NullIO());
+            $config = Factory::createConfig();
+            $repository = new VcsRepository(array('url' => $repository), new NullIO(), $config);
 
             $repo = $this->repositoryClass = $repository->getDriver();
             if (!$repo) {