1
0
Fork 0
Commit Graph

1839 Commits (920d690d90409d3b190f2a3f05343953e1144ac4)

Author SHA1 Message Date
Jordi Boggiano 0a27ca7b65 Make sure circular dependencies do not break the autoload dumper, refs #7316, refs #7348 2018-06-06 14:51:52 +02:00
Jordi Boggiano eedbd218f5 Make sure circular dependencies do not break the autoload dumper, refs #7316, refs #7348 2018-05-31 17:02:04 +02:00
Jordi Boggiano 46f973e213 Merge branch '1.6' 2018-05-15 16:07:05 +02:00
Philipp Fritsche b0be87177d
Filter dev-dependencies from "dump-autoload --no-dev" , fixes #4343 2018-05-08 02:57:26 +02:00
Jordi Boggiano 4ebb747e12 Merge branch '1.6' 2018-05-04 11:18:18 +02:00
Jordi Boggiano 78ae0a97f7 Terminate quoted strings 2018-05-04 11:02:12 +02:00
Jordi Boggiano 3b9d6769bf Fix class names in comments being parsed in short_open_tags files, fixes #7289 2018-05-04 11:02:12 +02:00
Jordi Boggiano 464daeebe2 Merge branch '1.6' 2018-05-03 17:38:09 +02:00
Jordi Boggiano 43e33be79f Fix regression in 036fc44c25, fixes #7268 2018-05-03 17:30:33 +02:00
Jordi Boggiano 38866ba310 Merge remote-tracking branch 'johnstevenson/external-xdebug' 2018-04-13 15:38:27 +02:00
Jordi Boggiano c917865fe9 Fix handling of dev versions and consolidate logic, refs #7119 2018-04-13 13:55:02 +02:00
Jordi Boggiano 24ad6307a7 Merge remote-tracking branch 'austris-argalis/issue-7085' 2018-04-13 13:11:46 +02:00
Jordi Boggiano ea78712822 Merge branch '1.6' 2018-04-13 10:52:23 +02:00
Edwin Rodríguez 9dc6222288 Allow using fossil dependency in a fossil repository, fixes #7125, closes #7126 2018-04-13 09:00:03 +02:00
Jordi Boggiano 35ebb8b93f Merge branch '1.6' 2018-04-12 19:22:50 +02:00
Filippo Tessarotto 277f32d388 Lock _readme: remove outdated hashtag link part, closes #7096 2018-04-12 18:00:01 +02:00
Jordi Boggiano 2bd34c0534 Merge branch '1.6' 2018-04-12 17:01:00 +02:00
Jordi Boggiano 9041622b86 Fix version guessing regression and a few other issues, fixes #7127 2018-04-12 15:16:39 +02:00
Jordi Boggiano bfa01285c2 Merge branch '1.6' 2018-04-12 10:25:03 +02:00
Jordi Boggiano 066351c5b9 Remove use of deprecated getMock method 2018-04-12 10:24:56 +02:00
Jordi Boggiano 036fc44c25 Make sure aliased packages are removed correctly from the repository, fixes #7167 2018-04-12 09:51:01 +02:00
Petr /Peggy/ Sládek 8d06832077 Update ClassMapGenerator to work better with symlinks, fixes #7252, closes #7251 2018-04-12 09:37:26 +02:00
johnstevenson ed97c2116c Use external XdebugHandler library 2018-03-08 19:20:16 +00:00
austris argalis 8a5645ffda Wording: Downgrading instead of Updating #7085 2018-02-16 00:38:41 +02:00
Jordi Boggiano 16dcb04e1d Merge branch '1.6' 2018-01-24 10:28:44 +01:00
Jordi Boggiano a1bf6890d5 Fix ConsoleIO tests 2018-01-24 10:28:39 +01:00
Jordi Boggiano 96d07e6753 Merge branch '1.6' 2018-01-22 16:44:24 +01:00
Jordi Boggiano 842a7ea922 Fix dev-master not being normalized correctly for the root package, fixes #7007 2018-01-22 16:44:17 +01:00
Jordi Boggiano ad8b44a4c8 Merge branch '1.6' 2018-01-22 15:42:56 +01:00
Jordi Boggiano ea9b7ecbb0
Merge pull request #6982 from carusogabriel/phpstan
Fixes from PHPStan level 0
2018-01-22 14:50:43 +01:00
Jean-Baptiste 595cf4432c Fix Test RepositoryFactory 2018-01-22 14:06:56 +01:00
Martin Hujer bbee0d7c6c Validation warns if script description for nonexistent script is present
Fixes #7010
2018-01-17 19:15:06 +01:00
Gabriel Caruso 3d262bd637 Fixes from PHPStan level 0
More fixes from PHPStan level 0
2018-01-14 11:44:15 -02:00
Tomas Klinkenberg 60106edd32 Added a test to confirm issue #6994.
Added a encapsulated group to the replacement parameter of the `preg_replace` for GitLab in `\Composer\Util\Url::updateDistReference()`. This fixes #6994.
2018-01-09 17:57:22 +01:00
Jordi Boggiano e6114b2ca7 Fix support for replacing dist refs in gitlab URLs and add support for gitlab/github enterprise too 2018-01-05 15:20:30 +01:00
Gabriel Caruso 2ad6f611d7 Allow bin key to receive string 2018-01-02 07:00:55 -02:00
Andreas Möller 79828f7543
Enhancement: Assert that key is removed when value is null 2017-12-28 21:11:54 +01:00
Jordi Boggiano 50665aa18d Simplify check for current revision, refs #6684 2017-12-19 17:50:02 +01:00
Jordi Boggiano 93cd9d874b Merge remote-tracking branch 'RobberPhex/git-repo' 2017-12-19 15:47:58 +01:00
John Stevenson 02fbbd5a42 Skip MockedZipDownloader tests if zip is missing (#6917)
* Skip MockedZipDownloader tests if zip is missing
2017-12-19 11:07:09 +01:00
Jordi Boggiano a1c5754b1f Make sure tests run non-interactively 2017-12-18 17:18:59 +01:00
Jordi Boggiano c8aea719b1 CS fixes 2017-12-18 16:02:48 +01:00
Jordi Boggiano 0a9abeef88 Merge branch '1.5' 2017-12-17 15:05:08 +01:00
Renoir Boulanger 9f723ba381 Support GitLab repositories w/ port over HTTPs
When we have self-hosted GitLab, over HTTPs, on a different port.

rel composer/composer#6894
2017-12-17 13:59:08 +01:00
Alessandro Lai 54adf0b61e Add regression test about VersionGuesser pretty_version handling 2017-12-17 13:49:07 +01:00
Gabriel Caruso 885da4c8ef Refactoring tests 2017-12-03 02:41:58 -02:00
Gabriel Caruso afc9a7643e Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase 2017-11-30 13:44:43 -02:00
Gabriel Caruso a4b220273e Refactoring Tests (#6849) 2017-11-30 15:58:10 +01:00
Jordi Boggiano 6256e17149 Merge branch '1.5' 2017-11-30 15:19:19 +01:00
Jordi Boggiano 5ba6d7d436 Fix pretty guessed versions to show nicely on numeric branches, refs #6845 2017-11-30 15:19:11 +01:00
Alessandro Lai 3cf31da414 Fix root package not having a pretty version when detecting from VCS, fixes #6845, closes #6847 2017-11-30 15:07:08 +01:00
Jordi Boggiano eab826b00b Merge branch '1.5' 2017-11-29 16:37:49 +01:00
Jordi Boggiano 45cd26b2df Fix test and actually check that we get hasAuthentication called for different domains 2017-11-29 16:37:00 +01:00
Jordi Boggiano 9850621c6b
Merge pull request #6788 from GawainLynch/symfony-4
Symfony 4
2017-11-28 18:30:31 +01:00
Jordi Boggiano 0b3bc4ccb9 Merge branch '1.5' 2017-11-28 18:09:36 +01:00
johnstevenson b0922b95af Report multiple inis in php.ini specific messages
Where systems use multiple ini files it is perhaps more useful to
suggest running `php --ini` to see their locations, rather than showing
the loaded php.ini (if one exists).
2017-11-28 18:09:08 +01:00
Nils Adermann 7dffe79a0f Update tests of solver problem message to match new message 2017-11-16 12:41:41 +01:00
Robert Lu 3ce71a55bf fix unittest 2017-11-07 13:54:52 +08:00
Gawain Lynch f74c6f4620
Update tests to handle optional QuestionHelper::setInputStream() availability 2017-11-06 16:32:29 +01:00
Gawain Lynch 157075b996
Migrate ConsoleIO::select to use QuestionHelper and ChoiceQuestion 2017-11-06 16:29:55 +01:00
Jordi Boggiano 26a50b3762 Merge branch '1.5' 2017-11-03 19:53:36 +01:00
Jordi Boggiano 4ab34c22fa
Merge pull request #6740 from croensch/master
also support NO_PROXY
2017-11-03 19:50:28 +01:00
Jérôme Vasseur 71c2ecbace Fix platform package detection in VersionParser 2017-11-03 19:48:52 +01:00
Jordi Boggiano 9a99e86ebc Rename NonRoot to Transitive, refs #6674 2017-11-03 14:35:04 +01:00
Jordi Boggiano 9df22654c3 Merge remote-tracking branch 'grasmash/issue-6661-whitelist-all-deps' 2017-11-03 14:20:38 +01:00
croensch 6da92e98ac also support NO_PROXY
since WINDOWS can only have one case and that is usually upperase
2017-10-12 16:35:05 +02:00
Matthew Grasmick 776977f597 Fixing method name. 2017-09-11 13:53:56 -04:00
Vladimir Reznichenko c8615358cb SCA with PHP Inspections (EA Extended) 2017-09-11 19:40:43 +02:00
Matthew Grasmick 11db6f90c2 Cleaning up comments 2017-09-11 12:56:51 -04:00
Matthew Grasmick 3826e51caa Renaming some methods and props. 2017-09-11 12:38:54 -04:00
Matthew Grasmick ad465aa769 Updating var names. 2017-09-11 11:47:33 -04:00
Matthew Grasmick 21722f6e42 Fixing test version constraints. 2017-09-11 11:32:19 -04:00
Matthew Grasmick f29e98cdf9 Fixes #6661: Allow a given package and its dependencies (including siblings) to be updated. 2017-09-11 11:16:15 -04:00
Jordi Boggiano dae575c197 Merge branch '1.5' 2017-09-11 16:09:36 +02:00
Deamon 3d753b117b add test on remove mainkey at end of file 2017-09-11 16:07:13 +02:00
Jordi Boggiano a8df30c09b Merge branch '1.5' 2017-09-11 12:16:16 +02:00
Mikk Tendermann 2a89d37651 fix gitlab not telling visibilty if user is not logged in 2017-09-11 10:37:32 +02:00
Christian Ramelow f178c340e9 Fixed tests. 2017-09-01 20:47:13 +02: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 e33d00f98e Fix gitlab tests 2017-08-18 14:14:15 +02:00
Jordi Boggiano f420d31233 Fix application test 2017-08-08 10:43:26 +02:00
Jordi Boggiano a6c4fb2dcf Fix gitlab tests 2017-08-08 10:26:35 +02:00
Jordi Boggiano c89f6338c2 CS tweaks, refs #6592 2017-08-08 10:11:35 +02:00
Helmut Januschka ae42e4f8a3 php 5 2017-08-07 22:00:14 +02:00
Helmut Januschka bc4a7834ba php 5 being php5 :/ 2017-08-07 21:56:02 +02:00
Helmut Januschka b847270d08 rename test method 2017-08-07 21:47:41 +02:00
Helmut Januschka b486056066 add tests for gitlab paging 2017-08-07 21:46:43 +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 6832eacb01 Update GitLab API usage to v4, fixes #6453 2017-08-07 13:13:24 +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
Sergey Shcherbin 118abacd14 Fix for time format in GitBitbucketDriver test 2017-08-06 12:40:47 +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
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