1
0
Fork 0
Commit Graph

1736 Commits (c46f9f061af8a162b54b896f551ec20fe1fd9a6d)

Author SHA1 Message Date
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
Rob Bast 422a9adb07
images related to new trusty images 2017-06-22 15:20:19 +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 24b8fea48a Cache: clear cache using removeDirectory 2017-06-16 16:25:11 -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
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 292882f0d0 Fix for time format in GitBitbucketDriver test 2017-06-07 22:29:15 +03: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
Remi Collet 741c8d63fb fix test for Symfony 3.2 2017-05-22 08:16:45 +02:00
Remi Collet 95d82f6fde fix test for json-schema 5.2 2017-05-22 08:01:51 +02:00
Martin Hasoň 88ec172bd8 Fix CS 2017-05-19 15:14:47 +02:00
Martin Hasoň d1ba698291 Fix PHP 5.3 compatibility 2017-05-19 12:36:19 +02:00
Martin Hasoň 3c5bfcf1e9 Register github repository type 2017-05-19 11:40:42 +02:00
Jordi Boggiano a6627d55b7 Fix build 2017-05-16 23:50:15 +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 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
Steve Müller 1d29fa04b1 forward GitLab driver options to remote filesystem 2017-04-26 16:59:50 +02:00
Rob Bast e2eb8f2201
support for gitlab subgroups, closes #6349 2017-04-24 10:51:47 +02:00
Stephen 6c4800b8d2 Update corresponding test for plugin moving 2017-04-22 16:43:07 -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 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
Jordi Boggiano 4d77ffcb4a Merge branch 'simplify-output' 2016-12-11 16:24:01 +01:00
Jordi Boggiano 4d082f77b8 Simplify composer output to take less lines 2016-12-07 01:09:06 +01:00
Jordi Boggiano e54c7478ee Attempt at fixing support for git 2.11, refs #5942 2016-12-07 01:02:55 +01:00
Jordi Boggiano 1dcb2b5758 Merge remote-tracking branch 'nicolas-grekas/apcu' 2016-12-07 00:21:13 +01:00
Jordi Boggiano e9d04f2b2d Merge branch '1.2' 2016-12-06 17:04:39 +01:00
Hans-Joachim Michl 817b2747c7 Fix #5672
This fixes the issue reported in #5672.
It just makes sure the ZendGuard encoded files can be autoloaded correctly.
2016-12-06 17:02:27 +01:00
Dries Vints 2ab7df5566 Do not add newlines to output 2016-12-06 16:53:46 +01:00
Nicolas Grekas 6d4e60b991 Add --apcu-autoloader option to enable APCu caching of found/not-found classes 2016-12-06 11:21:44 +01:00
Jordi Boggiano f3f063e3e2 Merge pull request #5888 from alcohol/array-default
use array as default value
2016-12-01 14:24:41 +01:00
Rob Bast 873f17261c
try to fix test instead of guarding implementation 2016-12-01 14:03:20 +01:00
Jordi Boggiano 8a2f597db3 Fix tests 2016-11-30 23:56:43 +01:00
Jordi Boggiano 91e7372c6e Backport update packagist default repo to be packagist.org 2016-11-30 22:57:11 +01:00
johnstevenson c1058cf37c Fix XdebugHandler test 2016-11-21 11:52:56 +00:00
johnstevenson 379fb70ad9 Use random name for tmp ini and delete after use
Thanks to Patrick Rose for reporting this issue.
2016-11-20 10:59:05 +00:00
Jordi Boggiano 8ad6385ffb Merge remote-tracking branch 'fabpot/more-debug' 2016-11-06 18:18:52 +01:00
Jordi Boggiano 43903a3979 Merge branch '1.2' 2016-11-06 17:38:53 +01:00
Jordi Boggiano 98a599d6c3 Merge pull request #5843 from stof/enforce_map_types
Enhance the json schema with validation for map objects
2016-11-06 17:02:38 +01:00
Jordi Boggiano 9801d831ed Merge pull request #5852 from fabpot/io-fix
Remove usage of echo when executing Composer script
2016-11-06 16:49:08 +01:00
Jordi Boggiano d6499b7c4a Merge pull request #5748 from kassner/hgdriver-bitbucket
HgDriver does not identify bitbucket mercurial repos correctly
2016-11-06 12:36:13 +01:00
Fabien Potencier 103624d4ed Remove usage of echo when executing Composer script 2016-11-05 22:10:39 -07:00
Christophe Coevoet 1882f9a502 Enhance the json schema with validation for map objects 2016-11-03 13:19:20 +01:00
Jordi Boggiano 208086d8e3 Merge remote-tracking branch 'channelgrabber/GitSpeedIncrease' 2016-11-03 12:08:28 +01:00
Jordi Boggiano adee0ff132 Fix tests 2016-11-03 11:30:35 +01:00
Jordi Boggiano e38ebefc7e Update packagist default repo to be packagist.org 2016-11-03 11:00:40 +01:00
Fabien Potencier 57ec0d1815 added more information in the output 2016-10-29 11:37:23 -07:00
Richard Heelin c2f6c61f56 Updated the tests to match the new command that is executed 2016-10-21 15:49:27 +01:00
Jordi Boggiano d9328ed5ae Merge pull request #5753 from alcohol/use-rfc3339-in-arraydumper
bring arraydumper in line with json schema spec and packagist
2016-10-12 16:51:59 +02:00
Konstantin.Myakshin dc70b40d34 Use implode instead of join 2016-10-11 16:52:29 +03:00
Jordi Boggiano d1867d5859 Merge branch '1.2' 2016-10-10 18:21:22 +02:00
Jordi Boggiano 5ee22f25ba Rework JSON matching to use a properly recursive pattern, fixes #5771 2016-10-10 18:20:53 +02:00
Jordi Boggiano 092dec9596 Add failing test for #5771 2016-10-10 18:12:24 +02:00
Jordi Boggiano 183398fe5e Merge pull request #5717 from berlinger-rarents/fix/5584_anon_redirect_bitbucket
prevent (prompt for) bitbucket auth when it redirected
2016-10-10 14:11:24 +02:00
Jordi Boggiano c540dace8c Merge pull request #5765 from fabpot/remove-obsolete-code
removed obsolete code
2016-10-08 11:28:19 +02:00
Jordi Boggiano 4cd6eabdba Merge branch '1.2' 2016-10-08 11:27:52 +02:00
Fabien Potencier 2853e82400 removed obsolete code 2016-10-06 11:56:54 -07:00
Christophe Coevoet d5810c8a36 Fix namespace for tests for consistency 2016-10-05 10:45:22 +02:00
Rob Bast a45ae5f585
fix test 2016-10-04 13:23:25 +02:00
Rafael Kassner 34ec5fba58 Code review fixes 2016-10-03 13:35:48 +02:00
Rafael Kassner 44634a689d HgDriver does not identify bitbucket mercurial repos correctly 2016-10-03 13:17:07 +02:00
Yanick Witschi 4a769a785c Reduce calls on Rule::getHash() 2016-09-30 17:25:41 +02:00
Roel Arents d338a95174 use seldaek's bitbucket repo for unit tests instead of 3rd party 2016-09-29 17:29:09 +02:00
Jordi Boggiano 117e09ca48 Merge pull request #5728 from alcohol/pool-priority-matters
add a test that asserts pool priority matters
2016-09-29 08:01:00 +02:00
berlinger-rarents 8845ea467a try bitbucket downloads first time without auth
also add tests for #5584
2016-09-28 19:08:24 +02:00
Rob Bast 9cbcda9ae6
add test that asserts pool priority matters
also switch assertEquals for assertSame
2016-09-28 09:34:08 +02:00
Rob Bast 9f2bd34c87
test copied from #5724 2016-09-27 17:39:44 +02:00
Rob Bast b4fd19aae4
add test exposing the problem 2016-09-27 14:45:19 +02:00
Jordi Boggiano 048a801fce Merge pull request #5698 from johnstevenson/restart2
Simplify XDebugHandler restart process
2016-09-23 16:35:12 +02:00
johnstevenson e9a97004c5 Simplify XdebugHandler restart process 2016-09-23 13:50:54 +01:00
Rob Bast 4213fbc8c6
does not apply for hhvm 2016-09-23 13:27:15 +02:00
Rob Bast 181b172e77
test cases for #5701 2016-09-23 12:22:45 +02:00
Rob Bast 1cf4ecd648 remove env variable after test assertion 2016-09-21 11:48:32 +02:00
Fabien Potencier e83f7c2929 Fix process timeout when set to 0 2016-09-21 11:48:10 +02:00
Rob Bast 2ef9cde060
remove env variable after test assertion 2016-09-21 11:34:28 +02:00
Fabien Potencier 2c77fd6801 Fix process timeout when set to 0 2016-09-20 18:25:05 -07:00
Jordi Boggiano 68861c48ed Merge branch '1.2' 2016-09-17 13:27:39 +02:00
SpacePossum 2ae0800cd3 Remove useless concat. 2016-09-16 14:50:34 +02:00
Jordi Boggiano 20ee689bb4 Upgrade json-schema to allow v3 and upgrade other deps 2016-09-14 18:06:37 +02:00
Jordi Boggiano 2ffa1148a9 Merge branch '1.2' 2016-09-12 19:06:26 +02:00
Den Girnyk 41eb297248 Add tests 2016-09-12 17:20:58 +02:00
Jordi Boggiano 285c4a1ac6 Merge branch '1.2' 2016-09-12 16:56:32 +02:00
Jordi Boggiano ff7daf0bd4 Fix handling of paths on windows when cwd is root of drive, fixes #5554 2016-09-12 16:56:04 +02:00
Jordi Boggiano f0f932fca4 Fix classmap test on windows 2016-09-10 12:52:23 +02:00
Jordi Boggiano f63f1ff95f Merge remote-tracking branch 'davidolrik/master' 2016-09-10 12:32:00 +02:00
Jordi Boggiano 70ccac6ba2 Merge pull request #5532 from zomberg/class_map_generator_test
Added test for 'dump' method of ClassMapGenerator class
2016-09-10 12:28:36 +02:00
Jordi Boggiano 994211523c Merge remote-tracking branch 'johnstevenson/restart' 2016-09-10 12:09:29 +02:00
Jordi Boggiano 6ec8b2bfd6 Update locker tests 2016-09-10 11:41:07 +02:00
Jordi Boggiano 788f32ac93 Allow running test suite with osx tar, fixes #5662 2016-09-10 11:38:52 +02:00
johnstevenson 0256f62b3b Fix and rationalize tests 2016-09-06 20:17:18 +01:00
johnstevenson 589b1d6fa2 Fix hhvm not running tests in a separate process 2016-09-06 16:35:56 +01:00
johnstevenson 896d1d71f8 Use ConsoleOutput to determine color support 2016-09-06 14:57:18 +01:00
johnstevenson e381abeec0 Simplify argv handling 2016-09-03 19:00:41 +01:00
Jordi Boggiano 3e010fc332 Merge pull request #5591 from ianlet/master
Use https url of the repository instead of ssh given gitlab project is public
2016-09-02 19:03:55 +02:00
Matthew "Juniper" Barlett ac41bb0615 Fix for issue #5631
- Add " ( and ) as valid characters in author name
- Add relavent unit tests
2016-09-02 18:59:10 +02:00
Jordi Boggiano edddae42db Revert default change from #5603 2016-08-30 15:20:20 +02:00
John Whitley 4479b8a690 Squashed commit of the following:
commit 3994b556dcffcde7b1801c8bc712f3127e8f8e7c
Author: John Whitley <john.whitley@berea.eu>
Date:   Tue Aug 16 09:02:53 2016 +0100

    https://github.com/composer/composer/issues/5600

    This alters the default flag for loadOptions in
    \Composer\Package\Loader\ArrayLoader to true; and alters the assumption
    of the test to reflect this change.

    **Rationale**

    The `\Composer\Package\Loader\ArrayLoader` test (defined in
    tests/Composer/Test/Package/Loader/ArrayLoaderTest.php) assumed that a
    new `\Composer\Package\Loader\ArrayLoader` instance would be always
    created with the optional flag loadOptions set to true.

    ```php
    $this->loader = new \Composer\Package\Loader\ArrayLoader(null, true);
    ```

    This change alters the general case to reflect the default assumption as
    defined in the test.

commit b75fc4ad7238bc50f724bd29446ccbc33e82c34c
Author: John Whitley <john.whitley@berea.eu>
Date:   Mon Aug 15 16:55:27 2016 +0100

    Altered the test for ArrayLoader to use the default loadConfig flag, and to test the true and false states for the loadConfig flag
2016-08-30 15:20:15 +02:00
David Jack Wange Olrik 2c84be47c2 Add support for seamless execution of local binaries
Projects that add binaries to `vendor-bin` can now execute those via the same command as projects that consume them without installing them first.

In list overview local commands have a `(local)` tag to distinguish them from commands installed in `vendor-bin`.

Local binaries take precedence over `vendor-bin` which takes precedence over binaries in path.
2016-08-21 16:57:19 +02:00