1
0
Fork 0
Commit Graph

4961 Commits (2bbabe357879319cba48476c582c40e4f0a3dbeb)

Author SHA1 Message Date
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
Stefan Grootscholten 4377ba2bcb Implement changes after review by stof.
- Use camelCase variable names.
- Set 3rd argument of http_build_query
- Remove obsolete checks
2017-01-25 21:18:19 +01:00
David Zuelke 2d36324e99 streamline install progress messages 2017-01-24 20:51:37 +01:00
Jordi Boggiano eb5495b8e4 Merge branch '1.3' 2017-01-22 20:01:35 +01:00
Jordi Boggiano d6ffe1fd1d Add support for outdated command info without ANSI colors, fixes #6070 2017-01-22 20:01:12 +01:00
Jordi Boggiano cf2838131f Merge pull request #6062 from MoT3rror/master
Add ignore filters option to archive command
2017-01-22 19:35:40 +01:00
vlakoff 65a5727315 Do not hide the warning implicitly
Even if COMPOSER_ALLOW_XDEBUG is set,
requires to also set COMPOSER_DISABLE_XDEBUG_WARN to hide the warning.

This undoes commit c5dcedd.
2017-01-22 19:06:50 +01:00
Jordi Boggiano 7aa7c3ced3 Forward composer memory_limit to child processes, fixes #6075 2017-01-22 19:03:22 +01:00
Jordi Boggiano 9a26a9e8f8 Make sure alias packages installed with create-project end up with the correct branch checked out, fixes #6082 2017-01-22 18:44:15 +01:00
Jordi Boggiano e4840ee413 Add a COMPOSER_BINARY env var so that chdir does not affect @composer script resolvability, fixes #6080 2017-01-22 18:26:49 +01:00
Yanick Witschi 0ea93df252 Fixed no lock file was written when setting writeLock to true and executeOperations to false 2017-01-22 17:56:09 +01:00
Ed Reel f29a302391 Return 1 if composer.json exists, but the package doesn't. 2017-01-22 17:47:12 +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 046b1184dc Change getChangeDate call
Use the v2.0 commit resource instead of the v1.0 changeset resource.
2017-01-22 14:58:35 +01:00
Stefan Grootscholten bea4ec7f88 Some refactoring after testing hg protocol.
- Revert deletion of generateSshUrl() as this is needed when falling back on the GitDriver or HgDriver.
- Implement clean way to fallback from BitbucketDriver to GitDriver or HgDriver after previous changes.
- Implement fallback in HgBitbucketDriver like in GitBitbucketDriver.
2017-01-22 14:35:37 +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 3eeb6214eb Fix RemoteFilesystem::isPublicBitBucketDownload
The access token was added to requests to third party hosts the bitbucket api is redirecting to.
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 b3b05949bb Implement most desirable Authorization method.
As per https://developer.atlassian.com/bitbucket/api/2/reference/meta/authentication#make-requests
adding the OAuth access token in the Authorization header is desired above adding it to the URL.
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
Sven Luijten b4a77e1c0e Add full stop to all command descriptions 2017-01-11 23:08:12 +01:00
johnstevenson 9aa213b329 Work-around for Windows opcache bug, fixes #6052 2017-01-11 20:06:57 +00:00
Lauris Binde f9f92dc9d8 Fix Xdebug warning
Composer incorrectly shows Xdebug warning, even if extension is not loaded, but COMPOSER_ALLOW_XDEBUG is present.
2017-01-11 09:45:13 +01:00
Lauris Binde bca51f177e Fix Xdebug warning
Composer incorrectly shows Xdebug warning, even if extension is not loaded, but COMPOSER_ALLOW_XDEBUG is present.
2017-01-11 09:25:25 +02:00
Jordi Boggiano 285ff274ac Merge branch '1.3' 2017-01-07 18:17:36 +01:00
Pete Akins 95e9ad57d4 Don’t add github specials if there is no composer data
This can happen if an identifier doesn’t have a composer.json file (but other identifiers do)
2017-01-07 17:58:04 +01:00
Jordi Boggiano 677e75d168 Add phpdoc comment 2017-01-07 17:36:47 +01:00
Felix Becker 5f64cae860 Make PluginManager::addPlugin() public 2017-01-07 17:34:55 +01:00
johnstevenson d48d11d187 Fix scanned ini files logic 2017-01-03 19:56:16 +00:00
Jordi Boggiano 31731a06c2 Merge pull request #6023 from stof/add_property
Add missing definition of a property
2017-01-02 12:27:45 +01:00
Christophe Coevoet 4ae2aecc54 Add missing definition of a property 2017-01-02 12:12:37 +01:00
Jordi Boggiano 321361a37b Merge branch '1.3' 2017-01-02 11:32:06 +01:00
Jordi Boggiano be9abbf9f3 Override all php-* versions when php package is defined in config.platform 2017-01-02 11:31:47 +01:00
Jordi Boggiano 87b68e8c2f Merge pull request #6013 from stof/repository_schema
Implement schema validation for repositories
2016-12-31 16:42:14 +01:00
Jordi Boggiano 0bc75c3fb6 Bump memory limit to 1.5G 2016-12-31 16:29:31 +01:00
Plamen Garkov ab4322148f adding "fatal: unable to access" to authFalures 2016-12-31 16:29:12 +01:00
johnstevenson 4e53d64d4b Ignore xdebug.ini and process all files, #5995 2016-12-30 14:51:16 +00:00
Jordi Boggiano ad97b01f9c Merge pull request #6012 from stof/fix_repository
Fix the class name for fossil repositories
2016-12-30 13:53:48 +01:00
Alex Bowers e161218819 Refactored xdebughandler 2016-12-30 12:46:30 +01:00
Jordi Boggiano 2c39c43a9e Forward memory limit even if it was overwritten when restarting without xdebug, fixes #6004 2016-12-30 12:45:05 +01:00
Christophe Coevoet 6daa2afdd3 Fix the handling of references in JSON schemas when validating
References must be resolved when loading the schema, otherwise they will fail
when using them.
The easiest way is actually to let the JsonSchema library load the file itself.
2016-12-29 17:29:54 +01:00
Christophe Coevoet 978b87f7bd Fix the class name for fossil repositories 2016-12-29 15:16:39 +01:00
Jordi Boggiano 37bbf1a7c9 Merge pull request #5993 from stefangr/fix_bitbucket_dist_install_from_private_repo
Fix dist downloads from bitbucket private repos
2016-12-28 19:10:21 +01:00
Jordi Boggiano ed0829fed1 Simplify code and fix path to composer.json, refs #6001 2016-12-28 19:00:22 +01:00
Ed Reel afdae9c0e2 Do not throw InvalidArgumentException with the 'show' command if the working-dir argument is set and composer.json exists
- This prevents scripts from aborting when looping through a directory of projects
2016-12-28 18:50:47 +01:00
Jordi Boggiano 5ecd9ace59 Forward --minor-only flag to show command 2016-12-28 18:44:32 +01:00
Jordi Boggiano 6816acbe27 Merge remote-tracking branch 'johnstevenson/xdebug-#5995' into 1.3 2016-12-28 17:44:45 +01:00
Jordi Boggiano 8764876cad Avoid loading xdebug platform package twice, fixes #5995 2016-12-28 17:38:45 +01:00
Jordi Boggiano c5dcedd0db Hide warning when xdebug is explicitly allowed 2016-12-28 17:34:27 +01:00
johnstevenson 2b8ad7dc2a Clear xdebug version if restart fails, fixes #5995 2016-12-27 18:46:21 +00:00
Stefan Grootscholten d80d266201 Fix dist download from bitbucket.
URL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
results in the following $pathParts:
array(5) {
  [0]=>
  string(0) ""
  [1]=>
  string(5) "ariya"
  [2]=>
  string(9) "phantomjs"
  [3]=>
  string(9) "downloads"
  [4]=>
  string(36) "phantomjs-2.1.1-linux-x86_64.tar.bz2"
}

A dist download URL is like:
https://bitbucket.org/user/repo/get/[git-hash].zip
array(5) {
  [0]=>
  string(0) ""
  [1]=>
  string(4) "user"
  [2]=>
  string(4) "repo"
  [3]=>
  string(3) "get"
  [4]=>
  string(14) "[git-hash].zip"
}
2016-12-24 21:10:12 +01:00
Jordi Boggiano fcbc1044e0 Revert "Allow use of parent directories in PathDownloader when not mirroring the path" 2016-12-20 17:27:24 +01:00
Jordi Boggiano b2efcb1078 Update dist/source mirrors as well when updating a package's URL 2016-12-20 13:55:25 +01:00
Jordi Boggiano 51cfe3ba73 Fix whitespace in selfupdate output, fixes #5980 2016-12-19 15:37:30 +01:00
Jordi Boggiano a78d800a24 Merge pull request #5974 from cweagans/allow-parent-path-repository
Allow use of parent directories in PathDownloader when not mirroring the path
2016-12-19 10:37:09 +01:00
Jordi Boggiano 1464146629 Explicitly cast possible-null to string 2016-12-19 10:31:57 +01:00
Jordi Boggiano 1bc8b702ca Fix handling of annotated tags and prefer them over lightweight tags, fixes #5555 2016-12-18 14:50:55 +01:00
Jordi Boggiano 01885777f3 Fix case insensitivity of remove command, fixes #5973 2016-12-18 12:48:17 +01:00
Cameron Eagans 1cda8e1ef0 Allow use of parent directories in PathDownloader when not mirroring the path 2016-12-16 18:11:06 -07: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 58b94b66e5 Shorten git hashes to 10chars to avoid long lines, refs #5946 2016-12-11 16:29:20 +01:00
Jordi Boggiano 4d77ffcb4a Merge branch 'simplify-output' 2016-12-11 16:24:01 +01:00
Jordi Boggiano b0000617cc Support @php prefix for scripts to reuse the current PHP interpreter, fixes #5957 2016-12-11 16:17:34 +01:00
Jordi Boggiano 9b0ddcd9dd Merge pull request #5954 from Golodnyi/master
Not actual parameters
2016-12-11 16:16:52 +01:00
Jordi Boggiano 9d3e3ca486 Fix edge case in bitbucket driver 2016-12-09 18:05:17 +01:00
golodnyi 64f3079c53 rollback changes, since the implementation of the method "search" in the class "ComposerRepository" has parameter "type " 2016-12-08 22:53:03 +07:00
golodnyi 1cced223d8 Not actual parameters 2016-12-08 22:04:38 +07: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 3c1300bcaf Allow disabling execution of operations and lock writing independently from dryRun, closes #5787 2016-12-06 23:54:00 +01:00
Jordi Boggiano 47beefe94c Merge branch '1.2' 2016-12-06 22:03:07 +01:00
Jordi Boggiano 9ee17ef6ff Fix handling of partial package listings containing replaces/provides 2016-12-06 21:56:09 +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 58b27289d0 Do not add newlines for errors 2016-12-06 16:53:56 +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 9b730183a6 Merge branch '1.2' 2016-12-01 14:33:34 +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
Jordi Boggiano 0f276e3890 Merge pull request #5907 from Rudloff/feature/status-code
Non-zero status code when there are outdated packages (fixes #5901)
2016-12-01 14:22:22 +01:00
Rob Bast 873f17261c
try to fix test instead of guarding implementation 2016-12-01 14:03:20 +01:00