1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Commit graph

10462 commits

Author SHA1 Message Date
Jordi Boggiano
3577070efa
Fix docblocks 2020-07-17 16:15:19 +02:00
Jordi Boggiano
23339e44b8
Fix alias tests to use default-branches 2020-07-17 16:15:19 +02:00
Yanick Witschi
6ba0f3adf9 Merge branch 'master' into filter-packages
* master: (59 commits)
  Update deps
  Reuse repository manager and others directly from the Composer instance, refs #9057
  Fix usage of create-project with local filesystem repos
  Fix return value
  Add support for multiple --repository additions in create-project, and make --add-repository delete the lock file, fixes #8853
  Remove cygwin php handling in UAC elevation
  Clean up a little to make impl less invasive and to handle replacers/providers
  Supply event dispatcher in Create Project Command
  Avoid attempting to use /etc/xdg as base config home, fixes #9053, refs #9045
  Create an issue @ Docker repository on tag
  Mark transaction classes internal, refs #8827
  Prepare 1.10.9 release
  Remove highest/lowest builds for 1.10 maintenance branch
  Fix bitbucket detection of redirects to login page, fixes #9041
  Fix doc comment
  Fixed spelling mistake
  Add Windows UAC elevation to self-update command
  GitLab: clarify interactive auth prompt
  Improve support for XDG and default to XDG config dir if both that and ~/.composer are available, fixes #9045
  Fix #9033 - inconsistent behavior with minor-only flag
  ...
2020-07-17 14:30:12 +02:00
Jordi Boggiano
c3028c02d9
Merge branch '1.10' 2020-07-17 13:18:02 +02:00
Jordi Boggiano
a474dee236
Merge remote-tracking branch 'johnstevenson/elevate2' into 1.10 2020-07-17 13:01:24 +02:00
Jordi Boggiano
ff7f9dcf2d
Update deps 2020-07-17 13:00:41 +02:00
Jordi Boggiano
eac03e16e7
Reuse repository manager and others directly from the Composer instance, refs #9057 2020-07-17 12:05:07 +02:00
Jordi Boggiano
1d3af13c22
Merge remote-tracking branch 'logicalor/create-project-event-dispatcher' into 1.10 2020-07-17 11:44:02 +02:00
Jordi Boggiano
433968de17
Fix usage of create-project with local filesystem repos 2020-07-17 11:30:03 +02:00
Jordi Boggiano
201533e16f
Fix return value 2020-07-17 11:05:57 +02:00
Jordi Boggiano
a2ab6f2b54
Add support for multiple --repository additions in create-project, and make --add-repository delete the lock file, fixes #8853 2020-07-17 10:38:46 +02:00
johnstevenson
8ddbae358d Remove cygwin php handling in UAC elevation
When called from a native shell and using cygwin PHP, cygpath translates
`/tmp` to `User\AppData\Local\Temp`, rather than `/cygdrive/.../tmp`.
This change does not affect using windows PHP from a Cygwin shell.
2020-07-16 17:20:12 +01:00
Jordi Boggiano
942562c382
Clean up Zip Util to be more strict about what is a valid package archive, fixes #8931 2020-07-16 17:36:46 +02:00
Jordi Boggiano
37b1e0fffd
Merge pull request #8955 from tlamy/OutdatedNoDevOption
Outdated/Show: no dev option
2020-07-16 15:40:09 +02:00
Jordi Boggiano
6869a1a5cb
Clean up a little to make impl less invasive and to handle replacers/providers 2020-07-16 15:37:12 +02:00
Shaun Johnston
b4ecca5d0b Supply event dispatcher in Create Project Command
This update allows composer plugins to intercept the
create-project command to inject additional functionality such as
providing additional remote filesystem handling.
2020-07-16 23:34:30 +10:00
Jordi Boggiano
7cecc6ad3f
Avoid attempting to use /etc/xdg as base config home, fixes #9053, refs #9045 2020-07-16 14:59:49 +02:00
Rob Bast
11892070d1
Create an issue @ Docker repository on tag 2020-07-16 14:48:16 +02:00
Jordi Boggiano
89d35af83d
Mark transaction classes internal, refs #8827 2020-07-16 13:59:49 +02:00
Jordi Boggiano
8dae1dd45a
Merge branch '1.10' 2020-07-16 13:05:17 +02:00
Jordi Boggiano
bf59f536d6
Prepare 1.10.9 release 2020-07-16 12:53:45 +02:00
Jordi Boggiano
eec2f8d423
Remove highest/lowest builds for 1.10 maintenance branch 2020-07-16 12:37:54 +02:00
Jordi Boggiano
8b934a415f
Merge branch '1.10' 2020-07-16 12:27:00 +02:00
Jordi Boggiano
6cb4dc41b8
Fix bitbucket detection of redirects to login page, fixes #9041 2020-07-16 12:26:48 +02:00
johnstevenson
57f91d01c7
Fix doc comment 2020-07-16 11:53:55 +02:00
johnstevenson
272654d6e2
Fixed spelling mistake 2020-07-16 11:53:55 +02:00
johnstevenson
cae913c434
Add Windows UAC elevation to self-update command
If self-update fails on Windows due to file permission issues, a .vbs
script is used to elevate a call to the cmd.exe `move` command.
Unfortunately it is not possible to know if the user cancelled the UAC
prompt using this method - it is possible using a Powershell script, but
flashing hidden windows make this a less desirable option.

The only downside is that a UAC invoked process is asynchronous, so a
300 millisecond timeout is used to allow cmd.exe to do its stuff.
Therefore if the OS is busy the script may finish first and incorrectly
report that the file has not been written.
2020-07-16 11:53:55 +02:00
Jordi Boggiano
a585c65a12
Merge pull request #9042 from glaubinix/t/gitlab-token-creation
GitLab: clarify interactive auth prompt
2020-07-16 11:25:22 +02:00
Stephan
fb0ad7c900 GitLab: clarify interactive auth prompt 2020-07-15 16:18:21 +01:00
Jordi Boggiano
870fdc59df
Merge remote-tracking branch 'tomekpryjma/fix-issue-9033' 2020-07-15 17:02:16 +02:00
Jordi Boggiano
10590dc519
Improve support for XDG and default to XDG config dir if both that and ~/.composer are available, fixes #9045 2020-07-15 10:56:13 +02:00
Tomek
23c32ed6d3 Fix #9033 - inconsistent behavior with minor-only flag 2020-07-14 23:06:20 +01:00
Jordi Boggiano
92ef439666
Merge branch '1.10' 2020-07-07 21:12:27 +02:00
Jordi Boggiano
d2d3aa8494
Fix parsing of # in funding links, fixes composer/packagist#1097, closes #9035 2020-07-07 21:12:04 +02:00
Jordi Boggiano
d7b1248508
Create pool before reading package ids as the pool creation reassigns package ids, fixes #9034 2020-07-04 12:00:37 +02:00
Jordi Boggiano
212fbc516e
Fix test issues 2020-07-02 08:12:25 +02:00
Jordi Boggiano
1fa6f4c83c
Add a default signal handler to avoid having the SIGINTs ignored, fixes #9027 2020-07-01 11:37:38 +02:00
Jordi Boggiano
ee4afa29e7
Include dev packages in locked package listings for show command 2020-07-01 11:17:52 +02:00
Jordi Boggiano
70f211923b
Add support for list URL in composer repos, fixes #9009 2020-07-01 11:16:38 +02:00
Jordi Boggiano
45f228a375
Merge pull request #9029 from Ayesh/markdown-grammar
Multiple grammar fixes in markdown files
2020-07-01 10:02:33 +02:00
Ayesh Karunaratne
6e3efabbfc
Multiple grammar fixes in markdown files 2020-07-01 02:43:13 +07:00
Jordi Boggiano
a10b3ca9e9
Merge pull request #9026 from alcohol/feature/docker-repository-issue-on-tag
Create an issue @ Docker repository on tag
2020-06-29 15:35:07 +02:00
Rob Bast
351dcd1c64
Create an issue @ Docker repository on tag 2020-06-29 14:22:11 +02:00
Jordi Boggiano
1824637dab
Merge pull request #8999 from naderman/fix-solver-bug-exception-7051
Fix solver bug exception 7051
2020-06-27 23:50:55 +02:00
Nils Adermann
3d2d33dd58 Solver: Add missing rules and replace some with %A for pcre length limit 2020-06-26 22:11:13 +02:00
Nils Adermann
3f5dde9873 Solver: Ensure multi conflict rules still get added to learned pool 2020-06-26 22:04:17 +02:00
Nils Adermann
de3931c742 Revert "Remove unnecessary duplicate rule output from expected test result"
This reverts commit c78eb49b5e.
2020-06-26 22:03:18 +02:00
Nils Adermann
edef748169 Solver: Clarify when/why undecided literals can get skipped in analyze 2020-06-26 21:55:03 +02:00
Nils Adermann
851050e85c Solver: multiconflict analyze handles positive decision same as regular literal 2020-06-26 21:51:02 +02:00
Nils Adermann
6e05345be7 Solver: Move analyze handling of multiconflict rule to clearer location
This way we're not looking at the previous decision at the top of the
loop but working with the current decision at the bottom
2020-06-26 21:51:02 +02:00