Jordi Boggiano
c492476e88
Merge branch 'interactive-dirty-updates'
2012-10-10 11:11:47 +02:00
Jordi Boggiano
ded485dd60
Fix root aliasing and allow aliasing using the branch-alias as source
2012-10-09 15:07:13 +02:00
Jordi Boggiano
c0cfe81eda
Merge pull request #1192 from michaeldewildt/patch-1
...
Fixed typo
2012-10-09 05:38:46 -07:00
Michael De Wildt
32e34156ad
Fixed typo
2012-10-09 14:54:54 +12:00
Jordi Boggiano
fb4183d5ad
Fix tests
2012-10-08 20:05:42 +02:00
Beau Simensen
081ead1635
Version Parsing: Consider <x.y.z to be <x.y.z-dev
...
> Consider `<x.y.z` to be `<x.y.z-dev.` Because in 99%
> of the cases that's what the intent is. Could be
> overriden with `<x.y.z-stable`.
- @Seldaek
refs #643
2012-10-08 10:44:37 -07:00
Jordi Boggiano
0e997a94fb
Format docs
2012-10-08 19:42:28 +02:00
Jordi Boggiano
81a7d40428
Merge remote-tracking branch 'timheil/master'
2012-10-08 19:31:49 +02:00
Jordi Boggiano
4e3f4f24fc
Try to figure out which editor is available on *nix
2012-10-08 19:22:48 +02:00
Jordi Boggiano
3a9c5b3678
Remove dead break statements
2012-10-08 18:45:41 +02:00
Jordi Boggiano
dc033e33d6
Pick longest match always
2012-10-08 18:35:22 +02:00
Jordi Boggiano
a4e5f000d5
Only create the root file empty and error out on missing local files
2012-10-07 19:20:45 +02:00
Jordi Boggiano
5cb9a6ead7
Write in the json directly without reformatting the whole file - skip validation since that is not really the job of the config command
2012-10-07 19:18:22 +02:00
Jordi Boggiano
8403178ddb
config --list should only list relevant sections
2012-10-07 16:37:59 +02:00
Jordi Boggiano
4086c24778
Do or do not, there is no try
2012-10-07 16:33:40 +02:00
Jordi Boggiano
17d8dfba1d
Allow editing all config values
2012-10-07 16:33:09 +02:00
Jordi Boggiano
1b7906e82d
Add --unset flag
2012-10-07 16:08:53 +02:00
Jordi Boggiano
d00d7eef7f
Use default editors if EDITOR is not set, improve windows compatibility
2012-10-07 15:48:50 +02:00
Jordi Boggiano
0615455087
Clean up syntax/docs & simplify some bits of code
2012-10-07 15:47:32 +02:00
Jordi Boggiano
1a638959c2
Merge remote-tracking branch 'JoshuaEstes/feature/config'
2012-10-07 15:21:24 +02:00
Jordi Boggiano
0a549efd0e
Allow interactive resets or stash/apply cycles when updating dirty packages instead of failing hard
2012-10-07 15:19:55 +02:00
Beau Simensen
96a76eeffc
Semantic Version Parsing: ~version
...
Implemented `~` according to #643 and used the following versions
as a test case as defined by @Seldaek:
* "~1.2.3.4" = ">=1.2.3.4 <1.2.4.0-dev"
* "~1.2.3" = ">=1.2.3 <1.3.0-dev"
* "~1.2" = ">=1.2.0 <2.0.0-dev"
* "~1" = ">=1.0.0 <2.0.0-dev"
Refs #643
2012-10-06 07:49:11 -07:00
Jordi Boggiano
62bb5b339b
Allow parsing of stability modifiers combined with multi-constraints
2012-10-05 19:05:39 +02:00
Jordi Boggiano
b3077bc4bc
Merge pull request #1177 from sandermarechal/stream-context
...
Allow setting stream context options
2012-10-04 09:18:08 -07:00
Jordi Boggiano
3257cade09
Merge pull request #1181 from igorw/patch-1
...
Minor docs nitpick
2012-10-04 08:21:56 -07:00
Igor Wiedler
1939407c77
Minor docs nitpick
2012-10-04 18:05:27 +03:00
Sander Marechal
3e63ebf7fe
Add stream context options documetation
2012-10-03 20:32:00 +02:00
Sander Marechal
0d9e08f9af
Use array_replace_recursive() instead of array_merge_recursive()
2012-10-03 18:54:27 +02:00
Sander Marechal
11b5b5944d
Improved argument order
2012-10-03 18:51:42 +02:00
Joshua Estes
74c344ffe4
bug fix
2012-10-03 08:41:07 -05:00
Joshua Estes
41bc8fd1b6
updated the help for the command
2012-10-03 08:38:29 -05:00
Joshua Estes
ebc67f3191
added the ablity to allow users the option of telling where the file they want to edit/update is
2012-10-03 08:23:56 -05:00
Joshua Estes
2e34ada3f0
updated some of the core functionality, only supports process timeout and repositories
2012-10-03 08:12:39 -05:00
Joshua Estes
cec8debcdc
added a validate schema function to make sure the user does not enter vomit into the config files
2012-10-03 08:12:04 -05:00
Joshua Estes
7b00dfab4c
updated value argument to be array
2012-10-03 08:11:18 -05:00
Sander Marechal
748c4764ba
Unittest for stream options
2012-10-03 15:09:47 +02:00
Sander Marechal
6cf860669f
Add repository stream context options
...
Add support for passing stream context options to the
StreamContextFactory. This allows support for SSH keyfiles, SSL
certificates and much more. Example:
{
"repositories": [
{
"type": "composer",
"url": "ssh2.sftp://host:22/path/to/packages.json",
"options": {
"ssh2": {
"username": "composer",
"pubkey_file": "/path/to/composer.key.pub",
"privkey_file": "/path/to/composer.key"
}
}
}
]
}
2012-10-03 14:49:41 +02:00
Jordi Boggiano
cb2a0f46a1
Merge remote-tracking branch 'cs278/issue/879-dev-autoload-definitions'
...
Conflicts:
src/Composer/Installer.php
2012-10-03 11:50:06 +02:00
Jordi Boggiano
e188f69a0f
Merge remote-tracking branch 'origin/master'
2012-10-03 11:18:44 +02:00
Jordi Boggiano
4998bab944
Show warning if the svn binary is missing
2012-10-03 11:14:37 +02:00
Sander Marechal
4799053ca9
Allow dot in URL scheme
...
This makes it possible to support SSH2 urls, like ssh2.scp://
See: http://www.php.net/manual/en/wrappers.ssh2.php
2012-10-03 10:50:02 +02:00
Jordi Boggiano
c7a13893c7
Merge remote-tracking branch 'mheleniak/rename_reliability'
2012-10-03 10:05:55 +02:00
Joshua Estes
3c5500aa95
updated a few things, works a little nicer, but still not yet to the point where it should be
2012-10-02 13:33:08 -05:00
Joshua Estes
6386921f99
deleted the repository, added a config command that current will just list the config for either file and open vim to edit the file
2012-10-02 10:42:48 -05:00
Jordi Boggiano
a5eaba805c
Merge pull request #1174 from szeber/master
...
Mercurial bookmarks support
2012-10-02 06:06:24 -07:00
Jordi Boggiano
03cce01030
Merge pull request #1173 from arnaud-lb/require-prefer-dist
...
added --prefer-dist option to require command
2012-10-02 06:03:31 -07:00
Arnaud Le Blanc
0119e80c18
added --prefer-dist option to require command
2012-10-02 13:42:07 +02:00
Zsolt Szeberenyi
5201564c0f
Added support for hg bookmarks
2012-10-02 13:41:03 +02:00
Jordi Boggiano
b474a9fa86
Merge remote-tracking branch 'schmittjoh/reusableValidator'
2012-10-02 10:45:13 +02:00
Joshua Estes
457d0aac94
cleaned up and added more comments
2012-10-01 15:27:30 -05:00