Nils Adermann
3b54316e91
Add a test for the off by one error in solver conflict resolution
2012-02-18 12:33:55 +01:00
Nils Adermann
3167cccb6f
Merge pull request #311 from Seldaek/allow_local_fs
...
Allow local file system git repos & do not restrict to valid http* urls
2012-02-18 03:14:58 -08:00
Jordi Boggiano
fa8cb14073
Simplify check
2012-02-18 12:12:02 +01:00
Jordi Boggiano
f152fe723d
Allow local file system git repos & do not restrict to valid http* urls
2012-02-18 12:00:30 +01:00
Jordi Boggiano
1d15e64205
Merge pull request #310 from edorian/test-skip-mbstring
...
Skip tests if mbstring is not installed
2012-02-18 02:44:50 -08:00
Volker Dusch
9ede082371
Skip tests if mbstring is not installed
2012-02-18 11:36:11 +01:00
Jordi Boggiano
cac51b1baf
Merge pull request #309 from naderman/fix-assert
...
Off by one error in the solver - 1 cannot be false
2012-02-17 15:17:04 -08:00
Nils Adermann
cb7f656fa9
Off by one error in the solver - 1 cannot be false
...
Fixes #133 , #160 , #162 , #177 , #289
2012-02-18 00:11:08 +01:00
Jordi Boggiano
9f2efee207
Merge pull request #308 from stof/null_io
...
Added a NullIO
2012-02-17 15:05:16 -08:00
Christophe Coevoet
28d3d4b130
Added a NullIO
2012-02-18 00:00:38 +01:00
Jordi Boggiano
70bea8fe57
Fix previous commit
2012-02-17 17:01:45 +01:00
Jordi Boggiano
b2076c2462
Re-order repos so that packagist always has the lowest priority
2012-02-17 16:59:26 +01:00
Jordi Boggiano
4d7ecdcb69
Fix authentication behavior when re-entering get()
2012-02-17 12:35:42 +01:00
Jordi Boggiano
a8aef7e203
Text tweaks
2012-02-17 12:19:29 +01:00
Jordi Boggiano
35cca1ed7f
Do not reveal input length
2012-02-17 12:18:48 +01:00
Jordi Boggiano
60fddb2c09
Use parse_url instead of manual parsing
2012-02-17 12:13:56 +01:00
Jordi Boggiano
8b7a64ab28
Limit progress output, mitigates #283
2012-02-17 11:53:38 +01:00
Jordi Boggiano
844c43092f
Fix re-entrant behavior
2012-02-17 11:53:09 +01:00
Jordi Boggiano
db03b7bbbd
Fix line endings
2012-02-17 11:50:36 +01:00
Jordi Boggiano
d0f6b679bc
Merge remote-tracking branch 'francoispluchino/master'
2012-02-17 11:45:55 +01:00
Jordi Boggiano
8dcb75080e
Merge remote-tracking branch 'wookieb/installer_dry_run'
2012-02-17 10:47:40 +01:00
Franois Pluchino
89b0c8b2e7
Restore the original file mode
2012-02-17 10:28:33 +01:00
Jordi Boggiano
deaaf2ef37
Merge pull request #307 from hason/slashes
...
Added support for JSON_UNESCAPED_SLASHES
2012-02-17 01:26:06 -08:00
Martin Hasoň
e621495c4d
Added support for JSON_UNESCAPED_SLASHES
2012-02-17 10:06:59 +01:00
Jordi Boggiano
fcc2d11056
Merge pull request #306 from Lowgain/patch-1
...
Exception mentioned PEAR repository when should be VCS, was misleading
2012-02-17 00:55:22 -08:00
Logan Aube
ea05f678fd
Exception mentioned PEAR repository when should be VCS, was misleading
2012-02-16 19:42:19 -05:00
François Pluchino
56150fd98f
Merge remote branch 'composer/master'
2012-02-16 23:53:17 +01:00
François Pluchino
dbfbbab904
Add changes requested
2012-02-16 23:41:26 +01:00
Wookieb
2467456d3f
Fix installer that create vendor and bin directory even if --dry-run parameter provided
...
* Move directories creation from constructor to "install" and "update" method
* Tests for LibraryInstaller
2012-02-16 22:43:10 +01:00
Jordi Boggiano
26f2b9e93f
Merge pull request #303 from MattKetmo/directory_inception
...
[BUG] Fix error when moving up a directory content
2012-02-16 11:45:37 -08:00
Jordi Boggiano
1e6633b3c3
Allow search command to work without a composer.json
2012-02-16 20:42:47 +01:00
Jordi Boggiano
ee7b68c049
Allow people to manually enter requirements
2012-02-16 20:41:16 +01:00
Jordi Boggiano
9a2204cd74
Improve username detection and other minor fixes
2012-02-16 20:40:57 +01:00
Jordi Boggiano
f48cfb4fdf
Avoid requirement on composer.json to search for requirements
2012-02-16 20:39:59 +01:00
Jordi Boggiano
23aade21f0
Show empty default value when one is specified
2012-02-16 20:38:43 +01:00
Jordi Boggiano
d1d9c715c9
Add newline at the end of formatted jsons
2012-02-16 20:37:05 +01:00
Jordi Boggiano
33fcb959ea
Refactor JsonFile::encode to match json_encode
2012-02-16 20:28:02 +01:00
Jordi Boggiano
95883f058c
Merge remote-tracking branch 'justinrainbow/init_command'
2012-02-16 19:30:25 +01:00
Jordi Boggiano
01cb2c5dd7
Fix typo
2012-02-16 18:58:25 +01:00
François Pluchino
2e3eed081a
Merge remote branch 'composer/master'
...
Conflicts:
src/Composer/Downloader/FileDownloader.php
2012-02-16 18:11:01 +01:00
MattKetmo
7d5ba2d756
[DownloadFile] Renamed wrapper directory after extract
...
This fixes error when the extracted directory (from an archive) contains
a folder with the same name. Example:
$ mv test/test test
mv: test/test and test/test are identical
2012-02-16 17:26:42 +01:00
Jordi Boggiano
13183753e6
Merge remote-tracking branch 'hason/unicode'
2012-02-15 18:38:20 +01:00
digitalkaoz
ffb59548a5
Merge branch 'master' of https://github.com/composer/composer
2012-02-15 18:27:43 +01:00
Jordi Boggiano
6905e3a7ae
Disable gzip compression of the phar
2012-02-15 18:21:17 +01:00
François Pluchino
bc232af018
Bug fix display downloading info
2012-02-15 14:16:42 +01:00
François Pluchino
953f0992f7
Merge callback method of FileDownloader and VcsDriver
...
Required corrections added
2012-02-15 13:11:29 +01:00
Martin Hasoň
ff0f833b3e
Added support for JSON_UNESCAPED_UNICODE and fixed parsing string
2012-02-15 12:00:04 +01:00
digitalkaoz
110bd8c23f
Merge branch 'master' of https://github.com/composer/composer
...
Conflicts:
README.md
2012-02-14 22:58:12 +01:00
Jordi Boggiano
15dddf44fa
Merge remote-tracking branch 'origin/master'
2012-02-14 17:38:06 +01:00
Jordi Boggiano
256bfedea1
Merge remote-tracking branch 'jalliot/proxy2'
...
Conflicts:
src/Composer/Downloader/FileDownloader.php
src/Composer/Repository/PearRepository.php
2012-02-14 17:01:15 +01:00