1
0
Fork 0
Commit Graph

320 Commits (4b3fc2b5fa43568a5680a46fa16da52626c1c28d)

Author SHA1 Message Date
Bastian Hofmann 4b3fc2b5fa Merge branch 'master' of git://github.com/composer/composer
Conflicts:
	src/Composer/Repository/PearRepository.php
2012-05-06 14:42:13 +02:00
Bastian Hofmann 7501009d74 added tests for PearRepository 2012-05-06 14:40:47 +02:00
Jordi Boggiano 072f4397a0 Fix default options handling in StreamContextFactory 2012-05-06 13:50:18 +02:00
Maxim Chernyshev 5294cb222c Precious community feedback-based refactoring 2012-05-02 17:21:58 +08:00
Maxim Chernyshev 37476eb61f Fixed indentation 2012-05-02 09:30:27 +08:00
Maxim Chernyshev 8918551f29 Simplified proxy port determination and passed tests 2012-05-02 09:22:59 +08:00
Maxim Chernyshev 2ca50a1ef3 Merged in upstream 2012-05-02 08:36:05 +08:00
Maxim Chernyshev 419a1cedf0 Proxy credentials are now passed as part of HTTP headers 2012-05-02 08:26:27 +08:00
Michael Cullum 2653ece028 Adding author role to ArrayLoader Test 2012-05-01 16:03:45 +02:00
Jordi Boggiano f7440076fa Revert "Merge remote-tracking branch 'naderman/remove-packages-by-default'"
This reverts commit 2988152602, reversing
changes made to adb4188e12.
2012-04-29 22:21:58 +02:00
Jordi Boggiano a30e6109bf Fix 5.4.0 interop in formatting of empty array/objects 2012-04-29 21:04:18 +02:00
Jordi Boggiano b3164de813 Fix tests 2012-04-29 20:43:56 +02:00
Jordi Boggiano 115dc407fa Merge remote-tracking branch 'GromNaN/git-dir' 2012-04-29 18:53:01 +02:00
Jordi Boggiano 2988152602 Merge remote-tracking branch 'naderman/remove-packages-by-default' 2012-04-29 18:16:22 +02:00
Jordi Boggiano 7b2d3ff6a2 Refactor InstallerTest to be a bit more future proof 2012-04-29 17:29:06 +02:00
Jordi Boggiano 63c6c6d875 Cache the version parser used in TestCase 2012-04-29 17:28:35 +02:00
Jordi Boggiano bd50ad32f0 Refactor InstallationManagerMock 2012-04-29 17:27:37 +02:00
Jordi Boggiano 2dffa612a3 Merge remote-tracking branch 'igorw/root-install-twice' 2012-04-29 17:02:41 +02:00
Nils Adermann f4d5568937 Rules of type feature are no longer needed 2012-04-27 18:28:51 +02:00
Nils Adermann 2cb2cde096 Installed packages are now always removed unless otherwise requested
This means that an update request must always be accompanied by an install
request, otherwise the package might be removed rather than updated.
2012-04-27 18:13:37 +02:00
Nils Adermann 0e537b9c93 We won't implement choice rules, you need to edit composer.json to choose 2012-04-27 17:46:13 +02:00
Igor Wiedler 0995933183 Do not install root package as a vendor if some dependency requires it, closes #480
Also add some tests for the installer.
2012-04-27 12:29:11 +02:00
Jordi Boggiano ed8aa8322a Do not prevent updates if untracked files are present 2012-04-27 11:23:34 +02:00
Jordi Boggiano 0e9f88a3da Fix DownloadManagerTest creating directories on disk 2012-04-27 11:21:58 +02:00
Jerome Tamarelle 610f15a768 Fix unit tests for VcsRepository 2012-04-27 11:03:57 +02:00
Danny Berger e7ba0c38a8 Add default http(s) ports to proxy configuration if they are missing. 2012-04-26 21:38:12 -04:00
Nils Adermann 540f9a09b2 Merge pull request #606 from Seldaek/aliasprio
Fix priority of aliases when mixing root package aliases with branch-alias ones, fixes #576
2012-04-25 08:35:53 -07:00
Jordi Boggiano aff7745231 Fix target-dir autoloader 2012-04-23 10:56:46 +02:00
Jordi Boggiano 15ab5868a3 Move composer metafiles back in a composer dir, except autoload.php 2012-04-22 22:18:19 +02:00
Jordi Boggiano 06fb1b8083 Fix priority of aliases when mixing root package aliases with branch-alias ones, fixes #576 2012-04-20 22:10:58 +02:00
Jordi Boggiano 51711c2f73 Fix multi-prefix handling 2012-04-19 22:08:24 +02:00
Jordi Boggiano 66135538c1 Allow root packages packages with target-dir to be autoloaded, fixes #139 2012-04-19 22:06:38 +02:00
Jordi Boggiano 244a7fd37b Add missing test fixture 2012-04-19 20:04:38 +02:00
Jordi Boggiano b999d18365 Improve include_paths generation, fixes #596 2012-04-19 10:51:57 +02:00
Jordi Boggiano 5ceae7fb1f Fix tests 2012-04-18 18:46:26 +02:00
Jordi Boggiano ef300ca56a Fix tests 2012-04-18 01:06:23 +02:00
Jordi Boggiano 047fa0b553 Add a composer remote that is used by composer so it does not take over the origin one anymore 2012-04-17 20:02:19 +02:00
Jordi Boggiano a1306091f2 Fix locking behavior with --dev 2012-04-15 19:05:50 +02:00
Jordi Boggiano d1f66073ca Update depends command 2012-04-14 23:53:12 +02:00
Jordi Boggiano 89e095b4b5 Handle --dev installs/updates 2012-04-14 23:38:10 +02:00
Jordi Boggiano e922404f19 Update/add tests 2012-04-14 23:38:06 +02:00
Jordi Boggiano 595182aec0 Add/fix tests 2012-04-13 02:47:55 +02:00
Jordi Boggiano 8654c43c62 Fix version parser regression, fixes #550 2012-04-09 16:00:02 +02:00
Jordi Boggiano 3c07b4338a Rename include-paths to include-path, add deprecated warnings, only generate file if it is needed 2012-04-08 17:42:57 +02:00
Jordi Boggiano 91614af365 Merge remote-tracking branch 'CHH/feature/include-paths' 2012-04-08 17:22:51 +02:00
Jordi Boggiano f604ca5762 Allow .x in version constraints as alias for .* 2012-04-08 17:02:43 +02:00
Jordi Boggiano 96c9bf80cc Add test 2012-04-08 17:02:43 +02:00
Jordi Boggiano 6f8031ac90 Fix error reporting for missing git process 2012-04-06 13:28:47 +02:00
Jordi Boggiano 6aaa523c0d Fix tests 2012-04-05 23:03:02 +02:00
Jordi Boggiano a3fa19a716 Avoid escaping too early to prevent issues 2012-04-04 17:13:57 +02:00