Jordi Boggiano
4cd6eabdba
Merge branch '1.2'
2016-10-08 11:27:52 +02:00
Fabien Potencier
b502a35fc1
added missing var declaration
2016-10-07 11:38:36 -07:00
Fabien Potencier
2853e82400
removed obsolete code
2016-10-06 11:56:54 -07:00
Rob Bast
64317e1ff8
bring arraydumper in line with json schema spec and packagist
2016-10-04 13:15:09 +02:00
Nils Adermann
23d2e5600a
Merge pull request #5738 from Toflar/reduce-hashing-calls
...
Reduce calls on Rule::getHash()
2016-10-04 12:20:39 +02:00
Yanick Witschi
7b5fe5c7d4
CS
2016-10-04 10:40:18 +02:00
Rafael Kassner
44634a689d
HgDriver does not identify bitbucket mercurial repos correctly
2016-10-03 13:17:07 +02:00
Jordi Boggiano
1c34248022
Check that PHP_ZTS is defined
2016-10-01 13:03:15 +02:00
Jordi Boggiano
9b08ee48db
Update platform package regex
2016-10-01 13:01:47 +02:00
David Zuelke
19126d76a6
unify php-* package description grammar
2016-09-30 23:12:13 +02:00
David Zuelke
a26c03eef0
add php-zts virtual platform package
2016-09-30 23:12:13 +02:00
David Zuelke
0f68c01094
add php-debug virtual platform package
2016-09-30 23:12:13 +02:00
Yanick Witschi
a9e88a27b3
CS
2016-09-30 17:40:28 +02:00
Yanick Witschi
4a769a785c
Reduce calls on Rule::getHash()
2016-09-30 17:25:41 +02:00
Roel Arents
489a8f3d5a
revert to simply making an exception (no acces_token) for bitbucket/user/repo/downloads URLs
...
[#5584 ]
2016-09-29 21:16:47 +02:00
berlinger-rarents
5123c5cf76
remove redundant truth check
2016-09-29 10:55:14 +02:00
Jordi Boggiano
b6cc2c7b83
Merge pull request #5665 from radmiraal/default-strategy-from-environment
...
Allow setting default transport strategy for path repositories
2016-09-29 08:41:11 +02:00
Jordi Boggiano
0c4cae056f
Simplify code
2016-09-29 08:40:03 +02:00
Jordi Boggiano
902a5c32db
Add bug ref
2016-09-29 08:06:44 +02:00
AnrDaemon
c774d41a9c
Fix realpath() failing on Windows
2016-09-29 08:05:55 +02:00
berlinger-rarents
8845ea467a
try bitbucket downloads first time without auth
...
also add tests for #5584
2016-09-28 19:08:24 +02:00
Rob Bast
710bb0d008
fix based on test, fixes #5724
2016-09-27 17:39:44 +02:00
Rob Bast
e60eff5f2e
apply patch
2016-09-27 14:45:33 +02:00
berlinger-rarents
64fc8ffe3d
prevent (prompt for) auth for bitbucket public downloads
...
#5584
2016-09-27 11:41:16 +02:00
berlinger-rarents
a4e3e1b584
prevent (prompt for) bitbucket auth when it redirected
...
#5584
2016-09-26 19:47:10 +02:00
Rens Admiraal
a294af3f16
Allow setting default transport strategy for path repositories
...
This change allows setting COMPOSER_MIRROR_PATH_REPOS to 1
in the environment to set the default strategy to 'mirror'.
This allows using 'mirror' during deployments while still symlinking
on a development machine. The default is still overwritten by the
options on the repository configuration.
2016-09-25 19:56:12 +02:00
Jordi Boggiano
3030dab90e
Merge branch '1.2'
2016-09-23 16:37:54 +02:00
Ruslan Bekenev
8c1f889806
cut out "file://" from VCS download() method
...
this issue was happening due to realpath() function
that cannot work with "file://" path.
For local repositories it is valid url but not valid for realpath()
2016-09-23 16:37:32 +02:00
Jordi Boggiano
048a801fce
Merge pull request #5698 from johnstevenson/restart2
...
Simplify XDebugHandler restart process
2016-09-23 16:35:12 +02:00
johnstevenson
e9a97004c5
Simplify XdebugHandler restart process
2016-09-23 13:50:54 +01:00
Fabien Potencier
e83f7c2929
Fix process timeout when set to 0
2016-09-21 11:48:10 +02:00
Fabien Potencier
2c77fd6801
Fix process timeout when set to 0
2016-09-20 18:25:05 -07:00
Jordi Boggiano
b171c24101
Merge branch '1.2'
2016-09-19 18:47:48 +02:00
Jordi Boggiano
8e1b90bc08
Allow reading repo.0 in config command, fixes #5692
2016-09-19 18:47:44 +02:00
Jordi Boggiano
68861c48ed
Merge branch '1.2'
2016-09-17 13:27:39 +02:00
Jordi Boggiano
64d29dc6dc
Fix regex cleaning up repo URLs, fixes #5686
2016-09-17 13:27:29 +02:00
SpacePossum
2ae0800cd3
Remove useless concat.
2016-09-16 14:50:34 +02:00
Jordi Boggiano
ec2660fe78
Fix regex escaping, fixes #5674
2016-09-13 16:18:05 +02:00
Jordi Boggiano
429ee5f8eb
Merge branch '1.2'
2016-09-12 22:50:58 +02:00
Jordi Boggiano
a2b3e89d56
Make sure php-ipv6 is recognized as a platform package as well
2016-09-12 22:49:44 +02:00
Kamran Ahmed
6990454e56
Minor refactoring - Early exit
2016-09-12 22:39:44 +05:00
Jordi Boggiano
2ffa1148a9
Merge branch '1.2'
2016-09-12 19:06:26 +02:00
Den Girnyk
71e0fba216
Pass devMode from RunScriptCommand to Script\Event
2016-09-12 17:20:51 +02:00
Jordi Boggiano
8de10dd159
Tweak logic in case of dirty state start-up, refs #5668
2016-09-12 16:58:30 +02:00
Jordi Boggiano
be727a7a6b
Merge remote-tracking branch 'alcohol/fix-5667'
2016-09-12 16:57:13 +02:00
Jordi Boggiano
285c4a1ac6
Merge branch '1.2'
2016-09-12 16:56:32 +02:00
Jordi Boggiano
ff7daf0bd4
Fix handling of paths on windows when cwd is root of drive, fixes #5554
2016-09-12 16:56:04 +02:00
Rob Bast
cd54fc8a30
better naming (clarity)
2016-09-12 16:22:39 +02:00
Rob Bast
81a34f0cc6
cleanup env that contains previous/old path
2016-09-12 16:20:49 +02:00
Rob Bast
547616e96b
tentative fix for #5667
2016-09-12 16:08:50 +02:00
Jordi Boggiano
f78f6c963d
Add note about rawurlencode, refs #5503
2016-09-12 14:27:11 +02:00
Calin Marian
a888b082b0
Make urlEncodeAll private
2016-09-12 14:26:13 +02:00
Calin Marian
862a13a17e
Urlencode Gitlab project names
...
Url encode all non alphanumeric characters in project name for GitLabDriver.
If the project name has "." characters in it, which is supported in Gitlab, the Gitlab API will 404 when requesting the branches or tags of the repository. This commit urlencodes all non alphanumeric characters in the project name in requests to the Gitlab API.
2016-09-12 14:26:07 +02:00
Jordi Boggiano
754d4fa1b2
Merge branch '1.2'
2016-09-12 11:52:17 +02:00
Jordi Boggiano
a04256810e
Change exit code to be 1/2 for warn/fail, refs #5601
2016-09-12 11:25:43 +02:00
Jordi Boggiano
b29d810d63
Only treat errors as real failures, fixes #5601
2016-09-12 11:00:38 +02:00
Jordi Boggiano
cfdeb61779
Avoid warning when testing for packagist over http
2016-09-12 11:00:10 +02:00
Jordi Boggiano
2d8251b7ad
Fix handling of local binaries on windows, refs #5612
2016-09-10 12:51:53 +02:00
Jordi Boggiano
f63f1ff95f
Merge remote-tracking branch 'davidolrik/master'
2016-09-10 12:32:00 +02:00
Jordi Boggiano
9b42f16762
Merge pull request #5575 from admonkey/master
...
update help page on global for COMPOSER_HOME info
2016-09-10 12:17:45 +02:00
Jordi Boggiano
cada55dde6
Merge pull request #5491 from moolex/support_gitlab_private_token
...
Support gitlab private-token for easier access via Gitlab API
2016-09-10 12:15:35 +02:00
Jordi Boggiano
994211523c
Merge remote-tracking branch 'johnstevenson/restart'
2016-09-10 12:09:29 +02:00
Jordi Boggiano
8313e86877
Remove hash from composer.lock as content-hash has been out over a year and since 1.0.0-alpha11, refs #5653
2016-09-10 11:34:47 +02:00
johnstevenson
896d1d71f8
Use ConsoleOutput to determine color support
2016-09-06 14:57:18 +01:00
johnstevenson
4249bd1456
Code review fix and doc comment tweaks
2016-09-05 20:19:12 +01:00
johnstevenson
e381abeec0
Simplify argv handling
2016-09-03 19:00:41 +01:00
johnstevenson
fe861ac365
Ensure consistent eols in tmp ini
2016-09-03 18:51:26 +01:00
johnstevenson
89d6e6f0bd
Fix Windows anniversary update change
2016-09-03 18:50:11 +01:00
Jordi Boggiano
3e010fc332
Merge pull request #5591 from ianlet/master
...
Use https url of the repository instead of ssh given gitlab project is public
2016-09-02 19:03:55 +02:00
Jordi Boggiano
165ff07146
Merge branch '1.2'
2016-09-02 19:00:31 +02:00
Matthew "Juniper" Barlett
09dad8a018
Clean up regex in InitCommand::parseAuthorString
...
Per comments:
- https://github.com/composer/composer/pull/5638#discussion_r76972844
- https://github.com/composer/composer/pull/5638#discussion_r76973941
2016-09-02 18:59:20 +02:00
Matthew "Juniper" Barlett
ac41bb0615
Fix for issue #5631
...
- Add " ( and ) as valid characters in author name
- Add relavent unit tests
2016-09-02 18:59:10 +02:00
Jordi Boggiano
4861b74d3d
Merge pull request #5569 from nicolas-grekas/clean-proc-output
...
Cleanup processes output handling
2016-09-02 18:52:16 +02:00
Nicolas Grekas
f063d28a59
Cleanup processes output handling
2016-09-02 18:44:55 +02:00
Jordi Boggiano
ed78253c58
Only update reference if there is actually a reference, fixes #5609
2016-09-02 18:43:44 +02:00
Jordi Boggiano
d9d2d11949
Merge branch '1.2'
2016-08-30 15:25:26 +02:00
Nicolas Grekas
c6b26c4e96
Make static inlining more selective
2016-08-30 15:25:17 +02:00
Jordi Boggiano
edddae42db
Revert default change from #5603
2016-08-30 15:20:20 +02:00
John Whitley
4479b8a690
Squashed commit of the following:
...
commit 3994b556dcffcde7b1801c8bc712f3127e8f8e7c
Author: John Whitley <john.whitley@berea.eu>
Date: Tue Aug 16 09:02:53 2016 +0100
https://github.com/composer/composer/issues/5600
This alters the default flag for loadOptions in
\Composer\Package\Loader\ArrayLoader to true; and alters the assumption
of the test to reflect this change.
**Rationale**
The `\Composer\Package\Loader\ArrayLoader` test (defined in
tests/Composer/Test/Package/Loader/ArrayLoaderTest.php) assumed that a
new `\Composer\Package\Loader\ArrayLoader` instance would be always
created with the optional flag loadOptions set to true.
```php
$this->loader = new \Composer\Package\Loader\ArrayLoader(null, true);
```
This change alters the general case to reflect the default assumption as
defined in the test.
commit b75fc4ad7238bc50f724bd29446ccbc33e82c34c
Author: John Whitley <john.whitley@berea.eu>
Date: Mon Aug 15 16:55:27 2016 +0100
Altered the test for ArrayLoader to use the default loadConfig flag, and to test the true and false states for the loadConfig flag
2016-08-30 15:20:15 +02:00
Jordi Boggiano
f3af3ede40
Merge pull request #5552 from fvdb/add-minor-only-option
...
Added minor-only option to show command to only show packages with minor updates
2016-08-29 19:38:18 +02:00
Jordi Boggiano
e29508f823
Merge pull request #5608 from donatj/no-suggest-require
...
Adds --no-suggest to RequireCommand
2016-08-29 13:31:09 +02:00
Jordi Boggiano
6f7389e911
Revert default change from #5603
2016-08-26 11:32:58 +02:00
Frank van den Brink
e60a7216c6
Clarified minor-only option description
2016-08-26 10:47:10 +02:00
Frank van den Brink
cb7377d2cb
Added minor-only option to show command to only show packages with minor updates
2016-08-26 10:34:09 +02:00
David Jack Wange Olrik
2c84be47c2
Add support for seamless execution of local binaries
...
Projects that add binaries to `vendor-bin` can now execute those via the same command as projects that consume them without installing them first.
In list overview local commands have a `(local)` tag to distinguish them from commands installed in `vendor-bin`.
Local binaries take precedence over `vendor-bin` which takes precedence over binaries in path.
2016-08-21 16:57:19 +02:00
Jesse Donat
4de11a955a
Adds --no-suggest to RequireCommand
2016-08-18 13:46:19 -05:00
John Whitley
c51c1b3047
Squashed commit of the following:
...
commit 3994b556dcffcde7b1801c8bc712f3127e8f8e7c
Author: John Whitley <john.whitley@berea.eu>
Date: Tue Aug 16 09:02:53 2016 +0100
https://github.com/composer/composer/issues/5600
This alters the default flag for loadOptions in
\Composer\Package\Loader\ArrayLoader to true; and alters the assumption
of the test to reflect this change.
**Rationale**
The `\Composer\Package\Loader\ArrayLoader` test (defined in
tests/Composer/Test/Package/Loader/ArrayLoaderTest.php) assumed that a
new `\Composer\Package\Loader\ArrayLoader` instance would be always
created with the optional flag loadOptions set to true.
```php
$this->loader = new \Composer\Package\Loader\ArrayLoader(null, true);
```
This change alters the general case to reflect the default assumption as
defined in the test.
commit b75fc4ad7238bc50f724bd29446ccbc33e82c34c
Author: John Whitley <john.whitley@berea.eu>
Date: Mon Aug 15 16:55:27 2016 +0100
Altered the test for ArrayLoader to use the default loadConfig flag, and to test the true and false states for the loadConfig flag
2016-08-16 09:16:37 +01:00
ianlet
5874132857
return https url of the repository given gitlab project is public
2016-08-11 23:00:18 -04:00
johnstevenson
cfaa122ade
Ensure colored output if restarted from a capable terminal
2016-08-10 19:14:48 +01:00
Diego Oliveira
c55fd9bd10
Modify the message for memory errors
2016-08-09 21:31:19 -03:00
johnstevenson
586eb3bb41
Restart with xdebug disabled
2016-08-08 18:30:56 +01:00
Jeff Puckett
9e7d1a4f9e
update help page on global for COMPOSER_HOME info
...
default installation directory for global packages
has changed since adding support for freedesktop.org standards
per confusion from http://stackoverflow.com/q/38703915/4233593
2016-08-04 16:26:37 -05:00
Nicolas Grekas
dd67b01ac5
Add ClassLoader::$missingClasses to not trigger a COW
2016-07-28 10:35:44 +02:00
Rob Bast
02455712cf
check for additional possible output strings, fixes #5543
2016-07-26 11:46:51 +02:00
Jordi Boggiano
3455380413
Patch Httpoxy vulnerability
2016-07-19 00:57:41 +02:00
Jordi Boggiano
2f3db8c397
Make it clear that a package is cloned from source, fixes #5489
2016-07-19 00:50:09 +02:00
Jordi Boggiano
685ff8699b
Capture output
2016-07-12 17:19:15 +01:00
Jordi Boggiano
a242f7e9ba
Use process component instead of passthru, fixes #5501
2016-07-12 16:18:30 +01:00
Jordi Boggiano
7bcd336c95
Disable plugins across the board when --no-plugins is specified, fixes #5509
2016-07-12 16:14:26 +01:00
Richard Fussenegger
560f09cf3c
Changed error suppression to Silencer
2016-07-07 08:25:46 +02:00
Richard Fussenegger
14224a1f02
Reduced to single requirement
2016-07-06 22:05:08 +02:00
Richard Fussenegger
a155f4e7ea
Removed unused Silencer import
2016-07-06 19:00:44 +02:00
Richard Fussenegger
45e998c1d5
Reverted to initial version
2016-07-06 18:59:03 +02:00
moyo
c4ac59601f
Update related docs and config definitions
2016-07-06 16:25:18 +08:00
moyo
997a062ebd
Support gitlab private-token (or personal-access-token) for easier access via gitlab API
...
Config example:
$HOME/.composer/auth.json
{
"gitlab-token": {
"gitlab.com": "YOUR-TOKEN-HERE"
}
}
Gitlab API authentication doc: http://doc.gitlab.com/ce/api/README.html
2016-07-05 18:02:39 +08:00
Jordi Boggiano
334d0cce6b
Make sure we do not clone from local mirror if mirroring failed
2016-07-02 23:52:10 +01:00
Jordi Boggiano
87fbf4a6cd
Clean ups, refs #5485
2016-07-02 17:49:46 +01:00
Jordi Boggiano
8ffe224c0d
Merge remote-tracking branch 'stefangr/fix_minor_bitbucket_oauth_issues'
2016-07-02 17:43:07 +01:00
Jordi Boggiano
4998ee27b3
Re-use mirror code from the git driver, refs #5384
2016-07-02 17:20:51 +01:00
Jordi Boggiano
55e90093a4
Merge remote-tracking branch 'marvil07/faster-git-clones-using-cache'
2016-07-02 16:43:19 +01:00
Jordi Boggiano
59596ff012
Make sure we do not overwrite binaries but only re-create missing ones, refs #5127
2016-07-02 16:35:09 +01:00
Jordi Boggiano
88d5b74c74
Merge remote-tracking branch 'j0k3r/re-install-binaries'
2016-07-02 16:15:33 +01:00
Jordi Boggiano
e53119f806
Make use of pretty version for new references, refs #5328
2016-07-02 16:03:04 +01:00
Jordi Boggiano
44ddcf4da7
Merge remote-tracking branch 'slbmeh/feature/version-status'
2016-07-02 15:38:22 +01:00
Jordi Boggiano
98bf6d704e
Undo addition of a bunch of Script methods to RootPackage[Interface], refs #5401
2016-07-02 15:27:45 +01:00
Jordi Boggiano
a72ef947d4
Merge remote-tracking branch 'CupOfTea696/master'
2016-07-02 15:24:42 +01:00
Stefan Grootscholten
5a31c75289
Fix some of the remaining OAuth issues.
...
- Bitbucket will silently redirect to a login page when downloading a zip.
Added a check to see if the content-type is not text/html
- Make the path from Basic Authentication to OAuth as smooth as possible.
2016-07-02 15:10:33 +02:00
Jordi Boggiano
664ba44901
Merge pull request #5467 from bohwaz/fossil
...
Fossil VCS support for Composer
2016-06-26 15:27:40 +02:00
Jordi Boggiano
75074382de
Merge branch '1.1'
2016-06-25 15:50:18 +01:00
Jordi Boggiano
fd6455218e
Avoid warnings in case cache dir is explicitly directed to /dev/null, fixes #5468
2016-06-25 15:49:52 +01:00
bohwaz
517a9b6f4c
Fix fossil update
2016-06-25 13:09:02 +12:00
Jordi Boggiano
ebae5dfd95
Undo downgrade before trying again if http seems unreliable, refs #2835
2016-06-24 14:58:32 +01:00
Pierre du Plessis
f29b3e86ce
Remove type parameter from RepositoryInterface
...
Fixes #5458
Remove the `$type` parameter from `RepositoryInterface` to alleviate the BC break for plugins.
2016-06-23 12:31:39 +02:00
bohwaz
5674262030
fix typo and bugs on Fossil support
2016-06-23 17:14:53 +12:00
bohwaz
0e26a07a74
Fix: use the right directory for repository file
2016-06-23 08:41:29 +12:00
bohwaz
abcbef4a67
Add Fossil support to Composer
2016-06-23 08:41:00 +12:00
Jordi Boggiano
894b53c115
Merge pull request #5454 from pierredup/type-search
...
Added type option to search
2016-06-21 17:03:13 +02:00
Pierre du Plessis
6a557e45b8
Added --type option to search
2016-06-21 16:38:52 +02:00
Jordi Boggiano
1c4acf3583
Refactor code to use RemoteFilesystem facilities for header parsing, refs #5435
2016-06-21 11:32:39 +01:00
Jordi Boggiano
f8c3ef4136
Merge remote-tracking branch 'dunlop-lello/master'
2016-06-21 11:27:45 +01:00
Jordi Boggiano
efb24846cb
Merge branch '1.1'
2016-06-21 11:01:40 +01:00
Jordi Boggiano
f94d06ff0a
Fix escaping
2016-06-21 11:01:35 +01:00
Jordi Boggiano
39c2c8c30a
Add test for password escaping
2016-06-21 11:01:09 +01:00
Marco Villegas
44f94a7b83
Prevent duplicate file checking on git download.
2016-06-18 19:39:09 -05:00
Marco Villegas
75b88a13fe
Use regex to capture git version.
2016-06-18 17:55:24 -05:00
Stefan Grootscholten
78fcb5a366
Add support section to composer data for bitbucket repositories.
2016-06-17 17:35:43 +02:00
Phil Lello
7a112b0395
Check headers for missing scopes before asking for new OAuth token
...
This patch stops the GitHub VCS driver prompting for a new access
token when a repository is deleted/hidden.
Specifically, it checks the X-OAuth-Scopes and X-Accepted-OAuth-Scopes
response headers to see if the scopes on the current request match
those needed by the API call. If they do, the 404 means that the repo
is deleted/hidden, and there's no point asking for a new OAuth token.
2016-06-16 07:40:54 +01:00
Stefan Grootscholten
1241e3e83c
Simplify the if statement.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten
42f4d344a4
Fix the replacement of the credentials.
...
://username:password@domain
was replaced by ://://:***@domain
instead of ://username:***@domain or ://***:***@domain
2016-06-11 17:33:58 +02:00
Stefan Grootscholten
ea11a95359
Provide fallback when using basic authentication.
...
When composer is configured to use bitbucket basic authentication (a bitbucket username and password), you get an error
when trying to install dependencies.
This commit prevent the install process to be aborted due to uncaught exceptions.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten
7716ef059b
Add the access token as query string parameter.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten
d9fd9fca6b
Implement changes after review of stof.
...
Rename getContents to getContentsWithOAuthCredentials.
Make gitDriver a private property.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten
1084a3927e
Implement Bitbucket Util in GitBitbucketDriver.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten
307fd4023b
Fetch composer.json using the oauth api.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten
6c8b0cc2c1
Change authentication for bitbucket to oauth.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten
0e500d4c91
Make API URL available for external use.
2016-06-11 17:33:58 +02:00
Jordi Boggiano
a8edaad381
Merge pull request #5335 from carlcraig/1.1
...
Update bitbucket oauth instructions
2016-06-11 17:00:13 +02:00
Jordi Boggiano
5a3d60c0cf
Output warning for invalid-looking packagist config, fixes #5404
2016-06-11 15:48:44 +01:00
Jordi Boggiano
73d9a4717d
Update list of ciphers /cc @cs278
2016-06-11 11:19:58 +01:00
Jordi Boggiano
08ef916bed
Change default value
2016-06-06 11:22:06 +01:00