1
0
Fork 0
Commit Graph

4332 Commits (608770856e206e7d0c72689df8751e68431c0183)

Author SHA1 Message Date
Niels Keurentjes 017a9af672 Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-07 14:45:15 +01:00
Niels Keurentjes 80bf5b75fc Merge branch 'master' of https://github.com/composer/composer into pull-4431 2016-02-07 14:44:36 +01:00
Jordi Boggiano 9a57de574d Merge pull request #4886 from curry684/issue-4885
Ensure exception is thrown when classmaps are requested for corrupted files
2016-02-06 15:53:14 +00:00
Jordi Boggiano 7e17fec3b8 Merge pull request #2585 from jaypea/ziparchiver
added ZipArchiver to actually compress zip files
2016-02-06 15:49:24 +00:00
Niels Keurentjes 0b55a0ca91 Can't use error_clear_last as it was introduced in PHP7. 2016-02-06 02:58:36 +01:00
Niels Keurentjes 6a53b1df42 Further reorganized messy checking code. 2016-02-06 02:40:16 +01:00
Niels Keurentjes bb08f76ad9 Use error_get_last to verify why php_strip_whitespace would return an empty string. 2016-02-06 02:32:08 +01:00
Davey Shafik 43551bc537 Add `composer exec` command 2016-02-05 20:22:54 -05:00
Niels Keurentjes 86fc85fe56 Add a comment explaining the use of @ instead of Silencer in this specific situation. 2016-02-06 02:04:48 +01:00
Niels Keurentjes c2d9960898 Ensure exception is thrown when classmaps are requested for corrupted or binary files. Refs #4885 2016-02-06 02:00:54 +01:00
Jordi Boggiano 101fca9071 Merge pull request #4837 from cs278/openssl-version-warning
Warning if OpenSSL does not support TLSv1.2
2016-02-05 22:46:05 +00:00
Rob Bast baabc612f6 adjust message, skip test
currently we have no way to put dynamic values or wildcards in EXPECT-OUTPUT
2016-02-05 13:21:30 +01:00
Rob Bast 94daeca57b add test and adjust rule error message 2016-02-05 11:59:05 +01:00
Niels Keurentjes 54c079b559 Fixed Windows detection based on #4873 and suppressed some console output in removeJunction. 2016-02-05 11:27:41 +01:00
Niels Keurentjes 582e4796a3 Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-05 11:24:30 +01:00
bogdan e0fad1f55b Implemented interactive user confirmation on source package update failure
Removed unnecessary options for installation
Removed unnecessary exception
2016-02-04 23:01:21 +02:00
Jordi Boggiano 79ac2cac82 Merge pull request #4817 from alcohol/repro-4795
Bug #4795
2016-02-04 12:40:23 +00:00
Jordi Boggiano 2e1cdccac0 Merge pull request #4875 from cs278/openssl-platform-version
Handle OpenSSL's many patch releases
2016-02-04 11:43:55 +00:00
Rob Bast be5719eb53 Merge remote-tracking branch 'upstream/master' into repro-4795
* upstream/master: (98 commits)
  Fallback to zlib extension to unpack gzip on non Windows systems
  Zip extension does not provide zlib support
  Unified all Windows tests throughout the code.
  Added Platform utility and unit test for it.
  Remove warnings for non-writable dirs, refs #3588
  [doc] add -H flag to sudo commands
  use full json content to determine reference, closes #4859
  typos
  Make sure COMPOSER_AUTH is also loaded in Config, refs #4546
  Use proper defaults for IO authentications
  Add verbosity input support to IOInterface
  Update SolverTest.php
  Update broken-deps-do-not-replace.test
  Update SolverProblemsException.php
  Cleaned up check+conversion that was no longer required.
  Cleaner notation for expected exceptions in fixtures.
  Introduced more generic, less invasive way to test for exceptions in fixtures, more in line with how phpunit works.
  Included unit test for circular root dependencies.
  Expanded InstallerTest to support expecting Exceptions by supplying "EXCEPTION" as "--EXPECT--"
  Clarified error message and added braces.
  ...
2016-02-04 12:43:37 +01:00
Jordi Boggiano 16215c1937 Merge pull request #4877 from cs278/zip-zlib-muddle
zlib suggest and fallback on non Windows
2016-02-04 11:15:49 +00:00
Jordi Boggiano 57e33fcad7 Merge pull request #4873 from curry684/platform-tests
Windows platform tests unified
2016-02-04 11:12:36 +00:00
Jordi Boggiano 644aa517d5 Merge pull request #4863 from alcohol/issues-4859
bugfix for issue #4859 - path repo does not update when composer.json is adjusted
2016-02-04 10:58:59 +00:00
bogdan 581ce91f90 Implemented new option (ignore-missing-metadata) for composer install command
The command allows to slightly change how repository updates are handled during install

In the previous version composer failed to updated if .git|.svn|.hg folder was missing from the package
In the current version, with the option enabled, if the update fails for exactly this reason,
it'll try to remove the package completely and install it from remote
2016-02-04 03:16:39 +02:00
bogdan a77e2fb093 Removed code duplication with abstract hasMetadataRepository method
which checks if vcs metadata is present in the package

Fixed a bug with -vvv mode. When .git folder is missing from package
in normal mode, -v mode, -vv mode the program throws the exception about missing .git folder
in -vvv mode an exception about inability to read logs
2016-02-04 03:11:18 +02:00
Chris Smith e4877473cf Fallback to zlib extension to unpack gzip on non Windows systems 2016-02-04 00:49:56 +00:00
Chris Smith 0818a6ed54 Previous attempt would cause 0.9.8aa == 0.9.8b 2016-02-04 00:28:42 +00:00
Chris Smith f6f273c4b6 Improve OpenSSL library description 2016-02-04 00:28:42 +00:00
Chris Smith e9e2514b5e Handle OpenSSL version after 26 patch releases
e.g. https://github.com/openssl/openssl/blob/OpenSSL_0_9_8zh/crypto/opensslv.h#L33
2016-02-04 00:28:42 +00:00
Niels Keurentjes 0dab63e050 Unified all Windows tests throughout the code. 2016-02-03 22:39:16 +01:00
Niels Keurentjes f2a2b18367 Added Platform utility and unit test for it. 2016-02-03 22:25:43 +01:00
Jordi Boggiano 8771eca527 Merge remote-tracking branch 'curry684/issue-4767' 2016-02-03 17:00:30 +00:00
Jordi Boggiano d93f7b8a10 Remove warnings for non-writable dirs, refs #3588 2016-02-03 14:57:32 +00:00
Rob Bast 47aa87ea97 use full json content to determine reference, closes #4859 2016-02-03 13:25:10 +01:00
Niels Keurentjes b20cc22ebb Improved output of SuggestsCommand by correctly filtering installed platform requirements if suggested. 2016-02-03 00:14:16 +01:00
Niels Keurentjes b71c67239d Made NTFS junction detection more reliable and added unit tests for the junction functions. 2016-02-02 23:44:01 +01:00
Niels Keurentjes 1b1462317c Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-02 22:51:22 +01:00
Rob Bast 0e584aa980 resolve issue 2016-02-02 10:45:57 +01:00
Niels Keurentjes 05caf8349c Fixed bug potentially causing broken sites and solved #4431 along the way. 2016-01-30 01:13:37 +01:00
Alexander Stehlik 298e7a218a Trigger event in validate command
This allows plugins to run additional validations.
2016-01-29 17:33:16 +01:00
Bilal Amarni cc75946ef2 typos 2016-01-29 17:13:44 +01:00
Jordi Boggiano 7c3e621102 Make sure COMPOSER_AUTH is also loaded in Config, refs #4546 2016-01-29 12:58:17 +00:00
Jordi Boggiano 2617ec5d28 Use proper defaults for IO authentications 2016-01-29 12:51:23 +00:00
Jordi Boggiano 49d7d65933 Add verbosity input support to IOInterface 2016-01-29 10:14:12 +00:00
Niels Keurentjes 1b97d07bca Processed PR feedback 2016-01-29 10:12:32 +01:00
Jefferson Carpenter 8d57c3e743 Update SolverProblemsException.php 2016-01-28 19:56:25 -06:00
Niels Keurentjes d6589ac151 Rewrote SuggestsCommand 2016-01-28 23:01:04 +01:00
Niels Keurentjes 358cb3f4fc Fixed exception text and some warnings. 2016-01-28 01:06:05 +01:00
Niels Keurentjes 5489586436 Fully implemented junctioning on Windows for path repositories. 2016-01-28 00:56:02 +01:00
Niels Keurentjes e515eb84e9 Add NTFS junction support to Util\Filesystem. 2016-01-28 00:33:11 +01:00
Remi Collet 3a750193fd skip diag. which are only for phar mode 2016-01-27 16:43:12 +01:00
Chris Smith 0a25bb0bf3 Simplify for PHP 5.3 2016-01-27 08:57:28 +00:00
Niels Keurentjes 7b6ccde97a Clarified error message and added braces. 2016-01-27 09:09:29 +01:00
Niels Keurentjes b1de2c52a3 Add --no-plugins option to remove/require 2016-01-27 00:48:17 +01:00
Niels Keurentjes a48159b283 Bail out if root package attempts to include itself. 2016-01-26 23:39:39 +01:00
Chris Smith 3979abc638 Add warning if OpenSSL does not support TLSv1.2 or TLSv1.1 2016-01-26 22:05:35 +00:00
Jordi Boggiano 593b88e414 Let users configure *any auth* via COMPOSER_AUTH and add it to the docs, refs #4546 2016-01-26 19:09:57 +00:00
Jordi Boggiano e513f27674 Merge remote-tracking branch 'firoxer/envvar_auth' 2016-01-26 18:59:55 +00:00
Jordi Boggiano ae14e0f086 Add ssh2 protocol default ports, fixes #4835 2016-01-26 16:53:41 +00:00
appchecker 13b50799d1 fix: missing parentheses 2016-01-26 18:19:58 +03:00
Jordi Boggiano 618e7f98b2 Force base error reporting level to include everything 2016-01-26 15:05:57 +00:00
Jordi Boggiano 4e00635298 Fix error handling support, fixes #4833 2016-01-26 15:04:13 +00:00
Rob Bast f829a160fb use a proper tmp directory
this test failed on OSX before, trying to create a directory at the root of the filesystem
2016-01-26 14:32:04 +01:00
Jordi Boggiano 1818b95149 CS fixes 2016-01-26 13:07:18 +00:00
Jordi Boggiano 5c944d45ac Merge pull request #4827 from curry684/issue-4203
Added more graceful warning suppression utility
2016-01-26 12:31:18 +00:00
Niels Keurentjes c2e768b8ad Made Silencer invocations safer against exceptions. 2016-01-26 13:27:24 +01:00
Jordi Boggiano 5672f67475 Merge pull request #4829 from curry684/issue-4726
Globbing while resolving path repositories now normalizes to slashes
2016-01-26 12:18:47 +00:00
Jordi Boggiano fff5074bbf Fix additionalOptions getting dropped when SAN and redirect handling are combined, refs #4782 2016-01-26 10:44:06 +00:00
Jordi Boggiano 03e0d65f37 Allow stream wrapper usage in config dirs, fixes #4788 2016-01-25 23:40:16 +00:00
Niels Keurentjes 84fed02df1 Globbing while resolving path repositories now normalizes to slashes for predictable cross-platform behaviour. Fixes #4726 2016-01-26 00:33:47 +01:00
Niels Keurentjes 76c1645a0e Merge remote-tracking branch 'upstream/master' into issue-4203 2016-01-25 23:38:13 +01:00
Niels Keurentjes 18cd4f966b Added silencer utility to more gracefully handle error suppression without hiding errors or worse. Fixes #4203, #4683 2016-01-25 23:37:54 +01:00
Jordi Boggiano e0ff9598c3 Tweak wording a bit, refs #3177 2016-01-25 22:24:34 +00:00
Jordi Boggiano 4d9bab4b86 Merge remote-tracking branch 'singles/missing-extension-ini-hint' 2016-01-25 22:22:41 +00:00
Jordi Boggiano c5cb2327cf Merge remote-tracking branch 'bamarni/config-repo-options' 2016-01-25 21:28:22 +00:00
Jordi Boggiano 5b41eaad3a Bundle pubkeys and fail hard if validation can not happen 2016-01-25 19:43:48 +00:00
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