1
0
Fork 0
Commit Graph

4092 Commits (9b41495353ab00ce467bf614ed480c9c6c62ccf4)

Author SHA1 Message Date
Bilal Amarni e727f9f5fe [Config command] allow to pass options when adding a repo 2016-01-25 19:25:10 +01:00
Jordi Boggiano 901e6f1d0e Fix output and handling of RFS::copy() and extract redirect code into its own method, refs #4783 2016-01-25 17:55:29 +00:00
Jordi Boggiano a574d5ef76 Merge remote-tracking branch 'cs278/follow-redirects' 2016-01-25 17:26:05 +00:00
Chris Smith e2e07a32c3 Fixes to vuln detection 2016-01-24 20:54:43 +00:00
Chris Smith bc8b7b0f78 Remove left behind debug code 2016-01-24 19:41:14 +00:00
Chris Smith b32aad8439 Do not set TLS options on local URLs 2016-01-24 19:10:11 +00:00
Chris Smith 74aa73e841 The origin may not be the remote host 2016-01-24 19:09:35 +00:00
Chris Smith 304c268c3b Tidy up and general improvement of sAN handling code
* Move OpenSSL functions into a new TlsHelper class
* Add error when sAN certificate cannot be verified due to
  CVE-2013-6420
* Throw exception if PHP >= 5.6 manages to use fallback code
* Add support for wildcards in CN/sAN
* Add tests for cert name validation
* Check for backported security fix for CVE-2013-6420 using
  testcase from PHP tests.
* Whitelist some disto PHP versions that have the CVE-2013-6420
  fix backported.
2016-01-24 19:02:50 +00:00
Chris Smith 7e2a015e9b Provide support for subjectAltName on PHP < 5.6 2016-01-24 19:02:29 +00:00
Jordi Boggiano 837fa805ec Code tweaks, refs #4124 2016-01-22 19:09:44 +00:00
Jordi Boggiano ddd140fd1c Rollback plugin api version to 1.0.0 for now, add warning about requiring 1.0.0 exactly 2016-01-22 19:09:03 +00:00
nevvermind 5ec6988218 Fixed docs and removed implementation detail 2016-01-22 13:54:59 +00:00
nevvermind aa45a48283 Refactoring
- changed "SPI" into something more familiar, like "implementation"
- throw exceptions on invalid implementation types or invalid class names
- use null instead of false when querying
- refactored the tests accordingly
2016-01-22 13:51:32 +00:00
nevvermind ec8229ffa3 Remove @since 2016-01-22 13:51:32 +00:00
nevvermind 2051d74774 Added Capable plugins for a more future-proof Plugin API
Plugins can now present their capabilities to the PluginManager, through which it can act accordingly, thus making Plugin API more flexible, BC-friendly and decoupled.
2016-01-22 13:51:32 +00:00
Rob Bast 5b85ee409c add missing array-replace-recursive 2016-01-22 14:29:29 +01:00
Rob Bast d6be2a693b switch to array-replace-recursive 2016-01-22 14:27:08 +01:00
Rob Bast 2393222826 more appropriate name 2016-01-22 09:20:43 +01:00
Rob Bast 474541e9aa apply comments
- add capath to json schema
- simplify factory
- hash_file and sha256 for CA checking
- remove exception as scenario should not occur
- remove executable bit from CA file
- make CA file also group/world writable (we overwrite invalid content anyway)
    to avoid permission errors as much as possible
2016-01-22 09:14:37 +01:00
Chris Smith 33f823146b Account for ports in URL 2016-01-22 01:48:16 +00:00
Chris Smith 34f1fcbdcb Drop downgrade warning 2016-01-22 01:47:05 +00:00
Rob Bast c232566e52 add a hash to make sure CA file gets recreated if the content changes 2016-01-21 16:02:44 +01:00
Rob Bast cef97904d0 dont rewrite temp CA file if it already exists
and make it readable by everyone the first time we create it
2016-01-21 15:07:51 +01:00
Rob Bast 4482a1dca0 also wrong array 2016-01-20 21:53:49 +01:00
Rob Bast f79255df29 make sure passed options are merged into defaults before checking 2016-01-20 21:35:06 +01:00
Rob Bast 94947ee772 merge isset() calls 2016-01-20 21:29:55 +01:00
Rob Bast b95b0c2ab6 wrong array 2016-01-20 21:27:26 +01:00
Rob Bast 008cce8d85 add back sanity checks 2016-01-20 21:24:13 +01:00
Rob Bast c1488f65bf a quick stab at adding capath 2016-01-20 21:20:18 +01:00
Jordi Boggiano 395d115d9b Resolve all dirs before initializing them, fixes #4802 2016-01-20 11:17:40 +00:00
Stephen Beemsterboer c1b9b082a4 Break early when a provider name is matched 2016-01-20 01:29:32 -05:00
Chris Smith dd3216e93d Refactor to use new helper methods for headers 2016-01-19 22:19:17 +00:00
Chris Smith 8a8ec6fccc Too many redirects is not an error in PHP, return the latest response 2016-01-19 22:06:38 +00:00
Chris Smith 33471e389f Pass redirect count using options
Removing the risk it might be preserved between requests.
2016-01-19 22:06:27 +00:00
Chris Smith e830a611ec Handle other path redirects 2016-01-19 22:06:27 +00:00
Chris Smith ffab235edd Remove code preventing protocol downgrades 2016-01-19 22:06:27 +00:00
Chris Smith ce1eda25f3 Follow redirects inside RFS only when required by PHP version 2016-01-19 22:06:27 +00:00
Chris Smith 73662c725a Don't let PHP follow redirects it doesn't validate certificates 2016-01-19 22:06:04 +00:00
Radek Benkel 09417cae50 Composer gives .ini hints about missing extensions 2016-01-19 21:02:40 +01:00
Oliver Vartiainen b39b113fc3 Handle envvar auth credentials as a JSON blob
As well as move the handling to a proper place
2016-01-19 20:53:07 +02:00
Oliver Vartiainen aaee6dc0b0 Simplify envvar credential parsing 2016-01-19 20:53:07 +02:00
Oliver Vartiainen e9cac53f90 Allow fetching auth credentials from an envvar
When an environmental variable named "COMPOSER_AUTH" is set
as $USERNAME:$PASSWORD, it is automatically used for authentication
e.g. when fetching packages from Satis.

The envvar credentials are of lower priority than URL credentials.

Fixes #4285
2016-01-19 20:53:07 +02:00
Jordi Boggiano 546730dcf3 Show CA files being used in debug mode, refs #4792 2016-01-19 17:34:29 +00:00
Jordi Boggiano 4dd388074e Merge pull request #4790 from filbertkm/updatecommand
Remove unused import in UpdateCommand
2016-01-19 12:24:00 +00:00
Jordi Boggiano f9fadb187e Fix undefined var $auth issue 2016-01-19 12:04:23 +00:00
Jordi Boggiano 40baa3ff05 Use COMPOSER_HOME if defined instead of falling back to HOME, fixes #4789 2016-01-19 10:54:14 +00:00
aude 0a662a7e42 Remove unused import in UpdateCommand 2016-01-18 19:46:58 -05:00
Jordi Boggiano 96ff17c520 Cleanups of XDG support, refs #1407 2016-01-18 18:26:05 +00:00
Jordi Boggiano 3e9efcfb85 Merge remote-tracking branch 'ntoniazzi/master' 2016-01-18 17:52:46 +00:00
Jordi Boggiano 41d8fdfda8 Restore "Avoid loading plugins that do not match the current plugin api even during installation" but fixed
This reverts commit 0118d69603.
2016-01-18 15:34:08 +00:00
Jordi Boggiano a13b06725e Add support for if-modified-since on lazy repos and turning packagist into a lazy provider repo 2016-01-18 14:03:10 +00:00
Jordi Boggiano 1d08f83976 Only clone if needed 2016-01-18 12:29:14 +00:00
Jordi Boggiano 33c123e8c2 Fix passing of options to remotefilesystem in composer repo 2016-01-18 12:28:03 +00:00
Jordi Boggiano 876f143418 Forward repo options correctly to the RemoteFilesystem even if we get one injected, fixes #4786 2016-01-18 10:50:49 +00:00
Rob Bast 22d8b5dff4 fix possible caBundle error 2016-01-18 08:59:12 +01:00
Jose Diaz-Gonzalez 0118d69603 Revert "Avoid loading plugins that do not match the current plugin api even during installation"
This reverts commit 21f5933e01.

Commit 21f5933e breaks fresh installations of cakephp applications, or
any project where a dependency uses a different composer plugin
installer than the upstream project.

Closes auraphp/Aura.Intl#20
2016-01-17 15:08:25 -05:00
Jordi Boggiano 21f5933e01 Avoid loading plugins that do not match the current plugin api even during installation 2016-01-17 16:08:27 +00:00
Jordi Boggiano 8375af268c Use fixed CN_match for github hosts, fixes #4782 2016-01-17 13:41:56 +00:00
Rob Bast 42f49b3b97 fix missing import 2016-01-16 20:47:49 +01:00
Jordi Boggiano b839c7ef1c Fix code to work with old php, fixes #4779 #4780 2016-01-16 17:59:59 +00:00
Jordi Boggiano 974fb4ac66 Only pass remotefilesystem when needed, fixes #4779 2016-01-16 17:45:40 +00:00
Jordi Boggiano d7c61c50ad Merge branch 'tls-config' 2016-01-16 16:55:19 +00:00
Jordi Boggiano fb848d2e07 Code cleanups 2016-01-16 16:50:28 +00:00
Jordi Boggiano 72fae0bf70 Declare CN_match/SNI_server_name only for php <5.6 2016-01-16 16:28:04 +00:00
Jordi Boggiano 449f68deae Remove dangerous CN_match fallback 2016-01-16 16:26:14 +00:00
Jordi Boggiano a0398286ba Wording fixes 2016-01-16 16:18:00 +00:00
Jordi Boggiano 2491679ba3 Remove override of renderException, refs #4774 2016-01-16 11:24:04 +00:00
Jordi Boggiano d2e97eecb2 Replace preg_match by strpos 2016-01-10 20:43:33 +00:00
Jordi Boggiano 03299ff075 Suggest https in docs where it makes sense, closes #4056 2016-01-10 20:34:53 +00:00
Jordi Boggiano e4eee227e0 Fix old-php support 2016-01-10 20:25:22 +00:00
Jordi Boggiano c1cc6bfecf Avoid doing too many loads of the remotefilesystem 2016-01-10 20:06:10 +00:00
Jordi Boggiano fc4d94f160 Code clarity and updates from the getcomposer.org installer 2016-01-10 17:59:08 +00:00
Jordi Boggiano cb53bd04cb Remove a few instances of RemoteFilesystem that were not needed 2016-01-10 17:07:54 +00:00
Jordi Boggiano 86a911150b Update bundled CAfile and other cleanups 2016-01-10 16:54:44 +00:00
Jordi Boggiano f8dff0867c Remove --disable-tls/--cafile flags and rely solely on config options plus some wording clarifications 2016-01-10 16:37:11 +00:00
Jordi Boggiano 5d015defb8 Merge remote-tracking branch 'origin/master' into tls-config 2016-01-10 16:10:22 +00:00
Jordi Boggiano b056d9ae42 Avoid double xdebug warning with global command 2016-01-10 13:02:20 +00:00
Jordi Boggiano 633e9f91a1 Small tweaks for consistency, refs #3639 2016-01-10 12:35:39 +00:00
Jordi Boggiano 721acf3c93 Merge remote-tracking branch 'SofHad/update-interactive' 2016-01-10 12:09:10 +00:00
Jordi Boggiano bda2c0f9b7 Re-enable include path even when classmap authoritative is present, refs #4556 2016-01-09 19:12:26 +00:00
Jordi Boggiano e05207dbad Merge remote-tracking branch 'bp1222/save-loads' 2016-01-09 19:10:39 +00:00
Jordi Boggiano e8bc9232e0 Add explanation about match args in the "no installed package" output, refs #4663 2016-01-09 18:22:59 +00:00
Jordi Boggiano 42cb3dafc4 Merge remote-tracking branch 'Soullivaneuh/depends-replaces' 2016-01-09 18:19:49 +00:00
Jordi Boggiano 4fbf15e6d6 Tweaks and add new args to docs, refs #4663 2016-01-09 18:16:58 +00:00
Jordi Boggiano 9e42eedf1f Merge remote-tracking branch 'Soullivaneuh/depends-match-constraint' 2016-01-09 18:11:03 +00:00
Jordi Boggiano 5dbc8fa30b Make sure getRepoConfig is only called on VcsRepos, refs #4700 2016-01-09 18:01:48 +00:00
Jordi Boggiano f874842535 Merge remote-tracking branch 'chorry/4331-svn-creds' 2016-01-09 17:59:54 +00:00
Jordi Boggiano 47b05eab7a Fix type errors 2016-01-09 17:59:22 +00:00
Jordi Boggiano dbe7f34181 Allow depend command to show results for platform packages, fixes #3836, fixes #4696 2016-01-09 17:21:01 +00:00
Jordi Boggiano fd7267e4ad Show overridden versions (as well as original) in composer show -p 2016-01-09 17:18:37 +00:00
Jordi Boggiano 1a8aedaa9d Assume -i when running composer show --tree without arg 2016-01-09 17:04:07 +00:00
Jordi Boggiano 764de14b5e Add caching to bitbucket API requests 2016-01-07 14:56:48 +00:00
Jordi Boggiano 64b0d72183 Add missing git fallback function in gitlab driver 2016-01-06 12:32:28 +00:00
Markus Staab 5752559ae8 fixed typo 2015-12-28 15:20:42 +01:00
Jordi Boggiano f31799b739 Fix error output of the psr-4 trailing backslash validation 2015-12-27 13:58:20 +00:00
Jordi Boggiano 94136e0d4f Merge remote-tracking branch 'hanovruslan/add-sort-packages-into-config' 2015-12-22 20:43:36 +00:00
Rob a6beb7f53d Merge pull request #4698 from WouterJ/patch-1
Improve error message about platform php version
2015-12-21 08:37:23 +01:00
Wouter J d0e4c5f71e Use "value" instead of "setting" 2015-12-19 12:15:01 +01:00
hanov.ruslan b298b9e8c6 Added sort-packages into config 2015-12-18 23:13:36 +03:00
Jordi Boggiano c9501a4cc1 Update dependencies, fixes #4706 2015-12-16 18:51:41 +00:00
Jordi Boggiano 29312be4df Strict typing fixes 2015-12-16 17:48:12 +00:00
Alexander Loutsenko f42ba46175 #4331 use --no-auth-cache for svn downloader when such option was set 2015-12-14 15:23:15 +03:00
Wouter J b156ad0345 Improve error message 2015-12-12 12:19:26 +01:00
Jordi Boggiano 43f7b762e5 Revert "[ClassLoader] performance improvement: use str_replace instead of strtr" 2015-12-09 15:46:46 +00:00
Rob 44bc8e019f Merge pull request #4672 from Tobion/patch-1
[ClassLoader] performance improvement: use str_replace instead of strtr
2015-12-07 17:56:35 +01:00
Sullivan SENECHAL e0031ed4a2 Add match-constraint options to depends command 2015-12-07 15:36:18 +01:00
Sullivan SENECHAL 5d625c2231 Improve PHPDoc for package requires 2015-12-07 15:28:22 +01:00
Sullivan SENECHAL 0eb7e2f216 Add --with-replaces option on depends command 2015-12-06 16:50:24 +01:00
Tobias Schultze a76ce9b25a [ClassLoader] no need to call str_replace on Windows 2015-12-04 15:15:36 +01:00
Tobias Schultze 314741c1ec [ClassLoader] use str_replace instead of strtr 2015-12-04 14:33:04 +01:00
Jordi Boggiano feefd51565 Fix custom installer example, fixes #4648 2015-12-03 16:17:58 +00:00
Michal Gebauer ce74477899 Configuration of GitLab driver 2015-12-03 14:30:07 +01:00
Michal Gebauer 611f9dcfe2 Reordered keys gitlab comes after github 2015-12-03 14:24:26 +01:00
Rob dc5f8cfbaa Merge pull request #4659 from mishak87/patch-1
Could not configure gitlab-oauth via CLI #3765
2015-12-03 11:43:39 +01:00
Sullivan SENECHAL d8975b5cb1 Depends command: Add phpdoc blocks for IDE completion 2015-12-02 07:58:08 +01:00
Michal Gebauer 7517a99b1c Could not configure gitlab-oauth via CLI #3765 2015-12-01 20:29:29 +01:00
Jordi Boggiano dc06276179 Remove publish errors from diagnose command output, fixes #4652 2015-12-01 14:57:35 +00:00
Jordi Boggiano 6d9e04c0e9 Tweak regex usage 2015-11-30 14:12:29 +00:00
Jordi Boggiano ddd85afd32 Merge pull request #4633 from jaapio/feature/gitlabInstallPath
Adds support for gitlab installed in subfolder
2015-11-30 13:49:50 +00:00
Jaapio df92cb09ab extract regex to const. To be able to reuse it 2015-11-29 13:59:54 +01:00
Jérémy Romey 94daedde06 Fixed typo in the ShowCommand 2015-11-27 14:39:00 +01:00
Sullivan SENECHAL d9a62ffd50 Improve PHPDoc for package links 2015-11-27 12:51:04 +01:00
Jordi Boggiano 9b8a14179b Only list tree of packages required by root and not every installed package individually, refs #2600 2015-11-27 10:28:57 +00:00
Jordi Boggiano e6e636802f Add support for a simplified pure ASCII version of the tree view, refs #2600 2015-11-27 01:31:50 +00:00
Jordi Boggiano 92ad33d11e Undo some invalid merges and simplify code a little bit, refs #2600 2015-11-27 00:54:16 +00:00
Jordi Boggiano a79d0ab886 Merge remote-tracking branch 'jeremyFreeAgent/feature/tree' 2015-11-27 00:10:04 +00:00
Jordi Boggiano 45a3db8877 Merge pull request #4638 from realshadow/configurable_repository
Allows repositories to implement ConfigurableRepositoryInterface
2015-11-26 23:38:03 +00:00
Jordi Boggiano c5e5bc6fc6 Merge pull request #4589 from dunglas/patch-1
Update the autoloader PHPDoc: PSR-4 instead of PSR-0
2015-11-26 12:37:30 +00:00
Kévin Dunglas 6c5c53c362 Update the PHPDoc: The autoloader supports PSR-0, PSR-4 and classmap. 2015-11-26 13:30:47 +01:00
Jordi Boggiano 8072448cf3 Adjust deduplication of files autoloads, refs 9710b26d3f 2015-11-26 10:39:16 +00:00
Jérémy Romey 36271a7dd1 Added a tree view of required packages 2015-11-26 11:06:09 +01:00
Lukáš Homza 5b748eda6c Allows repositories to implement ConfigurableRepositoryInterface and thus provide getRepoConfigmethod 2015-11-23 23:18:24 +01:00
Jaapio b471440ea0 Adds support for gitlab install in subfolder
Since gitlab can be hosted on any url also subdirectories should be
supported. (e.g https://mycompany.com/gitlab).
This supports only http and https protocols since the gitlab api url
is derived from the package repository url. And the ssh protocol doesn't
support folders this way.
2015-11-23 22:05:37 +01:00
Jordi Boggiano fbab2bfa17 Move user agent definition to StreamContextFactory so it is available in all contexts 2015-11-23 15:12:33 +00:00
Artur Eshenbrener cf593351ef Bypass `runScripts` parameter to autoload dumper in `Installer:run()` method 2015-11-23 11:57:45 +03:00
Jordi Boggiano f084b1e053 Remove duplicate handling of retry-auth-failure option, refs #3765 2015-11-21 21:51:58 +00:00
Jordi Boggiano 020c126c27 Fix CS 2015-11-21 21:51:43 +00:00
Jordi Boggiano a10bffec0e Merge remote-tracking branch 'GromNaN/gitlab' 2015-11-21 21:48:46 +00:00
Jordi Boggiano 977b8c8f41 Fix loading error when plugin is a final class, fixes #4482 2015-11-21 20:35:00 +00:00
Jordi Boggiano 7a06615bf0 Add env var to disable xdebug warnings, refs #4622 2015-11-21 20:06:31 +00:00
Jordi Boggiano 966a982738 CS fixes 2015-11-21 19:28:10 +00:00
Jordi Boggiano 67a1924173 Merge remote-tracking branch 'Rudloff/xz' 2015-11-21 19:16:59 +00:00
Jordi Boggiano 1fe690f810 Autoload generator cleanups 2015-11-21 18:33:17 +00:00
Jordi Boggiano 3748c11709 Simplify files autoload include function, and make sure files are included once per package even if exactly the same, refs #4186 2015-11-21 18:30:44 +00:00
Jordi Boggiano 9710b26d3f Merge remote-tracking branch 'jeskew/feature/require_files_but_once' 2015-11-21 17:31:05 +00:00
Jordi Boggiano c0b49d09f3 Merge remote-tracking branch 'cw-ozaki/no-script-dump-autoload'
Conflicts:
	src/Composer/Autoload/AutoloadGenerator.php
	src/Composer/Command/DumpAutoloadCommand.php
2015-11-21 17:14:33 +00:00
Jordi Boggiano cb3d9527e1 Avoid some external process calls when creating the global composer instance, saves a few ms of initialization time 2015-11-21 02:42:41 +00:00
Jordi Boggiano 1fca6be3bf Fix detection of the root package version to always use the correct cwd 2015-11-21 02:35:40 +00:00
Jordi Boggiano e87190e3da Detect duplicate keys in composer.json, fixes #4620 2015-11-21 02:35:00 +00:00
Jordi Boggiano dbcf8cae13 Fix depends command to also show when the root package depends on something 2015-11-19 17:42:08 +00:00