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
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
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
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
Johannes M. Schmitt
0ddafdbd7e
fixed return
2012-10-01 21:50:35 +02:00
Johannes M. Schmitt
7ff550e4a6
fixed some bugs in the validator
2012-10-01 21:47:17 +02:00
Johannes M. Schmitt
4e769e1100
moved some code to a dedicated class
2012-10-01 19:53:30 +02:00
Jordi Boggiano
aedeb0f4e9
Merge pull request #1166 from stloyd/patch-1
...
Add missing `use` in HgDriver
2012-10-01 06:03:00 -07:00
Joseph Bielawski
4772db1460
Add missing `use` in HgDriver
...
Closes #1165
2012-10-01 14:59:02 +03:00
Jordi Boggiano
ce31449b2d
Fix calls to non existing method, fixes #1154
2012-09-29 03:26:08 +02:00
Jordi Boggiano
ba2d7081bc
Merge remote-tracking branch 'origin/master'
2012-09-27 23:21:40 +02:00
Jordi Boggiano
027037bb9f
Fix dist urls for lock files and hardcoded references
2012-09-27 20:23:51 +02:00
Jordi Boggiano
8a35353e8d
Allow dist installs for dev packages that do not have a source setup
2012-09-27 19:00:06 +02:00
Jordi Boggiano
5b1782970f
Fix test for new lock format
2012-09-27 18:44:53 +02:00
Jordi Boggiano
beb8e0ab97
Update dist reference as well as source ref
2012-09-27 18:40:58 +02:00
Jordi Boggiano
a9afa8bc1f
Merge remote-tracking branch 'mheleniak/prefer_dist' and fix dists
...
Conflicts:
src/Composer/Installer.php
src/Composer/Package/Locker.php
2012-09-27 18:36:55 +02:00
Jordi Boggiano
2854df2698
Merge pull request #1131 from cs278/fix-loader-timezone-issue
...
Fix unintentional manipulation of release dates
2012-09-25 17:12:20 -07:00
Chris Smith
8961c687ee
Fix unintentional manipulation of release dates
2012-09-21 00:33:27 +01:00
Jordi Boggiano
6bd7ca0230
Fix typos and simplify code
2012-09-20 11:03:58 +02:00
Jordi Boggiano
35245eb817
Add support for local urls and better error reporting to HgDriver
2012-09-20 10:38:35 +02:00
Jordi Boggiano
a35e68670a
Merge pull request #1128 from hason/dumper
...
Added support for the root package in the array dumper
2012-09-20 01:14:11 -07:00
Martin Hasoň
29034ea3e0
Added support for the root package in the array dumper
2012-09-19 23:08:37 +02:00
Jordi Boggiano
8d7e5cdda5
Fix target-dir with multiple slashes too
2012-09-19 11:25:49 +02:00
Jordi Boggiano
a9195eb05f
Add a couple test cases
2012-09-18 18:32:24 +02:00
Jordi Boggiano
f377e9ca87
Fix possible vendor-dir "evasion" via target-dir
2012-09-18 18:30:11 +02:00
Jordi Boggiano
ebc9c73008
Merge remote-tracking branch 'TheFootballSocialClub/loader-singleton'
2012-09-18 10:52:03 +02:00
Jordi Boggiano
0929f25945
Fix typo
2012-09-16 18:19:46 +02:00
Nils Adermann
bcf75024c8
Merge pull request #1110 from derrabus/working-dir-feature
...
Added global --working-dir option
2012-09-15 05:43:05 -07:00
Alexander M. Turek
6f317b7a6b
Switch working directory according to --working-dir option.
2012-09-15 12:29:56 +02:00
Alexander M. Turek
4ac678454d
Added --working-dir to definition.
2012-09-15 11:36:57 +02:00
Nils Adermann
3fa9f10184
Merge pull request #1109 from Seldaek/newlock
...
Use only the locked repository when possible for better performance
2012-09-14 08:51:04 -07:00
Jordi Boggiano
536563dc2a
Rename method
2012-09-14 17:49:03 +02:00
Jordi Boggiano
418e876e8a
Use only the locked repository when possible for better performance
2012-09-14 17:42:12 +02:00
Nils Adermann
cf029cab86
Merge pull request #1108 from Seldaek/newlock
...
Update lock file to contain the complete package info, fixes #890
2012-09-14 07:51:18 -07:00
Jordi Boggiano
83239aa338
Update lock file to contain the complete package info, fixes #890
2012-09-14 16:43:56 +02:00
Adrien Brault
fd58c24a9f
ComposerAutoloaderInitXXX::getLoader behaves like a ClassLoader singleton
...
Calling ComposerAutoloaderInit::getLoader twice when a package requires a .php file containing functions, lead to the functions to be declared twice, and cause an error.
In my case, using behat + symfony2extension + assetic, the error that occured:
PHP Fatal error: Cannot redeclare assetic_init() (previously declared in vendor/kriswallsmith/assetic/src/functions.php:20) in /vendor/kriswallsmith/assetic/src/functions.php on line 26
Fatal error: Cannot redeclare assetic_init() (previously declared in /vendor/kriswallsmith/assetic/src/functions.php:20) in /vendor/kriswallsmith/assetic/src/functions.php on line 26
2012-09-14 11:21:34 +02:00
Jordi Boggiano
02917bd892
Merge pull request #1102 from fortrabbit/frbit-namesearch
...
Search only in name
2012-09-13 00:46:17 -07:00
Ulrich Kautz
ccf2539462
Search only in name
2012-09-12 16:55:10 +02:00
Jordi Boggiano
ab1c7fbb9b
Clarify docs about stability, fixes #1094
2012-09-10 17:18:22 +02:00
Jordi Boggiano
73c9bb8899
Merge pull request #1095 from pborreli/patch-2
...
Fixed typo
2012-09-10 07:59:46 -07:00
Jordi Boggiano
59dd4ab6eb
Merge pull request #1093 from armetiz/patch-1
...
Missing alpha example
2012-09-10 07:57:36 -07:00
Jordi Boggiano
a589a47468
Merge pull request #1088 from mheleniak/bat_file_fix
...
fixed generated windows proxy file for *.exe
2012-09-10 07:50:35 -07:00
Pascal Borreli
9c76d89121
Fixed typo
2012-09-10 09:22:13 +00:00
Thomas Tourlourat
a836f82ddc
Missing alpha example
...
Also missing the "-" for alphaN.
2012-09-10 11:08:40 +03:00