1
0
Fork 0
Commit Graph

1612 Commits (14adc03225b80e12b3fc479e94074fda217f806e)

Author SHA1 Message Date
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 3c1e7a67cf Merge branch '1.4' 2017-04-19 13:37:25 +02:00
Jordi Boggiano 9b3c9e0c26 Fix tests 2017-04-19 13:34:57 +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
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
Nicole Cordes d834fcfac5 Change commitHash to match real life examples 2017-04-03 12:00:31 +01:00
Nicole Cordes c0f5a64e81 Use long array sysntax for PHP 5.3 compatibility 2017-03-31 17:09:04 +02:00
Nicole Cordes c2fe198ebc Re-add unit test for FETCH_HEAD parsing 2017-03-31 15:37:39 +02: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
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
Jose Miguel Pérez Ruiz b2f62bc06c Fix Init Command to accept author names with Unicode combining diacritical marks 2017-03-16 01:43:54 +01:00
Guillaume ZITTA f89e01d622 switch first / fallback order 2017-03-14 23:43:48 +01:00
Jordi Boggiano 843877cd6d Fix hg version guessing, fixes #6236, fixes #6235 2017-03-08 17:12:13 +01:00
Filippo Tessarotto 04b1ddb79f VersionGuesser test for HG 2017-03-08 16:10:12 +01:00
Jordi Boggiano 122e422682 CS fixes 2017-03-08 15:16:44 +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 44ea284ab9 Merge remote-tracking branch 'stefangr/implement_bitbucket_api_v2' 2017-03-07 14:43:16 +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
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 abf06913a2 remove useless expect (already done by docstring) 2017-02-14 17:37:40 +01:00
Guillaume ZITTA 921ffe741f Cleaner fallback Algorithm 2017-02-13 15:54:55 +01:00
Jordi Boggiano 20c16f18f5 Merge branch '1.3' 2017-01-27 18:01:50 +01:00
Jordi Boggiano f3d0e4660d Fix urlencoding of gitlab dots, fixes #6064 2017-01-27 18:01:24 +01:00
David Zuelke 2d36324e99 streamline install progress messages 2017-01-24 20:51:37 +01:00
Stefan Grootscholten 5dbdefdd72 Implement ordering in requesting tags and branches.
Update unit test with latest changes.
2017-01-22 15:55:17 +01:00
Stefan Grootscholten 7ae4ed1ec8 Improve fetching single files via bitbucket API.
The former implementation used the 'src' endpoint which returned some meta data as well.
This has been replaced with the 'raw' endpoint which does not return the meta data and does not need an extra JSON decode step.
2017-01-22 14:35:37 +01:00
Stefan Grootscholten d25c483231 Implement Bitbucket API version 2.0 (where applicable). 2017-01-22 14:35:37 +01:00
Stefan Grootscholten 512750a20e Add more tests to cover the new functionality. 2017-01-22 14:35:37 +01:00
Stefan Grootscholten a4af559ca8 Store access-token for re-use
Store the Bitbucket access-token (and the expiration time) so it can be re-used within the time it is valid.
The Bitbucket::requestToken and Bitbucket::getToken now only return the access-token and not all other parameters it receives from the Bitbucket API.
2017-01-22 14:35:37 +01:00
jbixler dac51c7f4b Add ignore filters option to archive command 2017-01-11 16:21:44 -06:00
Christophe Coevoet 1cb0ec7911 Resolve references in ComposerSchemaTest 2017-01-03 11:57:35 +01:00
johnstevenson 2b8ad7dc2a Clear xdebug version if restart fails, fixes #5995 2016-12-27 18:46:21 +00:00
Jordi Boggiano 2782d37a15 Merge pull request #5992 from AnrDaemon/fix-git-skips-proper
Properly skip GitDownloaderTest if git is not available
2016-12-24 01:47:04 +01:00
AnrDaemon 1d2a949e3e Properly fix git excludes.
Mindless copy-paste never gets old. Sorry. This is fixed proper this time.
2016-12-24 03:19:50 +03:00
AnrDaemon 810e70d234 Fix __DIR__/getcwd() inconsistency. 2016-12-23 21:57:00 +03:00
Jordi Boggiano df5fd3ba09 Cache executable finder calls 2016-12-23 15:01:05 +01:00
AnrDaemon ab70601700 Skip git-related tests if no git found. 2016-12-22 20:14:57 +03:00
johnstevenson 3928f1f3be Set xdebug version in environment, fixes #5967 2016-12-15 21:20:41 +00:00
Jordi Boggiano a1b468ea50 Fix git shortening, it is sunday.. 2016-12-11 17:04:24 +01:00
Jordi Boggiano 98c5f825e0 Fix tests and regression in @ref script handling 2016-12-11 16:37:55 +01:00