1
0
Fork 0
Commit Graph

5096 Commits (8695fd69486703e371d37120d8a1f8fb9c5ad29d)

Author SHA1 Message Date
Jordi Boggiano a8df30c09b Merge branch '1.5' 2017-09-11 12:16:16 +02:00
Jordi Boggiano 8b61315b14 Normalize URL as symfony Filesystem::mirror does a straight str_replace on realUrl vs actual iteratee path without normalization and our aRchivableFilesFinder does normalize the path, refs #6667 2017-09-11 11:26:33 +02:00
Gawain Lynch b859bbcdcf Pass a VCS filtered iterator to mirror 2017-09-11 11:02:58 +02:00
Mikk Tendermann 2a89d37651 fix gitlab not telling visibilty if user is not logged in 2017-09-11 10:37:32 +02:00
Abyr Valg 37addea447 Make composer see installed dev packages 2017-09-11 10:20:48 +02:00
Fedir Kryvytskyi dc509b236f Fixed error, when composer.phar was broken, if it compiled inside folder, that has /composer in path 2017-09-11 10:08:24 +02:00
Michal Lulco 84fed794d7 Trying to find package with similar name when package could not be found 2017-09-09 18:46:41 +02:00
Jordi Boggiano 1e6854455c Merge pull request #6644 from codekandis/feature/util-filesystem-copy-separation
Introduces a new method `copy()`.
2017-09-09 12:57:28 +02:00
Jordi Boggiano 97b22ad387 Merge pull request #6608 from kthbit/local-fossil
Teach FossilDriver to work with local fossil repository files
2017-09-09 12:22:25 +02:00
闫兴茂 277f05754d Add default sort for show --tree option 2017-09-07 14:17:04 +08:00
Christian Ramelow 39d8104897 Introduces a new method `copy()`.
Some packages, e. g. `tm/tooly-composer-script`, are using the composer classes to e. g. create symlinks or perform other file operations. While there's only a `copyThenRemove()` method this commit introduces a new `copy()` method. `copy()` behaves the same as the copy part of `copyThenRemove()` did with one exception: it returns `true` on success and `false` on failure. Copying a directory may lead to a `false`, while the whole directory or some of its files couldn't been copied. To ensure backwards compatibility `copyThenRemove()` calls `copy()` now. This commit also adds the necessary tests.
2017-08-31 20:19:43 +02:00
Jordi Boggiano d9885d5b3b Merge branch '1.5' 2017-08-21 09:16:59 +02:00
Jordi Boggiano 9fd4f22ba2 Also ignore dir change prompt in list command 2017-08-21 09:16:54 +02:00
Jordi Boggiano d932b17c08 Merge branch '1.5' 2017-08-21 09:14:15 +02:00
Jordi Boggiano d352cc97f7 Do not prompt for dir change on create-project, fixes #6617 2017-08-21 09:13:08 +02:00
Jordi Boggiano 79360da184 Merge branch '1.5' 2017-08-18 14:05:07 +02:00
Jordi Boggiano a144b5e7ed Fix GitLab endless loop thanks to API bug, fixes #6615 2017-08-18 14:04:53 +02:00
kthbit 1a30e3fbc1 Don't update local checkout directory if url is pointing to it. Only update the checkout directory if it is controlled by composer. 2017-08-14 10:56:02 -05:00
kthbit 927d3dda89 Teach FossilDriver to work with urls pointing to local repository.fossil files, and not just the local checkout directories. 2017-08-12 11:31:57 -05:00
kthbit 72a66ad9d2 Do not assume we are on Linux and have head, tail, and awk commands available. Instead, parse the output in PHP. 2017-08-12 08:50:12 -05:00
Jordi Boggiano aff9c72d16 Merge branch '1.5' 2017-08-09 16:02:51 +02:00
Jordi Boggiano a16867e2c2 CS 2017-08-09 16:02:45 +02:00
Helmut Januschka 320af80ad3 fix tag/branch collection 💣 2017-08-09 16:01:59 +02:00
Jordi Boggiano 0f94dcd848 Fix composer global config handling 2017-08-08 18:40:15 +02:00
David Zuelke a4d84f15ca use COMPOSER env var if present for ancestor path search 2017-08-08 18:40:12 +02:00
David Zuelke 4f7b6a3a54 use Factory::getComposerFile in ConfigCommand 2017-08-08 18:40:07 +02:00
Jordi Boggiano 4ea017d1ce Merge pull request #6595 from dzuelke/cwdup_composer_fix
Fix 1.5.0 ancestor dir composer.json search not using COMPOSER env var
2017-08-08 18:29:31 +02:00
Jordi Boggiano c1bbb750c4 Fix composer global config handling 2017-08-08 18:29:20 +02:00
David Zuelke b0da7db3af use COMPOSER env var if present for ancestor path search 2017-08-08 18:08:46 +02:00
David Zuelke ae7c076a7c use Factory::getComposerFile in ConfigCommand 2017-08-08 18:04:11 +02:00
Jordi Boggiano 97d09a9b77 Make github driver code more robust 2017-08-08 15:56:14 +02:00
Jordi Boggiano c89f6338c2 CS tweaks, refs #6592 2017-08-08 10:11:35 +02:00
Jordi Boggiano 6fd504ef41 Add per_page to do less pagination, refs #6592 2017-08-08 10:05:30 +02:00
Jordi Boggiano 086b750b76 Merge remote-tracking branch 'hjanuschka/gitlab_paging' 2017-08-08 10:03:28 +02:00
Jordi Boggiano c52e8e5656 Update comment 2017-08-08 09:39:31 +02:00
Helmut Januschka be1f675992 GitlabDriver V4 Paging
V4 of gitlab api requires paging in tags/branches
2017-08-07 21:18:46 +02:00
Jordi Boggiano b07be842a0 Remove feature-branches option as it is misnamed and duplicates the non-feature-branches option, refs #6475 2017-08-07 18:14:04 +02:00
Jordi Boggiano acdb7638a8 Warn about require-dev not being ignored when an update --no-dev fails to resolve dependencies, fixes #6575 2017-08-07 16:32:13 +02:00
Jordi Boggiano a3c15d06e4 Merge pull request #6568 from ktomk/patch-windows-bin-proxy-stubs
mute first cd in win proxy stub for sh shell, fixes #6567
2017-08-07 15:17:39 +02:00
Jordi Boggiano 6832eacb01 Update GitLab API usage to v4, fixes #6453 2017-08-07 13:13:24 +02:00
Jordi Boggiano ec2722f879 Add ability to call composer from within subdirectories of a project, fixes #6426 2017-08-07 11:48:12 +02:00
Jordi Boggiano 8e20fffda5 Merge pull request #6548 from ivanpepelko/master
Added $_SERVER['USER'] as possible value for <vendor>
2017-08-07 10:58:26 +02:00
Jordi Boggiano 65d49bf811 Merge branch '1.4' 2017-08-07 10:04:46 +02:00
Jordi Boggiano d2b102ecb9 Merge remote-tracking branch 'svenmuennich/pr/fix-require-command' into 1.4 2017-08-07 09:25:24 +02:00
Jordi Boggiano 23ab57c311 Merge branch '1.4' 2017-08-06 17:21:58 +02:00
Jordi Boggiano bf940fb21b Fix exclude-from-classmap when a package is installed as a symlink, fixes #6397 2017-08-06 17:21:04 +02:00
Jordi Boggiano 9afbddab6b Only update dist references when one existed already, fixes #6363 2017-08-06 16:54:17 +02:00
Patrick Pokatilo 57ed58346a Be strict and return non-zero exit code for outdated packages when showing all 2017-08-06 15:39:04 +02:00
Sergey Shcherbin 0863b51e7b Changed date time format to RFC_3399 in VcsDriver 2017-08-06 12:40:38 +02:00
Sergey Shcherbin f7e0504d38 Changed date format to DATE_RFC3399 for packages with git/hg repositories 2017-08-06 12:40:32 +02:00
Denis Brumann 2df1a69287 Improve IDE autocompletion
According to type 2nd constructor-argument `$reasonData` can either be a Link or a PackageInterface. IDEs like PhpStorm won't be able to provide autocompletion since both classes are from a different namespace.

In order to provide better autocompletion for `$reasonData` and by extension `$this->reasonData` the use statements should be included or the type hint should use the fully qualified class name.

For the same reason I added the docblock on the protected method `formatePackagesUnique()`.
2017-08-04 13:00:24 +02:00
Tom Klingenberg 1bc5163d34 mute first cd in win proxy stub for sh shell, fixes #6567
in the sh script, the first cd command did output the directory it cd'ed
into did output the path itself.

fix for me is to redirect it's standard output to /dev/null

using git bash on a windows 10 box.

w/o this fix, the workaround is to invoke the .bat file which is created
as well (but this is not so handy as a non windows user for me).
2017-07-27 00:47:43 +02:00
Jordi Boggiano 58bbcf7d92 Backport #6312 to 1.4 2017-07-20 11:54:45 +02:00
Ivan Pepelko 877bad7933 Added $_SERVER['USER'] as possible value for <vendor> part of package name. 2017-07-12 20:00:33 +02:00
Jordi Boggiano 17b7387c37 Merge branch '1.4' 2017-07-06 09:56:17 +02:00
Jordi Boggiano 81f65b7a2a Fix exclude-from-classmap being ignored when cwd has the wrong case on case insensitive filesystems 2017-07-06 09:53:33 +02:00
Jordi Boggiano 47bc2fa51a Fix exclude-from-classmap being ignored when generating on-the-fly class loader, fixes #6503 2017-07-06 09:51:25 +02:00
Jordi Boggiano 34dbde3873 Merge branch '1.4' 2017-07-03 17:00:48 +02:00
Sven Münnich d51ef83a43 Fix case insensitivity of ‘require’ command
When currently executing the `require` command for a package that is already listed in `require(-dev)`, one must use the exact same, case matching package name as written in `composer.json`. That is, if one changes the case of a character in the package name, the `require` command will add a new entry to `require(-dev)`, instead of updating the existing one.

This commit fixes the described behaviour to make it consistent with other commands like `update` that are already case insensitive.
2017-07-03 12:11:24 +02:00
Marc Schlatter 3ad5ce6874 Fix hg command to retrieve file content 2017-06-22 16:20:01 +02:00
Saumini Navaratnam 27b8209990 Fix for issue #6492
Able to include specific finle in phar in "files" option in composer
2017-06-19 17:04:16 +02:00
Jordi Boggiano db7616885d Merge pull request #6458 from ajiyakin/identic-name-diff-capitalization-unzip
Warn identical names w/ different capitalization for unzip
2017-06-18 17:14:47 +02:00
Jordi Boggiano ef47d8bf05 Merge pull request #6486 from WilHall/feature/htaccess-protect-option
Add htaccess-protect option for disabling the creation of .htaccess files
2017-06-17 15:39:56 +02:00
Jordi Boggiano 91a4e76958 Merge pull request #6460 from bmax/master
Cache: clear cache using removeDirectory
2017-06-17 15:28:05 +02:00
Brandon Max a4ec8efa93 Update ClearCacheCommand.php 2017-06-16 16:32:59 -04:00
Brandon Max c280e16763 Change order of cache directorys 2017-06-16 16:32:41 -04:00
Brandon Max 24b8fea48a Cache: clear cache using removeDirectory 2017-06-16 16:25:11 -04:00
Wil Hall afe83a7356 Update ConfigCommand to allow setting of htaccess-protect option 2017-06-15 11:53:43 -04:00
Wil Hall f0924fb878 Add htaccess-protect option for disabling the creation of .htaccess files 2017-06-15 11:06:13 -04:00
Jordi Boggiano 7cee8e385f Merge branch '1.4' 2017-06-15 16:28:08 +02:00
Jordi Boggiano cc9234562d Merge pull request #6475 from NamelessCoder/featurebranches
Add support for feature-branches setting
2017-06-15 15:49:10 +02:00
Li Chuangbo 1f4882a3e6 Revert "Fixed an issue when a phar file is used in "files" option in composer.json"
This reverts commit 41e91f3064.

The commit 41e91f3 in current codebase generates absolute path in
autoload_static.php for phar file.

Also according to http://php.net/manual/en/phar.using.intro.php, the `phar://`
prefix is not needed.
2017-06-15 14:38:04 +02:00
Claus Due 965f1f42d1 Add support for feature-branches setting
A negative list of non-feature-branches names
is already supported - this patch adds a list of
branches names which *will* be considered as
feature branches.

Allows changing the currently hardcoded set of
expected feature branch names, from:

* master|trunk|default|develop

To any set of names or patterns that you desire.
2017-06-11 19:02:51 +02:00
Sergey Shcherbin 676156e2db Changed date time format to RFC_3399 in VcsDriver 2017-06-07 20:51:59 +03:00
Sergey Shcherbin c890d660cd Changed date format to DATE_RFC3399 for packages with git/hg repositories 2017-06-01 20:48:03 +03:00
AjiYakin 03c560ce05 Warn identical names w/ different capitalization for unzip
Warn about identical names with different capitalization on unzip archive
extract failure (Not a directory)

Issue #5938
2017-05-30 12:38:46 +07:00
Jordi Boggiano a3f2b7bb92 Tweak variable name 2017-05-24 13:26:07 +02:00
Nils Adermann b1110df873 Merge pull request #6371 from balbuf/balbuf/move-all-plugins
Move all plugins and their dependencies to the front
2017-05-24 13:23:09 +02:00
Stephen Beemsterboer 06bb6c7530 Move plugins with no dependencies to the front, followed by plugins with their dependencies 2017-05-23 20:28:32 -04:00
Stephen Beemsterboer 4cda7e0a44 Take into account a package's "provide" and "replace" fields
A package can satisfy a require by its "provide" or "replace" fields,
so this leverages the getNames() method which returns these alternate
names as well.
2017-05-23 19:17:18 -04:00
Jordi Boggiano 1a488bce01 Base64 encode debug output to avoid dumping binary and push it to the end of the line 2017-05-23 09:31:29 +02:00
Jordi Boggiano 221d80d1e1 Merge branch '1.4' 2017-05-21 17:16:46 +02:00
Jordi Boggiano d7b2e42fa9 Do not split repo names on dots, fixes #6424 2017-05-21 17:15:27 +02:00
Jordi Boggiano 2eb69cd679 Always recommend using global config to store auth tokens 2017-05-21 16:45:14 +02:00
Matt Isenhower 4dc8748e68 Update GitLab personal access token URL and the token config command 2017-05-21 16:40:07 +02:00
Jordi Boggiano 0723654362 Merge branch '1.4' 2017-05-21 16:25:16 +02:00
Jordi Boggiano d0e780a8eb Allow php_uname to be disabled, fixes composer/getcomposer.org#112 2017-05-21 16:24:35 +02:00
Martin Hasoň 88ec172bd8 Fix CS 2017-05-19 15:14:47 +02:00
Martin Hasoň 3c5bfcf1e9 Register github repository type 2017-05-19 11:40:42 +02:00
Jordi Boggiano ce56fc4ab6 Merge pull request #6381 from deeky666/pass-vsc-driver-options
Forward GitLab driver options to remote filesystem
2017-05-16 23:36:30 +02:00
Jordi Boggiano a86f1a8969 Merge pull request #6377 from CupOfTea696/feature/init-command-skip-interactive-require-if-set-by-option
Auto-skip interactive require when set by option.
2017-05-16 23:26:26 +02:00
Jordi Boggiano c917c52f81 Message tweak, refs #6341 2017-05-16 22:45:47 +02:00
AjiYakin 8858b27ced Warn identical names w/ different capitalization - extract zip archive
Warn about identical names with different capitalization on zip archive
extract failure (Not a directory)

Issue #5938
2017-05-16 22:43:04 +02:00
Jordi Boggiano ff61ecd484 Allow accessing the ArchiveManager via the Composer object, fixes #6411 2017-05-16 22:20:49 +02:00
Jordi Boggiano 39d187fb1e Merge branch '1.4' 2017-05-16 22:19:12 +02:00
Jordi Boggiano 9824d339b6 Escape arguments, refs #6414 2017-05-16 22:18:19 +02:00
Jasper N. Brouwer 4ce39c75c7 Pass more ini directives when executing php
Not only pass the current value for "memory_limit" along when executing
php, but also do the same for "allow_url_fopen" and "disable_functions"
2017-05-16 22:14:20 +02:00
Jordi Boggiano 954300032b Avoid useless warnings when updating/removing stuff that is not installed 2017-05-16 21:59:19 +02:00
Robert Lu 05fcc4adfb can use relative path for mirror 2017-05-16 21:56:24 +02:00
Jordi Boggiano 71c28a6865 Merge pull request #6373 from alcohol/implement-gitlab-subgroups
support for gitlab subgroups, closes #6349
2017-05-16 21:20:34 +02:00
Jordi Boggiano eff9326b0d Fix BC break, fixes #6419 2017-05-15 13:41:36 +02:00
Steve Müller 1d29fa04b1 forward GitLab driver options to remote filesystem 2017-04-26 16:59:50 +02:00
Robert Pustułka 688c1b057b Fix callable typehint
Change `callback` typehint to `callable` in order to satisfy phpstan.
2017-04-26 12:53:19 +02:00
CupOfTea696 14adc03225 Auto-skip interactive require when set by option 2017-04-25 13:53:06 +01:00
Rob Bast e2eb8f2201
support for gitlab subgroups, closes #6349 2017-04-24 10:51:47 +02:00
Stephen da6efc9b02 Move all plugins and their dependencies to the front 2017-04-22 15:20:50 -04:00
Jordi Boggiano e3a23c0047 Merge branch '1.4' 2017-04-20 13:43:12 +02:00
Jordi Boggiano 75416c69b4 Merge pull request #6340 from derrabus/remove-control-chars-from-suggest
Remove ANSI control characters from suggested packages output
2017-04-19 17:49:46 +02:00
Alexander M. Turek 20050dd984 Remove console formatting as well. 2017-04-19 17:24:47 +02:00
Jordi Boggiano bf82bfdb10 More debug output, refs #6342 2017-04-19 13:37:41 +02:00
Jordi Boggiano 3c1e7a67cf Merge branch '1.4' 2017-04-19 13:37:25 +02:00
Jordi Boggiano 123e8956c7 Merge pull request #6337 from theotonge/bugfix-5989
Fix for https://github.com/composer/composer/issues/5989
2017-04-19 13:34:43 +02:00
Jordi Boggiano 1fe5064560 Better debuggability of content-length mismatch 2017-04-19 13:24:07 +02:00
Jordi Boggiano 8491a21d41 Merge branch '1.4' 2017-04-14 00:28:24 +02:00
Jordi Boggiano 4d16d6b28b Oops2 2017-04-14 00:28:20 +02:00
Jordi Boggiano b3b081234a Merge branch '1.4' 2017-04-14 00:25:18 +02:00
Jordi Boggiano b6778cd7f6 Oops 2017-04-14 00:25:14 +02:00
Jordi Boggiano a2e22f7a84 Merge branch '1.4' 2017-04-14 00:16:34 +02:00
Jordi Boggiano 890baa2f89 Force remove command to have at least one package name passed, refs #6338 2017-04-14 00:16:18 +02:00
Jordi Boggiano be38f7e65d Ignore headless mercurial branches in bitbucket API, fixes composer/packagist#778 2017-04-14 00:08:27 +02:00
Jordi Boggiano 8b0e615232 Assume at least 80char wide terminal, fixes #6351 2017-04-13 23:23:28 +02:00
Jordi Boggiano 83798d8090 Avoid mixing stderr and stdout in outdated command as it mangles output 2017-04-13 23:15:01 +02:00
Alexander M. Turek 401ef69ae3 Remove ANSI control characters from suggested packages output. 2017-04-11 15:20:40 +02:00
Theo Tonge c077df0d80 Fix for https://github.com/composer/composer/issues/5989
Enforce yes/no answers for Confirmation Questions
2017-04-10 21:33:30 +01:00
Jordi Boggiano 2c03dab4c3 Merge branch '1.4' 2017-04-10 18:47:30 +02:00
Jordi Boggiano be201924cd Revert "Changes the query string parameter `sha` to `ref` to reflect the GitLab API"
Fixes #6344, refs #6198

This reverts commit 8a496cd2a7.
2017-04-10 18:46:38 +02:00
Issei.M 0856dfa084 Aligns the verb form of commands' description 2017-04-06 13:50:24 +09:00
Graham Daniels a9c0134378 make use of variable 2017-04-03 18:12:29 -04:00
Nicole Cordes 313e6b914d Fix Git branch parsing for detached HEAD on a commit
Current versions of Git output the commit hash as detached HEAD instead
of FETCH_HEAD. The VersionGuesser should be able to handle commit hashes
as well as FETCH_HEAD to detect the correct branch of a commit.
2017-03-31 15:02:50 +02:00
Jordi Boggiano 61511cfed6 Fix CS issues, refs #6159 2017-03-30 09:29:48 +02:00
Jordi Boggiano 0a337e7c75 Merge remote-tracking branch 'gza/fix_unzip_on_win_php56' 2017-03-30 09:15:26 +02:00
Jordi Boggiano 0d5ff633b5 Merge branch '1.4' 2017-03-26 14:03:37 +02:00
Jordi Boggiano 72616a9635 Only check for safe mode on versions that have it, refs #6300 2017-03-26 14:03:27 +02:00
Jordi Boggiano 0efc66d968 Tweak message 2017-03-26 13:43:05 +02:00
Nicola Spanti (RyDroid) 5cd080dfac Add a specific message for stupid users that put useless spaces in license 2017-03-25 21:48:24 +01:00
Jordi Boggiano 00a6b7c794 Merge branch '1.4' 2017-03-24 09:35:16 +01:00
Alejandro Celaya d20494ddf6 Removed duplicated "to" 2017-03-24 09:34:45 +01:00
Parallel 6ad7caa25e Add config>platform checking 2017-03-20 23:58:05 +08:00
Jordi Boggiano 7aeb1b0c41 Fix conversion of repo format in config command, fixes #6245, closes #6271 2017-03-17 22:09:51 +01:00
Jose Miguel Pérez Ruiz 4ba3c741f5 Fix Init Command to accept author names with Unicode combining diacritical marks 2017-03-17 21:58:57 +01:00
David Zuelke a4c9c1235e fix #6244 2017-03-16 17:40:37 +01:00
Guillaume ZITTA f89e01d622 switch first / fallback order 2017-03-14 23:43:48 +01:00
Jordi Boggiano 92b25acce0 Fix config value used for apcu-autoloader in dump-autoload command, fixes #6237 2017-03-09 09:41:22 +01:00
Jordi Boggiano 843877cd6d Fix hg version guessing, fixes #6236, fixes #6235 2017-03-08 17:12:13 +01:00
Jordi Boggiano 122e422682 CS fixes 2017-03-08 15:16:44 +01:00
Jordi Boggiano 11ce391222 Add support for info/warnings in every json file loaded by ComposerRepo 2017-03-08 14:10:50 +01:00
Jordi Boggiano ddef9923b0 Merge branch '1.3' 2017-03-08 10:33:46 +01:00
Sjoerd Adema 8a496cd2a7 Changes the query string parameter `sha` to `ref` to reflect the GitLab API
Updated the unit test to reflect the change
Fixes #6198
2017-03-08 10:27:58 +01:00
Jordi Boggiano f200343cf2 Fix gitlab driver issues not asking for auth when token is missing, and not falling back properly to git driver 2017-03-08 10:26:08 +01:00
Jordi Boggiano c8cf24daad Minor tweaks and CS fixes to new bitbucket integration, refs #6094 2017-03-07 15:46:38 +01:00