From 36a724fa519ee0b7c9b2c5b30029122b677023a2 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 30 Oct 2011 20:29:52 +0100 Subject: [PATCH] Search only for packages from the local repository in the locker --- src/Composer/Package/Locker.php | 2 +- tests/Composer/Test/Package/LockerTest.php | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Composer/Package/Locker.php b/src/Composer/Package/Locker.php index 3d069af80..529ae8e32 100644 --- a/src/Composer/Package/Locker.php +++ b/src/Composer/Package/Locker.php @@ -61,7 +61,7 @@ class Locker $lockList = $this->lockFile->read(); $packages = array(); foreach ($lockList as $info) { - $package = $this->repositoryManager->findPackage($info['package'], $info['version']); + $package = $this->repositoryManager->getLocalRepository()->findPackage($info['package'], $info['version']); if (!$package) { throw new \LogicException(sprintf( diff --git a/tests/Composer/Test/Package/LockerTest.php b/tests/Composer/Test/Package/LockerTest.php index 49482d9d4..6ff2f6da0 100644 --- a/tests/Composer/Test/Package/LockerTest.php +++ b/tests/Composer/Test/Package/LockerTest.php @@ -68,7 +68,7 @@ class LockerTest extends \PHPUnit_Framework_TestCase $package1 = $this->createPackageMock(); $package2 = $this->createPackageMock(); - $repo + $repo->getLocalRepository() ->expects($this->exactly(2)) ->method('findPackage') ->with($this->logicalOr('pkg1', 'pkg2'), $this->logicalOr('1.0.0-beta', '0.1.10')) @@ -99,7 +99,7 @@ class LockerTest extends \PHPUnit_Framework_TestCase $package1 = $this->createPackageMock(); $package2 = $this->createPackageMock(); - $repo + $repo->getLocalRepository() ->expects($this->exactly(2)) ->method('findPackage') ->with($this->logicalOr('pkg1', 'pkg2'), $this->logicalOr('1.0.0-beta', '0.1.10')) @@ -176,9 +176,15 @@ class LockerTest extends \PHPUnit_Framework_TestCase private function createRepositoryManagerMock() { - return $this->getMockBuilder('Composer\Repository\RepositoryManager') + $mock = $this->getMockBuilder('Composer\Repository\RepositoryManager') ->disableOriginalConstructor() ->getMock(); + + $mock->expects($this->any()) + ->method('getLocalRepository') + ->will($this->returnValue($this->getMockBuilder('Composer\Repository\ArrayRepository')->getMock())); + + return $mock; } private function createPackageMock()