1
0
Fork 0
Commit Graph

1636 Commits (b1eb47bdd0b272214e9f130ce7440eb2714acec5)

Author SHA1 Message Date
Jordi Boggiano b1eb47bdd0 Merge remote-tracking branch 'bashofmann/master' 2012-05-06 14:59:04 +02:00
Bastian Hofmann 6d5d3af297 coding standard compliance 2012-05-06 14:55:08 +02:00
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
Jordi Boggiano 00e4d53bcf Merge remote-tracking branch 'maximcherny/proxy-auth' 2012-05-06 13:41:41 +02:00
Jordi Boggiano 5d74594c71 Merge pull request #653 from UteEffacht/patch-1
fixed typo
2012-05-06 04:36:33 -07:00
Jordi Boggiano c454d93a20 Move all logic within try/catch to prevent an incorrect version from blowing up the whole package 2012-05-06 13:28:37 +02:00
Daniel Mecke 133f3317ee fixed typo 2012-05-04 14:30:42 +03:00
Maxim Chernyshev 6b3aa764e8 Merge remote-tracking branch 'upstream/master' into proxy-auth 2012-05-03 08:14:42 +08:00
Jordi Boggiano 28941f169b Fix docs 2012-05-02 15:22:26 +02:00
Maxim Chernyshev 5294cb222c Precious community feedback-based refactoring 2012-05-02 17:21:58 +08:00
Maxim Chernyshev 1ae0a1b7af Follow-up coding standard fixes 2012-05-02 15:16:36 +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
Jordi Boggiano 14f7d10478 Fix typos 2012-05-01 16:03:46 +02:00
Michael Cullum 2653ece028 Adding author role to ArrayLoader Test 2012-05-01 16:03:45 +02:00
Michael Cullum 0edc94cdce Adding role to author information 2012-05-01 16:03:44 +02:00
Jordi Boggiano 4e24ab659f Merge pull request #644 from krymen/installer_typo_fix
Fixed typo in the Installer
2012-05-01 04:49:59 -07:00
Nils Adermann 157b0bdecc Merge pull request #648 from fabpot/fix-version
Fix for when the version is explicitely set in the composer.json file

Fixes #647
2012-05-01 04:14:30 -07:00
Fabien Potencier 0923025455 Fix for when the version is explicitely set in the composer.json file 2012-05-01 13:10:14 +02:00
Nils Adermann efae2c8829 Alias root packages added in a4c2337 need to report composer.json alias info 2012-05-01 11:45:01 +02:00
Krzysztof Menżyk 2d4d984929 Fixed typo in the Installer 2012-05-01 01:03:55 +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 a4c2337433 Load root packages as aliases if they are aliased so that they replace everything 2012-04-29 21:16:24 +02:00
Jordi Boggiano f3df4772f9 Make sure htaccess is created 2012-04-29 21:06:15 +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 58276d0a52 Warn the user but do not fail hard when a repo can not be synced 2012-04-29 20:55:05 +02:00
Jordi Boggiano b0b3e17a37 Report errors when a git repo can not be synced up 2012-04-29 20:46:15 +02:00
Jordi Boggiano fded3d8bdd Update vendors 2012-04-29 20:44:05 +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 43968c23f9 Update CHANGELOG 2012-04-29 18:28:48 +02:00
Jordi Boggiano 2988152602 Merge remote-tracking branch 'naderman/remove-packages-by-default' 2012-04-29 18:16:22 +02:00
Jordi Boggiano adb4188e12 Add detection of the current version from git if possible 2012-04-29 18:03:54 +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
Jordi Boggiano d60188903d Add warning for PHP <5.3.2 users that didn't use the installer 2012-04-29 16:07:47 +02:00
Nils Adermann d51ebb9650 Merge pull request #1 from Seldaek/patches
Patches
2012-04-29 02:30:27 -07:00
Jordi Boggiano 2c726123cf Merge pull request #642 from danielholmes/patch-1
Fixed variable reference in verbose pear repository message
2012-04-29 02:19:39 -07:00
Daniel Holmes d44b81527b Fixed variable reference in verbose pear repository message 2012-04-29 18:07:16 +10:00
Jordi Boggiano e982c19bdb Add fields to sample satis config 2012-04-27 22:40:43 +02:00
Jordi Boggiano d5e35fbe19 Clarify output 2012-04-27 21:40:46 +02:00
Jordi Boggiano b3659d85f3 Force platform packages to remain installed 2012-04-27 21:30:09 +02:00
Jordi Boggiano 22a825fc07 Clean up vendor dir after a package was removed 2012-04-27 21:30:08 +02:00
Jordi Boggiano b99f9bae60 Let the user know a package is being removed 2012-04-27 21:30:06 +02:00