1
0
Fork 0
Commit Graph

4236 Commits (3942cdf8df0867d7df5706b8a3ee05f601c2aa8c)

Author SHA1 Message Date
David Barratt 93b246e681 Use single quotes insted of double and fix typo 2016-02-22 22:05:24 -05:00
Sash 582e361a88 Fixing array accessing 2016-02-22 21:47:33 +00:00
Sash f6899e5c38 #4828 Using version guesser to pull out the commit has for git repositories. The return value is now an array with version and commit values. 2016-02-22 21:19:01 +00:00
Peter Buri 861b2bc8e8 Introduce option to force copy instead of symlinking in PathDownloader 2016-02-22 13:41:28 +01:00
David Barratt 63cb357a6e Clean up coding standards 2016-02-21 12:18:03 -05:00
David Barratt 28599b22f6 Add the --root-require option to the update command 2016-02-21 12:14:11 -05:00
Peter Michaux 32eb156153 add example showing alternate syntax for specifying version 2016-02-20 11:26:06 -08:00
Niels Keurentjes 22a6f6c612 phpdoc consistency. 2016-02-20 13:33:24 +01:00
Niels Keurentjes 75bb0d9b10 Implemented Prohibits and Depends correctly now. 2016-02-20 01:39:24 +01:00
Niels Keurentjes 692a3ed300 Renamed Composer\Console\Command to BaseCommand for consistency with other abstract base classes. 2016-02-19 23:56:46 +01:00
Niels Keurentjes 5c98421ae8 Introduce BaseRepository common ancestor class for all repositories to offload command logic. 2016-02-19 23:47:33 +01:00
Jordi Boggiano 8a2d1a2ee2 Make artifact paths in lock file cross-platform, fixes #3832 2016-02-19 16:25:53 +00:00
Niels Keurentjes 9bc2ee02e4 Process feedback, code cleanup. 2016-02-18 22:26:44 +01:00
Rob 9e623f50e7 Merge pull request #4894 from stloyd/patch-2
Be sure that configuration file can be manipulated by actual user
2016-02-18 10:56:21 +01:00
Jordi Boggiano e3fabf5844 Merge pull request #4930 from fervo/double-url-regression
Regression when Git package has two or more URLs and only the last one works.
2016-02-17 16:53:01 +00:00
Magnus Nordlander 4689d836fe Fixed (and added a test for) a regression introduced in a77e2fb, which causes package Git package updates to fail when the package has two or more URLs and the last URL is the only one that actually works. 2016-02-17 17:42:48 +01:00
Jordi Boggiano 1716a346e6 Add mbstring/iconv check, fixes #4929 2016-02-17 15:43:53 +00:00
Jordi Boggiano 93501a5e3f Merge pull request #4920 from curry684/issue-4918
Add a --timeout parameter to run-script to override default timeout
2016-02-16 13:33:00 +00:00
Jordi Boggiano aea6045668 Merge pull request #4921 from curry684/bc-cleanup
BC cleanup
2016-02-16 13:12:50 +00:00
Niels Keurentjes 254453f5b5 Wrap final attempt to touch a cache file in Silencer. 2016-02-16 14:01:21 +01:00
Niels Keurentjes ebfceefca6 Removed long deprecated functions that were no longer referenced anywhere. 2016-02-15 22:00:54 +01:00
Niels Keurentjes 4fe063b2e5 Added missing deprecation warning in create-project. 2016-02-15 21:38:31 +01:00
Niels Keurentjes 72a3563f1e Removed some 3 year old backward compatibility code. 2016-02-15 21:37:19 +01:00
Niels Keurentjes 126e71a991 Adds a --timeout parameter to run-script to override default timeout. 2016-02-15 20:47:43 +01:00
Niels Keurentjes 86374034b6 Removed unnecessary state from Depends command. 2016-02-15 12:48:33 +01:00
Niels Keurentjes 9b41495353 Options added and cleaned up. 2016-02-15 01:08:24 +01:00
Niels Keurentjes e38fe67333 Rewrote DependsCommand 2016-02-15 00:49:00 +01:00
Jordi Boggiano d6d0435c54 Merge pull request #4845 from curry684/pull-4690
Implement junctioning on Windows for path repositories
2016-02-14 19:51:23 +00:00
Jordi Boggiano 8db550b118 Merge pull request #4851 from curry684/pull-4431
Fixes in path repository handling of removed or nested sources
2016-02-14 19:16:16 +00:00
Jordi Boggiano 39ccb929b1 Merge pull request #4801 from balbuf/balbuf/find-provider-break-early
Break early when a provider name is matched
2016-02-14 19:12:04 +00:00
Jordi Boggiano 02952c3bdc Add missing </error> tag, refs #4878 2016-02-13 17:48:31 +00:00
Jordi Boggiano d347e1efca Minor tweaks refs #4878 2016-02-13 17:44:01 +00:00
Jordi Boggiano e4ede0c582 Merge remote-tracking branch 'bozerkins/force-to-reinstall-package-when-missing-vcs-metadata' 2016-02-13 16:55:44 +00:00
Jordi Boggiano d9a7d4c93a Merge pull request #4850 from astehlik/issue-validate_event
Trigger event in validate command
2016-02-13 16:35:04 +00:00
Jordi Boggiano 8ed894cf99 Fix usage of symfony console for sf<2.8, fixes #4913 2016-02-13 15:33:04 +00:00
Jordi Boggiano 25e089eee9 Allow force-lazy-providers for any repo, still an experimental flag that should not be used though 2016-02-12 14:03:59 +00:00
cinamo b6b416111e Fixed http check 2016-02-11 14:46:38 +01:00
cinamo 4f5b4aff9c Undid CS changes 2016-02-11 14:29:37 +01:00
cinamo da44f46b9c Code style fixes 2016-02-11 14:17:45 +01:00
cinamo ef60478926 Added secure-http flag, defaults to true 2016-02-11 14:15:03 +01:00
Jordi Boggiano 6d1ebba75e Merge pull request #4904 from curry684/issue-4903
Ignore empty path repositories
2016-02-11 11:17:41 +00:00
Jordi Boggiano c8b4978f5a Merge pull request #4906 from curry684/platform-editor
Prefer 'editor' on a system that supports alternatives
2016-02-11 11:01:26 +00:00
Niels Keurentjes 93ce87a84e Prefer 'editor' on a system that supports alternatives. 2016-02-11 09:24:42 +01:00
Niels Keurentjes ff6700f9ee Ignore empty path repositories per issue #4903 2016-02-11 08:57:16 +01:00
Jordi Boggiano 0ea2890ed6 Update install instructions 2016-02-10 18:41:18 +00:00
Jordi Boggiano 8808638ea9 Make sure cache clearing works easily in all cases 2016-02-10 15:36:42 +00:00
Jordi Boggiano 09a6a19257 Avoid decoding gzip responses after a redirect, fixes #4897 2016-02-10 15:24:49 +00:00
Jordi Boggiano 2378c9e308 Remove dead code 2016-02-10 15:10:32 +00:00
Jordi Boggiano 477da3a448 Fix clearCache in case of download failure 2016-02-10 15:06:22 +00:00
Jordi Boggiano 502c5431a2 Add hashing of the complete URL for cache entries of dist downloads for extra safety 2016-02-10 14:51:23 +00:00
Jordi Boggiano 2609cfdd1d Always set bin-dir into PATH before calling scripts, fixes #4852, closes #4898 2016-02-10 14:11:05 +00:00
Joseph Bielawski d9d3de8861 Be sure that configuration file can be manipulated by actual user 2016-02-09 09:20:25 +01:00
Jordi Boggiano 6eb50623e6 Merge remote-tracking branch 'hfcorriez/compressed_archiver' 2016-02-08 19:03:10 +00:00
Niels Keurentjes 990c07e4db Merge branch 'master' of https://github.com/composer/composer into sort-suggestions 2016-02-07 14:45:26 +01:00
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