1
0
Fork 0
Commit Graph

5045 Commits (f74c6f462098e0149460d661ff50f3701e45694a)

Author SHA1 Message Date
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
Jordi Boggiano 44ea284ab9 Merge remote-tracking branch 'stefangr/implement_bitbucket_api_v2' 2017-03-07 14:43:16 +01:00
Jordi Boggiano 5f1543e6c3 Merge branch '1.3' 2017-03-07 14:34:12 +01:00
Jordi Boggiano daff57189f Add http_build_query 3rd param to make it more explicit 2017-03-07 14:34:07 +01:00
Jordi Boggiano e09c632c14 Rename a few fields in json output, refs #6228 2017-03-07 14:26:24 +01:00
Jordi Boggiano a286c39f20 Add docs about new --format, refs #6228 2017-03-07 14:19:51 +01:00
Jordi Boggiano f5e026c6c5 Merge remote-tracking branch 'xelaris/json-output-for-show-cmd' 2017-03-07 14:08:36 +01:00
Jordi Boggiano c61a1c7523 Merge branch '1.3' 2017-03-07 10:02:15 +01:00
Jordi Boggiano 260b85882f Merge remote-tracking branch 'dzuelke/installmsgs' into 1.3 2017-03-07 10:01:02 +01:00
Jordi Boggiano 63447cf724 Avoid retrying forever if a gitlab token has insufficient rights, fixes #6189 2017-03-07 09:55:21 +01:00
Jordi Boggiano 6afc844339 Do not warn of mirrors not existing 2017-03-07 09:20:49 +01:00
Jordi Boggiano 586f4bac87 Make use of prefer-stable/minimum-stability when picking versions in require command, fixes #6219 2017-03-06 18:39:44 +01:00
Jordi Boggiano e42e1156d5 Merge branch '1.3' 2017-03-06 16:58:15 +01:00
David WATTIER e6d648f465 Improve performance on psr4 autoload file finding 2017-03-06 16:56:04 +01:00
Jordi Boggiano f85a4a2f51 Add notice about not trying to allow path symlinks into source dir, refs #5974, refs #6174 2017-03-06 16:18:07 +01:00
Bernhard Froehlich 70314f3570 Fix Repository support for Subversion 1.8.x where the output of svn info
has changed.

1.7.22
svn: E170001: Unable to connect to a repository at URL 'https://svswdms02/dashboard'
svn: E170001: OPTIONS of 'https://svswdms02/dashboard': authorization failed: Could not authenticate to server: rejected Digest challenge (https://svswdms02)

1.8.17
svn: E215004: Authentication failed and interactive prompting is disabled; see the --force-interactive option
svn: E215004: Unable to connect to a repository at URL 'https://svswdms02/dashboard'
svn: E215004: No more credentials or we tried too many times.
Authentication failed
2017-03-06 15:44:00 +01:00
Jordi Boggiano 5061d90135 Allow setting the channel without running a complete self-update 2017-03-06 15:27:42 +01:00
Jordi Boggiano 34d7e26f25 Merge branch '1.3' 2017-03-06 14:09:36 +01:00
Jordi Boggiano c0b03d0d34 Force exact tag checks when we are in a detached head state 2017-03-06 14:09:27 +01:00
Jordi Boggiano 0ecd1f5eb5 Merge branch '1.3' 2017-03-06 12:30:33 +01:00
Jordi Boggiano 08fc56b38a Avoid using null value as string, fixes #6134 2017-03-06 12:08:51 +01:00
James Buncle 9be13783a3 Updated VersionGuesser to check if we actually have a version in the returned array (fixes bug originating from f6899e5 when array was first introduced) - as SVN Versions not being guessed as it would previously stop at Git check.
Fixes #6178
2017-03-06 10:49:13 +01:00
Jordi Boggiano 1baa2a52d4 Make sure script running errors are always output even in quiet mode, fixes #6122 2017-03-06 10:45:03 +01:00
Jordi Boggiano dad7f89fd5 Fix docs, fixes #6136 2017-03-06 08:53:39 +01:00
Alexander Schwenn 527f5b8571 Print error message when json is requested for tree or single package info 2017-03-06 00:29:20 +01:00
Alexander Schwenn 74d82a51e3 Replace latestStyle by status to get style independent json output 2017-03-06 00:09:03 +01:00
Alexander Schwenn c70aaa421d Add json output for show command 2017-03-05 23:50:46 +01:00
Alexander Schwenn 818687849d Extract view logic from data preparation 2017-03-05 23:18:39 +01:00
Alexander Schwenn 64139ba327 Move loop-independent code outside of loop 2017-03-05 22:49:06 +01:00
Alexander Schwenn 086c9d5c56 Separate package warning from view representation 2017-03-05 22:33:00 +01:00
Alexander Schwenn 52ca1bd9c5 Move command termination outside of output loop 2017-03-05 21:53:44 +01:00
Alexander Schwenn e672628565 Separate package type from view representation 2017-03-05 21:27:46 +01:00
Alexander Schwenn 308fa88746 Move $io->write calls together 2017-03-05 21:06:44 +01:00
Alexander Schwenn 77e104bd4d Fix typo in local variable name 2017-03-05 16:19:03 +01:00
Jordi Boggiano 9e592f5748 Merge branch '1.3' 2017-03-02 10:41:47 +01:00
janczer 4707433b40 Fix change array 2017-03-02 10:41:39 +01:00
janczer 11524fc2c2 If xml have not index channel use uri 2017-03-02 10:41:33 +01:00
rubenrua 8fccbaa4a4 Improve memory usage resolving dependencies II
Optimize `rulesByHash` in `Composer\DependencyResolver\RuleSet` to only
use an array with the second element, event with very low probability.
2017-02-20 18:52:34 +00:00
rubenrua 4e1887a721 Improve memory usage resolving dependencies
It is known that composer update takes a lot of memory: #5915, #5902,

I am playing with a profiler (@blackfireio) to make a demo in my local
PHP meetup (@phpvigo) and I found out a way to use less memory. These
are my first tests:

* Private project using PHP 5.6:
  * Memory: from 1.31GB to 1.07GB
  * Wall Time: from 2min 8s to 1min 33s

* symfony-demo using PHP 7.1 in my old mac book:
  * Memory: from 667MB to 523MB
  * Wall Time: from  5min 29s to 5min 28s

Not use an array inside conflict rules is this improvement main idea:

```php
<?php
//Memory 38MB
gc_collect_cycles();
gc_disable();

class Rule
{
    public $literals;

    public function __construct(array $literals)
    {
        $this->literals = $literals;
    }
}

$rules = array();

$i = 0;
while ($i<80000){ //
    $i++;

    $array = array(-$i, $i);
    $rule = new Rule($array);
    $rules[] = $rule;
}
```

```php
<?php
//Memory 11.1MB
gc_collect_cycles();
gc_disable();

class Rule2Literals
{
    public $literal1;
    public $literal2;

    public function __construct($literal1, $literal2)
    {
        $this->literal1 = $literal1;
        $this->literal2 = $literal2;
    }
}

$rules = array();

$i = 0;
while ($i<80000){ //
    $i++;

    $rule = new ConflictRule(-$i, $i);
    $rules[] = $rule;
}
```

More info https://github.com/composer/composer/pull/6168
2017-02-20 18:52:17 +00:00
Guillaume ZITTA 2e8d715c2f fix bad visibility 2017-02-14 18:02:22 +01:00
Guillaume ZITTA 98b7bd68b4 fix docstring and useless return 2017-02-14 17:44:56 +01:00
Guillaume ZITTA 921ffe741f Cleaner fallback Algorithm 2017-02-13 15:54:55 +01:00
Guillaume ZITTA 211c874b93 split into 2 extract methods 2017-02-13 14:00:48 +01:00
Guillaume ZITTA 374ada6914 useless if, condition il already true 2017-02-13 13:43:36 +01:00
Stefan Grootscholten 966d0bec10 One more non-camelCase variable. 2017-01-29 15:55:37 +01:00
Stefan Grootscholten 3ccaac619b Refactor the getRepoData method to not throw an Exception 2017-01-29 15:35:50 +01:00
Jordi Boggiano 07123715d6 Merge branch '1.3' 2017-01-27 18:44:31 +01:00
Pieter Frenssen 9020b7113c Fix invalid calculation on non-numeric string 2017-01-27 18:44:26 +01:00
David Zuelke 17d5f6d88a fix some install msg corner cases
mostly around updates; had to go back to a colon even for 'from cache'
2017-01-27 18:30:00 +01:00
Jordi Boggiano 20c16f18f5 Merge branch '1.3' 2017-01-27 18:01:50 +01:00
Jordi Boggiano 2931da6a50 Merge remote-tracking branch 'johnstevenson/xdebug-win-opcache' into 1.3 2017-01-27 18:01:41 +01:00
Jordi Boggiano f3d0e4660d Fix urlencoding of gitlab dots, fixes #6064 2017-01-27 18:01:24 +01:00