1
0
Fork 0
Commit Graph

4408 Commits (40df5dddee7322ff12f05e15770f18fc425fde8d)

Author SHA1 Message Date
Jordi Boggiano 59975e3aaa Add missing keys class 2016-01-25 19:43:48 +00:00
Jordi Boggiano f4bcf7590b Fix array syntax 2016-01-25 19:43:48 +00:00
Jordi Boggiano 3ef22258e5 Add key fingerprints for easier comparison and debugging via diagnose 2016-01-25 19:43:48 +00:00
Jordi Boggiano a9be7c83f1 Add verification of signatures when running self-update 2016-01-25 19:43:48 +00:00
Jordi Boggiano bdb97e7527 Reuse new TlsHelper for CA validation, refs #4798 2016-01-25 19:17:56 +00:00
Jordi Boggiano 1ea810d40b Merge remote-tracking branch 'cs278/san-support' 2016-01-25 18:53:45 +00:00
Jordi Boggiano 78ffe0fd08 Avoid checking CA files several times 2016-01-25 18:34:52 +00:00
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 f1cf5d64dd createPackage() method should use the $class argument it accepts 2016-01-20 01:34:37 -05: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
Jordi Boggiano bd76506dd8 Disable plugin registration during the whole run when running with --no-plugins, fixes #3910 2015-11-19 17:38:25 +00:00
Jordi Boggiano cf6cd83335 Use writeError for xdebug warning and fix running test suite with xdebug 2015-11-19 17:37:32 +00:00
Jordi Boggiano d98b134dc3 Fix removal of packages installed in custom path with custom installers not overriding uninstall, fixes #2232 2015-11-19 16:36:19 +00:00
Jordi Boggiano 4071b09091 Merge pull request #4615 from staabm/xdebugwarn
add a warning when xdebug is loaded while running composer commands
2015-11-19 14:47:52 +00:00
Markus Staab a59f0a7ca8 add a warning when xdebug is loaded while running composer commands 2015-11-19 13:57:57 +01:00
Jordi Boggiano f5e0fc14b3 Clarify some error messages, fixes #3770 2015-11-18 18:53:33 +00:00
Jordi Boggiano 690c7f572f Enable -f flag based on user selection and not only config values, refs #3789 2015-11-18 16:23:41 +00:00
Steve Buzonas 27d51642c8 stash untracked and force checkout if discarding changes 2015-11-18 16:23:40 +00:00
Markus Staab 9f5efc3091 added a troubleshooting link in case of out-of-memory errors 2015-11-17 16:25:33 +01:00
Jordi Boggiano 6f29df01d2 Fix updir regex matching, refs #4607 2015-11-14 15:44:30 +00:00
Jordi Boggiano f674261b96 Merge remote-tracking branch 'ockcyp/exclude-classmap-parent' 2015-11-14 15:33:55 +00:00
Jérôme Tamarelle 4255db9e31 Allows SSH urls for gitlab and detect the scheme
SSH urls uses HTTPS to request the API
2015-11-14 16:05:05 +01:00
Jordi Boggiano 4b269f4ded Follow stability option in create-project to select the best possible version, refs #4563 2015-11-14 15:04:04 +00:00
Jordi Boggiano adc0bbeeb9 Forward args/flags down to referenced events 2015-11-14 14:02:47 +00:00
Jordi Boggiano 24ccaa328d Tweak output of calls to script references, refs #4592 2015-11-14 13:52:26 +00:00
Jordi Boggiano db5ef12540 Merge remote-tracking branch 'giosh94mhz/script_groups' 2015-11-14 13:47:09 +00:00
Jordi Boggiano 6c9b161c43 Re-use locker content hash logic to generate dist reference, refs #4515 2015-11-14 13:30:37 +00:00
Jordi Boggiano f0a0ce5e98 Merge remote-tracking branch 'joelwurtz/patch-1' 2015-11-14 13:29:24 +00:00
Jérôme Tamarelle ac68a721f4 Merge remote-tracking branch 'composer/master' into gitlab
Conflicts:
	doc/04-schema.md
	src/Composer/Util/RemoteFilesystem.php
2015-11-14 14:13:39 +01:00
Jerome TAMARELLE 6ccc562c0f Add tests on GitLab class (copied from GitHubTest) 2015-11-13 18:50:50 +01:00
Jerome TAMARELLE db056b8383 Fix retry authentification on gitlab oauth 2015-11-13 18:36:29 +01:00
Jerome TAMARELLE 211d4632bb Fix compatibility with PHP 5.3 2015-11-13 18:06:17 +01:00
Omer Karadagli 4046ae042d Up-level relative paths in exclude-from-classmap 2015-11-12 15:53:47 +00:00
Jordi Boggiano 2a8a9a4592 Revert "Issue #2384 allow 'prefer-stable' and 'minimum-stability' to be set via composer config command"
This reverts commit ed23b1c4db.
2015-11-11 15:33:58 +00:00
Jordi Boggiano 58a6d4b7d3 Add comment 2015-11-10 16:35:29 +00:00
David Fuhr 064e1a6d6d Fix handling of http 400 errors
Before 400 errors were silently dropped. This caused composer to store
the returned body (usually some html) in cache. This resulted in later
errors when composer tried to extract this error response as zip.

With this exceptions thrown it handles the error gracefully and falls
back to the next URL provided by the package configuration.
2015-11-10 16:30:01 +01:00
Jordi Boggiano d35fc31f62 Add process error to the output of failed unzipping 2015-11-10 13:29:51 +00:00
Jordi Boggiano fc0da27d84 Add more debug output when writing to cache 2015-11-10 13:12:53 +00:00
Giorgio Premi fd0026b542 Detect infinite script call recursion 2015-11-09 15:34:11 +01:00
Giorgio Premi a25492d1b9 Allow composer script call with @ syntax 2015-11-09 15:34:11 +01:00
Rob Bast 991d25115f fixes #4562 2015-11-05 18:47:30 +01:00
Shawn Tunney 54584e6b0f Have xcopy overwrite existing files 2015-11-04 10:46:27 -05:00
Jordi Boggiano 2d24ed8e74 Improve error reporting 2015-11-03 20:37:11 +00:00
Pierre Rudloff 3abad250e9 .tar.xz downloader 2015-10-31 18:18:11 +01:00
annesosensio 2e4157145b Made wildcard expansion consistent with bash 2015-10-30 21:30:50 +01:00
Jordi Boggiano ac1a0c898d Add exclude-from-classmap support in validation 2015-10-30 20:04:25 +00:00
Jordi Boggiano 6c16510743 Add support for wildcards in exclude-from-classmap, refs #1607 2015-10-30 19:12:30 +00:00
Jordi Boggiano f1b0c073ad Tweaked exclude-from-classmap: windows support, normalize paths and make sure they are all package-relative and do not leak to other packages, refs #1607 2015-10-30 00:22:04 +00:00
Jordi Boggiano 084f6de24e Merge remote-tracking branch 'trivago/add_exclude'
Conflicts:
	doc/04-schema.md
	src/Composer/Autoload/AutoloadGenerator.php
2015-10-30 00:00:44 +00:00
Jordi Boggiano ef2856ef55 Take php version into account for create-project command version selection 2015-10-29 22:35:30 +00:00
Rob c7ed232ef4 Merge pull request #4529 from jeroenseegers/warn-on-commit-reference
Generate a warning when a commit reference is used
2015-10-29 10:52:59 +01:00
xelan 32517d90d2 Escape angle brackets for commit message output 2015-10-29 09:01:28 +01:00
David Walker e0a6419992 When classmap authoratative is enabled, there should be no reason to load 3 files, and process them when autoloader will return false 2015-10-28 14:29:36 -06:00
Jordi Boggiano 599ad77167 Merge pull request #4542 from bd808/feature/support-merge-plugin
Allow easier manipulation of RootAliasPackage
2015-10-28 03:45:57 +00:00
Jordi Boggiano 6582c337d0 Fix typo 2015-10-28 00:06:21 +00:00
Jordi Boggiano 8e99cec3e7 Fix ref to findShortestPath 2015-10-28 00:04:33 +00:00
Bryan Davis dc40bf9f51 Remove unused local variables from AliasPackage 2015-10-27 14:44:57 -06:00
Bryan Davis 06c44ce998 Add setters used by composer-merge-plugin to RootPackageInterface
Extend RootPackageInterface with setter functions used by
composer-merge-plugin and implement them for RootAliasPackage. This will
allow composer-merge-plugin and similar code that manipulates the root
package at runtime to ignore the difference between a RootPackage and
a RootAliasPackage.
2015-10-27 14:43:29 -06:00
Jordi Boggiano 193a072d3c Clarify that the abstract constraint should not be relied upon anymore 2015-10-27 19:13:50 +00:00
Bryan Davis 2eb0af264b Allow RootAliasPackage to override cached values
AliasPackage caches the values of 'requires', 'devRequires',
'conflicts', 'provides', 'replaces' locally to allow `self.version`
references to be properly updated to reference the alias. Plugins like
composer-merge-plugin that manipulate these settings at runtime need to
be able to change the values after alias construction.
2015-10-27 12:36:13 -06:00
Jordi Boggiano 1160b782c8 Deduplicate classmap creation and add support for loading classmaps on the fly for plugins & co 2015-10-27 17:47:25 +00:00
Jordi Boggiano 8cd6598d8d Simplify php version fetching 2015-10-27 16:40:52 +00:00
Jordi Boggiano 125dc62fab Make trigger error visible 2015-10-27 16:11:07 +00:00
Jordi Boggiano 615638c7c3 Simplify bin-compat by removing the nosymlink option, refs #3704 2015-10-27 15:36:12 +00:00
Jordi Boggiano c9b51a5751 Merge remote-tracking branch 'kocsismate/feature-bin-compat' 2015-10-27 15:20:53 +00:00
Jordi Boggiano ebe0c8d79c Fix issue #3229, refs #3184 2015-10-27 15:12:18 +00:00
Jordi Boggiano 90a90e22de Merge remote-tracking branch 'Wirone/unixy-proxy'
Conflicts:
	src/Composer/Installer/LibraryInstaller.php
2015-10-27 15:10:35 +00:00
Jordi Boggiano 82349bcb2a Fix support for extracting stability flags in multi-constraints, fixes #4440 2015-10-27 14:59:48 +00:00
Jordi Boggiano 507415e404 Make VersionSelector prefer stable by default and allow specifying a PHP version that must be matched, fixes #4318 2015-10-27 14:43:04 +00:00
Jeroen Seegers 279b5f0156 Drop irrelevant properties from composer_commit-ref.json 2015-10-27 14:20:45 +01:00
Jeroen Seegers f3dc31839f Refactor commit-ref validation
The require and require-dev arrays have been merged into one and no
longer user private methods/properties to collect warnings.
2015-10-27 13:59:29 +01:00
Jordi Boggiano 4f934d9282 Avoid sending install notifications in dry-run mode 2015-10-26 15:01:06 +00:00
Jordi Boggiano 3d9daea6a0 CS fixes 2015-10-25 15:19:15 +00:00
Boris Momčilović b05b52ff7e InstallationManager: notifyInstalls: append authorization header for repository 2015-10-24 00:58:34 +02:00
Jeroen Seegers 73e73c90fb Generate a warning when a commit reference is used
Closes #4485
2015-10-23 21:38:11 +02:00
Rob f85d965732 Merge pull request #4501 from tw2113/master
add spacing consistency around phpdoc attributes
2015-10-19 12:04:38 +02:00
Joel Wurtz 7f42fe4c10 Issue #4512 Set reference in path repository 2015-10-18 11:57:43 +02:00
npiderman ed23b1c4db Issue #2384 allow 'prefer-stable' and 'minimum-stability' to be set via composer config command 2015-10-17 10:58:53 -04:00
Jordi Boggiano a54f84f05f Merge pull request #4479 from MakiCode/feature#4397
Added --file flag: Feature#4397
2015-10-13 14:09:04 +01:00
Rob Bast 1c7016de45 remove dead code/class 2015-10-13 12:37:15 +02:00
Rob Bast 1bf03e9621 fixed various docblocks and class properties in solver 2015-10-13 12:27:48 +02:00
Rob Bast b523fc0b7b ran fixers 2015-10-13 11:35:51 +02:00
Michael Beckwith 459a48ad5b add spacing consistency around phpdoc attributes 2015-10-13 00:46:26 -05:00
MakiCode 1c0b9cd65f Removed test for non-string file name check 2015-10-12 10:20:45 -05:00
MakiCode fefc106ef6 Removed type check on ArchiveManager 2015-10-12 10:18:57 -05:00
MakiCode 22e93f110b Fixed indentation 2015-10-07 15:52:58 -05:00
MakiCode 7005d89847 Fixed bug 2015-10-07 12:44:23 -05:00
MakiCode 63ede6c9dd Fixed issues with PR 2015-10-07 12:42:19 -05:00
Rob 7a9eb02190 Merge pull request #4455 from samsaggace/config_archive
Enable command line configuration for archive-dir and archive-format
2015-10-07 12:05:33 +02:00
Nicolas Toniazzi b6df8549cd Merge remote-tracking branch 'parent/master'
Conflicts:
	src/Composer/Factory.php
2015-10-05 09:52:52 +02:00
MakiCode 0d00338bdb Added better messages and fixed bugs 2015-10-04 20:03:06 -05:00
MakiCode 906c1c2e66 Added check for filename in archive manager and added test 2015-10-04 19:53:07 -05:00
MakiCode 87b5af60a8 Almost finished adding --file option, need to add unit test 2015-10-02 09:09:09 -05:00
Rob edf14dab15 Merge pull request #4469 from Soullivaneuh/patch-1
PackageInterface[] on RepositoryInterface php doc
2015-10-01 22:12:34 +02:00
Jordi Boggiano 790a941cba Merge pull request #4470 from alcohol/fix-config-lookup
itteratively expand key and attempt to match
2015-10-01 14:48:22 +01:00
Rob Bast 7bd0c5abdd itteratively expand key and attempt to match
fixes #4459 (also)
2015-10-01 15:05:38 +02:00
Sullivan SENECHAL 4f4d236be3 PackageInterface[] on RepositoryInterface php doc 2015-10-01 14:54:45 +02:00
Jordi Boggiano 5ccaad92c1 Merge remote-tracking branch 'alcohol/weird-config-listing-issue' 2015-09-30 11:52:04 +01:00
Rob Bast 2dbad30336 fixes #4459 2015-09-29 20:57:26 +02:00
Sebastien Chemin 3896a6c263 Enable cmdline configuration for archive-dir and archive-format
Examples of commands :
composer config --global  archive-dir $HOME/.composer/repo
composer config --global  archive-format zip
2015-09-28 13:22:38 +02:00
Jordi Boggiano ce08582671 Fix CS 2015-09-28 10:53:24 +01:00
Jordi Boggiano c41079192f Merge pull request #4454 from alcohol/urlencode-urls-only
only urlencode $ if filename is not local
2015-09-28 10:38:16 +01:00
Rob Bast b219abe8f6 @seldaek damn your assignment in expression 2015-09-28 10:59:26 +02:00
Rob Bast e491b72a8c only urlencode $ if filename is not local 2015-09-28 10:39:36 +02:00
Rob Bast 1328d9c3b2 rename baseversionparser to semverversionparser
and fix docblock as per @stof request
2015-09-25 11:05:38 +02:00
Rob Bast 89717fa593 implement old linkconstraintinterface for BC 2015-09-25 10:59:56 +02:00
Rob Bast 0adcab7a19 compile phar with semver included 2015-09-24 16:49:10 +02:00
Rob Bast a1ad7fc435 fix classname clashing cause of existing class in current namespace 2015-09-24 16:48:46 +02:00
Rob Bast ddb1c1e052 these 2 use parseNameVersionPairs 2015-09-24 16:34:48 +02:00
Rob Bast a1427d7fd6 replace all occurences in code and comments 2015-09-24 16:32:36 +02:00
Rob Bast 1ccfc8eb96 add semver, deprecated existing classes 2015-09-24 16:28:28 +02:00
Dennis Birkholz 9febf55f76 Store url relative again, fix 4439 2015-09-23 17:51:41 +02:00
Gavin Staniforth c1e60a0abd Ensure the bin directory exists before checking empty
Line 130 has similar logic so avoided doing the check withiin `isDirEmpty()`
2015-09-23 13:46:35 +01:00
Jordi Boggiano 41a87a3ae7 Adjust file path output, refs #4379 2015-09-23 00:41:24 +01:00
Jordi Boggiano 9b61b808ec Merge remote-tracking branch 'javihgil/master' 2015-09-23 00:32:26 +01:00
Jordi Boggiano 80f1e4372a Remove empty bin dir after all binaries have been removed from it, fixes #3451 2015-09-22 23:54:43 +01:00
Jordi Boggiano 9f2e562e48 Add --strict flag to validate command to treat warnings as failures as well, refs #3202 2015-09-20 19:44:55 +01:00
Jordi Boggiano ae23979dfa Add validation warning for prs-0/4 definitions without namespace prefix, refs #3202 2015-09-20 19:29:53 +01:00
Jordi Boggiano e61b3a6370 Allow the validate command to validate dependencies with -A/--with-dependencies, refs #3202 2015-09-20 19:29:04 +01:00
Jordi Boggiano ed95448523 URL-encode dollar signs to work around bad proxy failures 2015-09-20 18:26:23 +01:00
Jordi Boggiano 1e8d7255b7 Fix access to undefined var, refs #4422 2015-09-20 17:39:00 +01:00
Jordi Boggiano 8f44f9cc67 Merge pull request #4422 from dennisbirkholz/wildcard-repositories
Enable wildcards in path names for path repositories
2015-09-20 16:41:02 +01:00
Jordi Boggiano 8913ac2fff Merge pull request #4362 from bd808/classmap-authoritative-cli
Add cli argument for classmap-authoritative
2015-09-20 16:00:21 +01:00
Dennis Birkholz 681e543793 Make check more obvious 2015-09-18 17:55:07 +02:00
Dennis Birkholz 6b1c9882dd Replace tracking variable with direct package count check 2015-09-18 17:26:31 +02:00
Jordi Boggiano 9e67bc761b Merge pull request #4131 from ammmze/artifact-follow-symlink
Follow symlinks when searching for artifacts
2015-09-18 15:32:06 +01:00
Jordi Boggiano 5736a59fe3 Merge pull request #4428 from webfactory/update-source-type-and-ref
Update source type and reference along with URLs
2015-09-18 15:02:05 +01:00
Matthias Pigulla 3c08318ea0 Add test 2015-09-18 15:31:54 +02:00
Dennis Birkholz 2fb7dd881a Fix missing trailing / in repository paths 2015-09-18 15:03:15 +02:00
Dennis Birkholz 3ef222c920 Make repository path absolute (again) 2015-09-18 15:01:06 +02:00
Dennis Birkholz 973491b65d Fix docblock, path names returned by glob() are not necessary absolute 2015-09-18 14:31:42 +02:00
Dennis Birkholz 19146d1cec Docblock fix as suggested by @alcohol 2015-09-18 14:26:01 +02:00
Jordi Boggiano f96ec35c1d Merge pull request #4423 from dennisbirkholz/minor-changes
Fix check for flag in case RELATIVE_PATHS should be changed somehow
2015-09-18 13:10:05 +01:00
Matthias Pigulla 2db52ebeba Also update source type and reference when changing URLs 2015-09-18 12:04:21 +02:00
Jordi Boggiano 0cbf679f21 Avoid failing to write the lock file if a lock file is present but corrupt/conflicted 2015-09-17 14:46:19 +01:00
Samuel ROZE f6d5d65bcd Use shortest relative paths for symlinks 2015-09-16 10:06:32 +01:00
Dennis Birkholz c06edd61e4 Fail if no repository was found 2015-09-15 18:28:17 +02:00
Dennis Birkholz e4435790a4 Documentation 2015-09-15 17:39:55 +02:00
Dennis Birkholz 1d7fa565e6 Fix check for flag in case RELATIVE_PATHS should be changed somehow 2015-09-15 17:33:31 +02:00
Dennis Birkholz 4209fd2e4a Store correct url for package, not original url containing wildcards. 2015-09-15 17:27:36 +02:00
Dennis Birkholz 323537ad0f Allow wildcards in repository path names. 2015-09-15 16:41:07 +02:00
Jordi Boggiano 7267b2ed90 Merge pull request #4418 from olvlvl/olvlvl-optimize-getio
Optimized this->getIO()
2015-09-14 15:48:45 +01:00
Samuel ROZE d0a9550dea Uses `realpath` to fix relative path issues 2015-09-14 15:20:06 +01:00
Olivier Laviale cc522c20bb Optimized this->getIO() 2015-09-14 14:30:26 +02:00
Samuel ROZE a3f5f60359 Update output to have a coherent one 2015-09-14 10:18:55 +01:00
Samuel ROZE 0e8c5fa62e Store path from composer.json with the `path` repository to ensure lock file to be reused 2015-09-14 10:18:46 +01:00
Jordi Boggiano 66acee7feb Add config.platform to the list of locked properties 2015-09-12 23:04:37 +01:00
Jordi Boggiano 74e56fd5c6 Merge remote-tracking branch 'szeber/master' 2015-09-12 22:53:27 +01:00
Jordi Boggiano 6508dc4322 Allow packages with only a dist ref to be force updated when the dist ref changes 2015-09-12 22:29:19 +01:00
Jordi Boggiano 89c6a68a76 Updates to path repository and path downloader, refs #4365 2015-09-12 22:28:03 +01:00
Jordi Boggiano 3a79313b63 Merge remote-tracking branch 'sroze/feature/path-repository' 2015-09-12 21:05:12 +01:00
Jordi Boggiano afd98b74f1 Fix handling of www.github.com in GitHubDriver, fixes composer/packagist#572 2015-08-31 10:58:50 +01:00
Grégoire Paris 9e30c9b403 use different exit codes for different errors 2015-08-30 00:30:16 +02:00
James Titcumb d85bad29d6 Warn about unpushed changes
`composer status` now prevents overwriting Git package if changes have not been pushed.
2015-08-30 00:30:16 +02:00
Javi Hernández dd7243fc01 Archive command shows created package path 2015-08-26 13:08:40 +02:00
Samuel ROZE 6c16153302 Added repository tests 2015-08-25 22:06:48 +01:00
Zsolt Szeberenyi 62630e5c69 Fix strict comparison of the content hash 2015-08-21 16:55:44 +12:00
Zsolt Szeberenyi bfb83f1fb7 Add name and version to the relevant fields, move content hash checking to the Locker 2015-08-21 16:54:28 +12:00
Bryan Davis 71cb587611 Add autoloader cli options to `require` and `remove`
Update the `composer require` and `composer remove` commands to support
the `--optimize-autoloader` and `--classmap-authoritative` cli options
and associated configuration settings. All cli entry points that invoke
`Installer::run()` or `AutoloadGenerator::dump()` now have consistent
support for these autoloader optimization flags.
2015-08-19 22:18:54 -06:00
Bryan Davis cc2b9cfca5 Add cli argument for classmap-authoritative
Add a `--classmap-authoritative (-a)` argument to `composer install`,
`composer update` and `composer dumpautoload`. This enables the same
authoritative classmap behavior as the existing `classmap-authoritative`
configuration setting. The option can be used for creating highly
optimized production autoloaders via `composer install --no-dev
--optimize-autoloader --classmap-authoritative` for projects where
multiple autoloaders are present and unnecessary `file_exists` calls
introduce performance issues.

Closes #4361
2015-08-19 22:18:54 -06:00
voroks e873438dbd Merge branch 'master' of github.com:composer/composer into 4254-remove-autoload_files.php-when-needed 2015-08-19 15:08:57 +08:00
voroks 154092ba1a Added removing file 'include_path.php' (if it is empty). 2015-08-19 15:08:27 +08:00
Samuel ROZE 4ab123291d Add missing licence in VersionGuesser 2015-08-18 15:10:59 +01:00
Samuel ROZE 623f31fcc4 Use version guesser to get local package version 2015-08-18 15:08:27 +01:00
Samuel ROZE 5261a5fa03 Move version guessing in `VersionGuesser` class 2015-08-18 14:58:18 +01:00
Samuel ROZE ead68d3d49 Create the path repository and downloader 2015-08-18 14:40:48 +01:00
voroks 457bc20c34 Explicit comparison was removed. 2015-08-18 16:10:59 +08:00
voroks cca42ff0be Fixed indents: we should use spaces instead tabulation. 2015-08-18 15:29:22 +08:00
Jordi Boggiano 9859859f10 Add comment, fixes #4145 2015-08-17 15:57:00 +01:00
DSanchez abfe54f334 Add missing PHPDoc
Conflicts:
	src/Composer/Installer.php
2015-08-17 15:55:09 +01:00
DSanchez 6ce9d2e152 Remove useless variable, method return void! 2015-08-17 15:52:30 +01:00
voroks 4fa1cb2e9c Removing file autoload_files.php was added (#4254) 2015-08-15 16:12:16 +08:00
Jordi Boggiano 3c5f3e6dc7 Warn if cache isnt writable as well 2015-08-14 13:30:42 +01:00
Rob Bast 61dc752c78 Warn if cache directory cannot be created
closes #1161
2015-08-14 14:21:12 +02:00
Rob Bast 593af4b1bf add license file during autoload dumping
closes #4288
2015-08-14 12:00:21 +02:00
Jordi Boggiano a979cc78ed Suppress warnings on touch() failures of the vendor dir, refs #4070 2015-08-11 11:20:39 +01:00
Jordi Boggiano cedbe7f1a0 Bump vcs verbosity output to very verbose, refs #4330 2015-08-10 12:58:58 +01:00
Jordi Boggiano 0457ec6fb3 Remove deadcode, fixes #4345, fixes #4268 2015-08-10 12:42:51 +01:00
Jordi Boggiano 812523f1ab Add more debug info on cache write failure, refs #4249 2015-08-10 10:07:48 +01:00
Jordi Boggiano 65bb8d99f4 Fix global switch regression on config command, fixes #4344 2015-08-10 08:35:31 +01:00
Jordi Boggiano 5a26b7c102 Merge pull request #4299 from webberwu/master
show change if package directory have changed to symbolic link
2015-08-10 01:17:02 +01:00
Jordi Boggiano 4824b4504e Remove typo 2015-08-10 01:05:32 +01:00
Jordi Boggiano 33badac0a8 Include full error message in debug mode 2015-08-10 00:57:13 +01:00
Jordi Boggiano b16c5fbeb9 Shorten ternary and reuse config file instead of the null argument to figure out path to auth.json 2015-08-10 00:56:55 +01:00
Jordi Boggiano cdeb7621ba Merge remote-tracking branch 'Tehem/issue-4302' 2015-08-10 00:52:39 +01:00
Jordi Boggiano a782dab2cd Merge remote-tracking branch 'iamluc/git-diff' 2015-08-09 23:26:55 +01:00
Jordi Boggiano bd23ce672a Merge pull request #4324 from MalteWunsch/getCanonicalPackages-with-different-versions
Improve documentation for WritableRepositoryInterface::getCanonicalPackages
2015-08-09 17:36:21 +01:00
iamluc d02ab54be1 Add a new option to view local modifications (git diff) 2015-08-09 17:30:32 +02:00
Nicolas Grekas fbae6b1589 Revert "Merge pull request #3975 from marc-mabe/hotfix/3974"
This reverts commit bdb6ecb29e, reversing
changes made to 8a12e50a16.
2015-08-04 10:34:54 +02:00
Malte Wunsch 70ff00c9de Reverted inadvertent API change, improved API documentation 2015-08-04 09:32:23 +02:00
Tehem 9e592f19a1 Used shorthand version for ternary operator 2015-08-03 23:36:05 +02:00
Malte Wunsch 767279b41a getCanonicalPackages returns packages with same name in different versions 2015-08-03 18:28:04 +02:00
Thomas Marcon b35e762354 Updated configFile parsing to first look into -f parameter, then COMPOSER environment variable, then default to composer.json 2015-07-31 12:01:49 +02:00
Rob Bast 51ef7b5eef instead of generic be more verbose about possible causes 2015-07-31 10:01:58 +02:00
Rob Bast 77f1d5945f make sure php version errors are less misleading
* determine conflicting version in problem using pool package
* hide version in rule to keep it generic rather than possibly misleading

fixes #4319
2015-07-31 09:58:34 +02:00
Tehem 9392adef79 Fixes #4302 allow COMPOSER env with config statements (overrides --file) 2015-07-28 00:01:01 +02:00
Webber Wu 92530e374b Merge remote-tracking branch 'upstream/master' 2015-07-26 12:33:39 +08:00
Kocsis Máté 87c16073ec Merge branch 'master' of https://github.com/composer/composer into feature-bin-compat 2015-07-22 15:54:20 +02:00
Nicolas Toniazzi e8a6cb536b Change detection of config/cache/data dirs 2015-07-22 10:38:12 +02:00
Jordi Boggiano 00c26791fa Merge pull request #4264 from alcohol/use-composer-spdx
remove spdx files, introduce external library
2015-07-20 18:29:14 +01:00
Jordi Boggiano bbf959ac34 Do not retry failures once degraded mode is already enabled 2015-07-20 17:44:03 +01:00
Jordi Boggiano ff84b32097 Add degraded mode to try and bypass ipv6/gzip issues, refs #4142, refs #4121 2015-07-20 17:33:53 +01:00
Rob Bast 2553f5f7d4 throw error when file is loaded 2015-07-20 12:10:30 +02:00
Rob Bast 56f0d82207 get resources dir from spdxlicenses 2015-07-20 11:42:20 +02:00
Rob Bast 616585e0cc spdxlicense extends spdxlicenses, add depr error 2015-07-16 13:21:18 +02:00
Rob Bast 1f006a499e updated compiler class to include spdx sources 2015-07-16 12:03:34 +02:00
Rob Bast 5ae9e7fe22 remove spdx files, introduce external library 2015-07-16 11:42:12 +02:00
Jordi Boggiano 92faf1c7a8 Merge pull request #4228 from naderman/memory-version-constraint
Remove unnecessary version comparison cache variable and store operator as int
2015-07-14 13:37:15 +01:00
Jordi Boggiano 7e0db8aa46 Merge pull request #4239 from naderman/memory-rules
Reduce memory usage of Rule objects
2015-07-14 13:34:24 +01:00
Nils Adermann cf1af58514 Use bitwise operators directly in rules instead of get/set Bitfield 2015-07-14 14:24:18 +02:00
Nils Adermann ccaba0d2f7 Make static translation tables in version constraint private and use === 2015-07-14 14:12:19 +02:00
Jordi Boggiano c36d2a2e50 Merge pull request #4214 from legoktm/parse-links
Move VersionParser::parseLinks() to ArrayLoader::parseLinks()
2015-07-13 14:28:10 +01:00
Jordi Boggiano 42bfe9c56a Merge pull request #4219 from localheinz/feature/strict-mode
Enhancement: Also validate if lock file is up to date
2015-07-12 16:39:36 +01:00
Jordi Boggiano acc11f63c5 Merge pull request #4234 from naderman/rule-hash-int-size
Reduce rule hash size
2015-07-12 16:25:14 +01:00
Jordi Boggiano efb9f13248 Merge pull request #4229 from naderman/memory-version-array-merge
VersionParser: remove a few hundred/thousand array_merge calls
2015-07-12 16:14:16 +01:00
Andreas Möller 5828f6202d Enhancement: Also validate lock file 2015-07-10 18:07:40 -04:00
Nils Adermann de65199f31 Merge pull request #4117 from stof/patch-1
Optimize the regex detecting timestamps
2015-07-09 21:17:24 +02:00
Nils Adermann 956035e641 Remove the unnecessary return statements from setters 2015-07-09 19:40:03 +02:00
Nils Adermann f535542fca Use constants with names for bitfield offsets 2015-07-09 18:59:16 +02:00
Nils Adermann 329ab5cf41 Rename blob rule property to bitfield 2015-07-09 18:48:50 +02:00
Nils Adermann 961ea868ac Use an integer bitfield for rule properties instead of a string binary blob 2015-07-09 18:26:31 +02:00
Nils Adermann 6e81f63635 Reduce memory footprint of rules by storing data in blob
Not declaring the job property saves significant amounts of memory as
most rules leave it as null
2015-07-09 17:23:45 +02:00
Nils Adermann 3fd4672382 VersionParser: Append elements directly instead of array_merge 2015-07-09 12:57:34 +02:00
Nils Adermann c7e1f49e78 Rule hashes are only used in the rule set, so no need to store them 2015-07-08 19:11:59 +02:00
Nils Adermann 15d572da4c Use 4 byte integer from raw md5 instead of 5 hex representation chars
The hash is necessary as comparisons are significantly too slow
otherwise. The old hash function used substr on the hexadecimal
representation of the md5 hash, rather than the raw binary output. This
wastes a significant amount of memory, as each byte can only be used to
store up to 4 bit of information. The new hash has 32bit instead of
20bit and uses only a 4 byte integer instead of a 5 byte string.
2015-07-08 19:11:58 +02:00
Nils Adermann 5b1b96b61e Output the number of rules used in the solver for profiling purposes 2015-07-08 17:57:23 +02:00
Nils Adermann e88df7429f Remove a few hundred/thousand array_merge calls 2015-07-08 13:36:19 +02:00
Nils Adermann 8dd110e0a9 Remove unnecessary version comparison cache variable and store operators as int 2015-07-08 13:13:47 +02:00
Nils Adermann 07e1d227c9 Output the size of the pool after dependency resolution for users 2015-07-07 15:40:26 +02:00
Nils Adermann 22737e31a7 Merge pull request #4213 from legoktm/stabilities
Don't use BasePackage::$stabilities in VersionParser
2015-07-07 13:45:55 +02:00
Jordi Boggiano a8d71be0ef Add event name in verbose mode, refs #4123 2015-07-04 12:15:04 +01:00
Jordi Boggiano 852e4f4e26 Merge remote-tracking branch 'alcohol/output-script-command-in-verbose-mode' 2015-07-04 12:11:18 +01:00
Jordi Boggiano 0964c02acb Use only one level of verbosity 2015-07-04 12:02:57 +01:00
Jordi Boggiano 5ba41514a9 Merge remote-tracking branch 'alcohol/add-suggests-command' 2015-07-04 11:58:58 +01:00
Kunal Mehta 14d1f0f3f6 Move VersionParser::parseLinks() to ArrayLoader::parseLinks()
Working towards #3545.

parseLinks is a wrapper around VersionParser::parseConstraints() that
creates Link objects, and better belongs in ArrayLoader.
2015-07-03 19:35:54 -07:00
Kunal Mehta 0ad9e98a59 Don't use BasePackage::$stabilities in VersionParser
Working towards #3545.

This adds VersionParser::$stabilities, which is an array of the
supported stability levels. This adds a little bit of duplication,
however we were already hardcoding the various stabilities in regular
expressions and functions like parseStability().
2015-07-03 17:54:30 -07:00
Jordi Boggiano 2438105e11 Merge pull request #4086 from legoktm/format-version
Move VersionParser::formatVersion() to BasePackage::getFullPrettyVersion()
2015-07-04 00:55:50 +01:00
Jordi Boggiano e2b2f450dc Merge pull request #4144 from staabm/patch-2
Dropped unnecessary break statements
2015-07-03 21:49:05 +01:00
Jordi Boggiano 9b3e8b963e Merge pull request #4143 from staabm/patch-1
Dropped obsolete condition
2015-07-03 21:48:39 +01:00
Jordi Boggiano 01a9c3a0ce Merge pull request #4208 from alcohol/update-spdx-updater
Updated SPDX related files in light of 2.0 release of SPDX specification
2015-07-03 11:54:16 +01:00
Rob Bast 4019f7bb44 Revert "apply a regex solution instead of tokenizer"
This reverts commit 33a7305e22c8d4e2ce38586855fd3d4b7b2af3dd.
2015-07-03 12:22:16 +02:00
Rob Bast b5d286e27b apply a regex solution instead of tokenizer 2015-07-03 12:22:16 +02:00
Rob Bast e4118385a0 updated spdx related files 2015-07-03 12:22:16 +02:00
Kunal Mehta c5afb8f23a Mark VersionParser::formatVersion() as deprecated
With 1753c275ff, this will be handled nicely.
2015-07-02 00:07:04 -07:00
Kunal Mehta f634c6946d Update callers of VersionParser::formatVersion()
Tests were moved to BasePackageTest.
2015-07-02 00:06:56 -07:00
Kunal Mehta 99dab8aebd Move VersionParser::formatVersion() to BasePackage::getFullPrettyVersion()
Working towards #3545.

formatVersion() does not belong in VersionParser since it depends upon a
Package object, and is creating a more complete pretty formatted
version, not parsing anything.

The new getFullPrettyVersion() method can be seen as an extension to
getPrettyVersion(), and is located in BasePackage as a result.

Callers to VersionParser::formatVersion() were not updated in this
commit to demonstrate that no functionality was changed in this
refactor. They will be updated in a follow up commit.
2015-07-01 23:54:08 -07:00
Jordi Boggiano 8775c94895 Merge pull request #4196 from localheinz/fix/namespace
Fix: Import Symfony\Component\Finder\Finder
2015-07-01 10:29:53 +01:00
Andreas Möller 962f5a99ea Fix: Import Symfony\Component\Finder\Finder 2015-06-30 21:03:59 -04:00
Jonathan Eskew 42b025776a Move file identifier calculation to compile time 2015-06-30 09:22:51 -07:00
Jordi Boggiano 79f9158fb2 Merge pull request #4192 from localheinz/fix/import
Fix: Add missing imports
2015-06-30 15:38:46 +01:00
Jordi Boggiano 6a64041055 CS fixes 2015-06-30 15:38:32 +01:00
Jordi Boggiano 4d36622ada Merge pull request #4191 from localheinz/fix/docblock
Fix: Docblock
2015-06-30 15:25:49 +01:00
Jordi Boggiano 70f5150893 Merge pull request #4190 from localheinz/fix/unused-private-property
Fix: Remove unused private property
2015-06-30 15:14:03 +01:00
Jordi Boggiano 4307031e9b Merge pull request #4189 from localheinz/fix/unused-imports
Fix: Remove unused imports
2015-06-30 15:13:46 +01:00
Jordi Boggiano a8e004c7e7 Merge pull request #4199 from sminnee/version-comparison-docs
>=2.3.0 now includes pre-releases, added docs for this and -stable suffix Fixes #4080.
2015-06-30 14:32:20 +01:00
Jordi Boggiano b17ccbfa0d Avoid invalid warnings when scanning the same file twice, fixes #4195, fixes #4197 2015-06-30 13:27:28 +01:00
Sam Minnee 2cd698874f Include pre-releases in >=2.3.0 comparison. Fixes #4080.
This is a change to the >=2.3.0 comparison. Without this change, such a
comparison will exclude pre-release versions.

The rationale is that this makes the comparison more consistent with
<2.3.0 (which excludes all pre-releases) and ~2.3.0 (which includes
pre-releases).
2015-06-30 13:10:20 +01:00
Rob Bast 0298cdc60d change delimiter to curly braces 2015-06-30 13:52:47 +02:00
Andreas Möller 12ffe2b4d4 Fix: Add missing imports 2015-06-28 23:37:40 -04:00
Andreas Möller e184118d76 Fix: Docblock 2015-06-28 23:28:45 -04:00
Andreas Möller 3854d2d457 Fix: Remove unused private property 2015-06-28 23:25:55 -04:00
Andreas Möller eac5fbdee4 Fix: Remove unused imports 2015-06-28 23:20:54 -04:00
Jonathan Eskew 24c4322672 Use 5.3 compatible array syntax 2015-06-28 13:47:00 -07:00
Jonathan Eskew 868a872df2 Push the hash to $GLOBALS 2015-06-28 13:44:43 -07:00
Jonathan Eskew 61ed7a9547 Explicitly check if a file has already been required before requiring it 2015-06-27 14:05:59 -07:00
Jordi Boggiano 943107cfe7 Load most specific namespaces always, and dependents before dependencies when building classmaps
This also adds notifications of duplicate classes
2015-06-26 14:40:26 +01:00
Rob Bast 3dffdc8705 don't suggest packages already installed 2015-06-24 11:06:21 +02:00
Rob Bast fd34c5883a added php script handler info as well 2015-06-24 09:21:36 +02:00
Rob Bast 680082c5fe output based purely on verbosity 2015-06-23 22:46:16 +02:00
Rob Bast 33f78b2ccc limit suggestions to optional list of packages 2015-06-23 22:46:16 +02:00
Rob Bast 760eeb0b03 reworked suggests command 2015-06-23 22:46:16 +02:00
Gusakov Nikita f1af16984e [Command] Add suggests command 2015-06-23 21:04:20 +02:00
Nicolas Toniazzi 7d63eb5718 Merge remote-tracking branch 'parent/master'
Conflicts:
	doc/04-schema.md
2015-06-23 14:19:12 +02:00
Jordi Boggiano d0ff01698d Fix outdated comment 2015-06-20 12:58:19 +01:00
Jordi Boggiano d5bdf4be28 Update URLs for bitbucket as well 2015-06-19 23:23:48 +01:00
Jordi Boggiano ee1e2c6f15 Merge pull request #4167 from wimvds/fix-bitbucket-references
download correct Bitbucket archive reference when using --prefer-dist
2015-06-19 18:54:18 +01:00
Wim Vandersmissen 1ff2a02517 fix to download correct Bitbucket archive reference when using --prefer-dist 2015-06-19 15:07:16 +02:00
Jordi Boggiano e727ed4d73 --keep-vcs should only imply prefer source for the root package in create-project, refs #4063 2015-06-19 12:59:57 +01:00
Jordi Boggiano a943827371 Show that no version was found in composer show/license if root package is auto-versioned, fixes #4158 2015-06-18 23:47:17 +01:00
Jordi Boggiano c8eca6f198 Remove pool usage from ArchiveCommand 2015-06-18 17:45:37 +01:00
Jordi Boggiano 801a7fcd0a Add support for constraints and not just exact versions in RepositoryInterface::findPackage/s 2015-06-18 17:44:58 +01:00
Jordi Boggiano 049f84f21f Remove unnecessary Pool usage in HomeCommand 2015-06-18 16:33:30 +01:00
Nils Adermann 75c501251d Revert "Merge remote-tracking branch 'naderman/load-no-providers'"
This reverts commit 3e85f82373, reversing
changes made to b025d0982b.
2015-06-18 15:40:27 +02:00
Jordi Boggiano 74e7c5fe22 Merge remote-tracking branch 'legoktm/publish-name' 2015-06-18 11:40:48 +01:00
Jordi Boggiano 3e85f82373 Merge remote-tracking branch 'naderman/load-no-providers' 2015-06-18 11:32:37 +01:00
Jordi Boggiano b025d0982b Remove some state 2015-06-18 11:12:57 +01:00
Thibault Jamet 25ab752ca6 Map archive command to the archive configuration 2015-06-17 20:53:09 +02:00
Thibault Jamet 1eec4fdfa5 Add archive configuration default values 2015-06-17 20:53:09 +02:00
Jordi Boggiano e73448ae1e Add possessive quantifiers to avoid backtracking and fix segfault on large files, fixes #4153 2015-06-16 11:22:45 +01:00
Zsolt Szeberenyi 9b50ca0161 Add the extra attribute to the content hash 2015-06-15 11:31:33 +02:00
Jordi Boggiano 8e9659bd83 Merge pull request #4139 from elazar/feature/tests-in-classmap
Resolves #4138: Removed *Test.php filtering from AutoloadGenerator->dump()
2015-06-14 10:10:46 +01:00
Markus Staab 94a924b702 Dropped unnecessary break statements
Next line breaks nevertheless
2015-06-14 10:16:45 +02:00
Markus Staab a4ad3c2146 Dropped obsolete condition
The conditional a few lines above already checks for `bytesMax > 0`
2015-06-14 10:13:18 +02:00
Zsolt Szeberenyi 3e0219c438 Change the content hash to be only based on values that affect dependency resolution 2015-06-13 10:15:56 +02:00
Zsolt Szeberenyi 50b560fe4c Add the hash of the parsed content of the composer.json to the lock file, and use it to verify the json is not changed 2015-06-12 22:24:31 +02:00
Jordi Boggiano 89540c5690 Support bg colors and more clearing values in html output formatter 2015-06-12 17:23:18 +01:00
Jordi Boggiano 29dbc3835f Fix html output formatter to work with latest symfony console 2015-06-12 17:10:19 +01:00
elazar 6c029a850c Resolves #4138: Removed *Test.php filtering from AutoloadGenerator->dump() 2015-06-12 10:52:55 -05:00
Jordi Boggiano 6d15ad08b6 Add http check even if openssl is present, refs #4084 2015-06-11 19:20:09 +01:00
Jordi Boggiano 24168d9d5c Merge pull request #4133 from benbor/added-ctrl-c
Added Ctrl+C support to create-project command for unix-like systems
2015-06-11 18:32:31 +01:00
Barys Biankouski a59c46f781 [create-project] If process terminated with SIGINT then 130 IMO will be returned. Remove unused variable 2015-06-11 19:50:52 +03:00
Jordi Boggiano c471edc488 Also downgrade provider access and others 2015-06-11 11:22:19 +01:00