Jordi Boggiano
86a911150b
Update bundled CAfile and other cleanups
2016-01-10 16:54:44 +00:00
Jordi Boggiano
f8dff0867c
Remove --disable-tls/--cafile flags and rely solely on config options plus some wording clarifications
2016-01-10 16:37:11 +00:00
Jordi Boggiano
5d015defb8
Merge remote-tracking branch 'origin/master' into tls-config
2016-01-10 16:10:22 +00:00
Jordi Boggiano
b056d9ae42
Avoid double xdebug warning with global command
2016-01-10 13:02:20 +00:00
Jordi Boggiano
633e9f91a1
Small tweaks for consistency, refs #3639
2016-01-10 12:35:39 +00:00
Jordi Boggiano
721acf3c93
Merge remote-tracking branch 'SofHad/update-interactive'
2016-01-10 12:09:10 +00:00
Jordi Boggiano
bda2c0f9b7
Re-enable include path even when classmap authoritative is present, refs #4556
2016-01-09 19:12:26 +00:00
Jordi Boggiano
e05207dbad
Merge remote-tracking branch 'bp1222/save-loads'
2016-01-09 19:10:39 +00:00
Jordi Boggiano
e8bc9232e0
Add explanation about match args in the "no installed package" output, refs #4663
2016-01-09 18:22:59 +00:00
Jordi Boggiano
42cb3dafc4
Merge remote-tracking branch 'Soullivaneuh/depends-replaces'
2016-01-09 18:19:49 +00:00
Jordi Boggiano
4fbf15e6d6
Tweaks and add new args to docs, refs #4663
2016-01-09 18:16:58 +00:00
Jordi Boggiano
9e42eedf1f
Merge remote-tracking branch 'Soullivaneuh/depends-match-constraint'
2016-01-09 18:11:03 +00:00
Jordi Boggiano
5dbc8fa30b
Make sure getRepoConfig is only called on VcsRepos, refs #4700
2016-01-09 18:01:48 +00:00
Jordi Boggiano
f874842535
Merge remote-tracking branch 'chorry/4331-svn-creds'
2016-01-09 17:59:54 +00:00
Jordi Boggiano
47b05eab7a
Fix type errors
2016-01-09 17:59:22 +00:00
Jordi Boggiano
dbe7f34181
Allow depend command to show results for platform packages, fixes #3836 , fixes #4696
2016-01-09 17:21:01 +00:00
Jordi Boggiano
fd7267e4ad
Show overridden versions (as well as original) in composer show -p
2016-01-09 17:18:37 +00:00
Jordi Boggiano
1a8aedaa9d
Assume -i when running composer show --tree without arg
2016-01-09 17:04:07 +00:00
Jordi Boggiano
764de14b5e
Add caching to bitbucket API requests
2016-01-07 14:56:48 +00:00
Jordi Boggiano
64b0d72183
Add missing git fallback function in gitlab driver
2016-01-06 12:32:28 +00:00
Markus Staab
5752559ae8
fixed typo
2015-12-28 15:20:42 +01:00
Jordi Boggiano
f31799b739
Fix error output of the psr-4 trailing backslash validation
2015-12-27 13:58:20 +00:00
Jordi Boggiano
94136e0d4f
Merge remote-tracking branch 'hanovruslan/add-sort-packages-into-config'
2015-12-22 20:43:36 +00:00
Rob
a6beb7f53d
Merge pull request #4698 from WouterJ/patch-1
...
Improve error message about platform php version
2015-12-21 08:37:23 +01:00
Wouter J
d0e4c5f71e
Use "value" instead of "setting"
2015-12-19 12:15:01 +01:00
hanov.ruslan
b298b9e8c6
Added sort-packages into config
2015-12-18 23:13:36 +03:00
Jordi Boggiano
c9501a4cc1
Update dependencies, fixes #4706
2015-12-16 18:51:41 +00:00
Jordi Boggiano
29312be4df
Strict typing fixes
2015-12-16 17:48:12 +00:00
Alexander Loutsenko
f42ba46175
#4331 use --no-auth-cache for svn downloader when such option was set
2015-12-14 15:23:15 +03:00
Wouter J
b156ad0345
Improve error message
2015-12-12 12:19:26 +01:00
Jordi Boggiano
43f7b762e5
Revert "[ClassLoader] performance improvement: use str_replace instead of strtr"
2015-12-09 15:46:46 +00:00
Rob
44bc8e019f
Merge pull request #4672 from Tobion/patch-1
...
[ClassLoader] performance improvement: use str_replace instead of strtr
2015-12-07 17:56:35 +01:00
Sullivan SENECHAL
e0031ed4a2
Add match-constraint options to depends command
2015-12-07 15:36:18 +01:00
Sullivan SENECHAL
5d625c2231
Improve PHPDoc for package requires
2015-12-07 15:28:22 +01:00
Sullivan SENECHAL
0eb7e2f216
Add --with-replaces option on depends command
2015-12-06 16:50:24 +01:00
Tobias Schultze
a76ce9b25a
[ClassLoader] no need to call str_replace on Windows
2015-12-04 15:15:36 +01:00
Tobias Schultze
314741c1ec
[ClassLoader] use str_replace instead of strtr
2015-12-04 14:33:04 +01:00
Jordi Boggiano
feefd51565
Fix custom installer example, fixes #4648
2015-12-03 16:17:58 +00:00
Michal Gebauer
ce74477899
Configuration of GitLab driver
2015-12-03 14:30:07 +01:00
Michal Gebauer
611f9dcfe2
Reordered keys gitlab comes after github
2015-12-03 14:24:26 +01:00
Rob
dc5f8cfbaa
Merge pull request #4659 from mishak87/patch-1
...
Could not configure gitlab-oauth via CLI #3765
2015-12-03 11:43:39 +01:00
Sullivan SENECHAL
d8975b5cb1
Depends command: Add phpdoc blocks for IDE completion
2015-12-02 07:58:08 +01:00
Michal Gebauer
7517a99b1c
Could not configure gitlab-oauth via CLI #3765
2015-12-01 20:29:29 +01:00
Jordi Boggiano
dc06276179
Remove publish errors from diagnose command output, fixes #4652
2015-12-01 14:57:35 +00:00
Jordi Boggiano
6d9e04c0e9
Tweak regex usage
2015-11-30 14:12:29 +00:00
Jordi Boggiano
ddd85afd32
Merge pull request #4633 from jaapio/feature/gitlabInstallPath
...
Adds support for gitlab installed in subfolder
2015-11-30 13:49:50 +00:00
Jaapio
df92cb09ab
extract regex to const. To be able to reuse it
2015-11-29 13:59:54 +01:00
Jérémy Romey
94daedde06
Fixed typo in the ShowCommand
2015-11-27 14:39:00 +01:00
Sullivan SENECHAL
d9a62ffd50
Improve PHPDoc for package links
2015-11-27 12:51:04 +01:00
Jordi Boggiano
9b8a14179b
Only list tree of packages required by root and not every installed package individually, refs #2600
2015-11-27 10:28:57 +00:00
Jordi Boggiano
e6e636802f
Add support for a simplified pure ASCII version of the tree view, refs #2600
2015-11-27 01:31:50 +00:00
Jordi Boggiano
92ad33d11e
Undo some invalid merges and simplify code a little bit, refs #2600
2015-11-27 00:54:16 +00:00
Jordi Boggiano
a79d0ab886
Merge remote-tracking branch 'jeremyFreeAgent/feature/tree'
2015-11-27 00:10:04 +00:00
Jordi Boggiano
45a3db8877
Merge pull request #4638 from realshadow/configurable_repository
...
Allows repositories to implement ConfigurableRepositoryInterface
2015-11-26 23:38:03 +00:00
Jordi Boggiano
c5e5bc6fc6
Merge pull request #4589 from dunglas/patch-1
...
Update the autoloader PHPDoc: PSR-4 instead of PSR-0
2015-11-26 12:37:30 +00:00
Kévin Dunglas
6c5c53c362
Update the PHPDoc: The autoloader supports PSR-0, PSR-4 and classmap.
2015-11-26 13:30:47 +01:00
Jordi Boggiano
8072448cf3
Adjust deduplication of files autoloads, refs 9710b26d3f
2015-11-26 10:39:16 +00:00
Jérémy Romey
36271a7dd1
Added a tree view of required packages
2015-11-26 11:06:09 +01:00
Lukáš Homza
5b748eda6c
Allows repositories to implement ConfigurableRepositoryInterface and thus provide getRepoConfigmethod
2015-11-23 23:18:24 +01:00
Jaapio
b471440ea0
Adds support for gitlab install in subfolder
...
Since gitlab can be hosted on any url also subdirectories should be
supported. (e.g https://mycompany.com/gitlab ).
This supports only http and https protocols since the gitlab api url
is derived from the package repository url. And the ssh protocol doesn't
support folders this way.
2015-11-23 22:05:37 +01:00
Jordi Boggiano
fbab2bfa17
Move user agent definition to StreamContextFactory so it is available in all contexts
2015-11-23 15:12:33 +00:00
Artur Eshenbrener
cf593351ef
Bypass `runScripts` parameter to autoload dumper in `Installer:run()` method
2015-11-23 11:57:45 +03:00
Jordi Boggiano
f084b1e053
Remove duplicate handling of retry-auth-failure option, refs #3765
2015-11-21 21:51:58 +00:00
Jordi Boggiano
020c126c27
Fix CS
2015-11-21 21:51:43 +00:00
Jordi Boggiano
a10bffec0e
Merge remote-tracking branch 'GromNaN/gitlab'
2015-11-21 21:48:46 +00:00
Jordi Boggiano
977b8c8f41
Fix loading error when plugin is a final class, fixes #4482
2015-11-21 20:35:00 +00:00
Jordi Boggiano
7a06615bf0
Add env var to disable xdebug warnings, refs #4622
2015-11-21 20:06:31 +00:00
Jordi Boggiano
966a982738
CS fixes
2015-11-21 19:28:10 +00:00
Jordi Boggiano
67a1924173
Merge remote-tracking branch 'Rudloff/xz'
2015-11-21 19:16:59 +00:00
Jordi Boggiano
1fe690f810
Autoload generator cleanups
2015-11-21 18:33:17 +00:00
Jordi Boggiano
3748c11709
Simplify files autoload include function, and make sure files are included once per package even if exactly the same, refs #4186
2015-11-21 18:30:44 +00:00
Jordi Boggiano
9710b26d3f
Merge remote-tracking branch 'jeskew/feature/require_files_but_once'
2015-11-21 17:31:05 +00:00
Jordi Boggiano
c0b49d09f3
Merge remote-tracking branch 'cw-ozaki/no-script-dump-autoload'
...
Conflicts:
src/Composer/Autoload/AutoloadGenerator.php
src/Composer/Command/DumpAutoloadCommand.php
2015-11-21 17:14:33 +00:00
Jordi Boggiano
cb3d9527e1
Avoid some external process calls when creating the global composer instance, saves a few ms of initialization time
2015-11-21 02:42:41 +00:00
Jordi Boggiano
1fca6be3bf
Fix detection of the root package version to always use the correct cwd
2015-11-21 02:35:40 +00:00
Jordi Boggiano
e87190e3da
Detect duplicate keys in composer.json, fixes #4620
2015-11-21 02:35:00 +00:00
Jordi Boggiano
dbcf8cae13
Fix depends command to also show when the root package depends on something
2015-11-19 17:42:08 +00:00
Jordi Boggiano
bd76506dd8
Disable plugin registration during the whole run when running with --no-plugins, fixes #3910
2015-11-19 17:38:25 +00:00
Jordi Boggiano
cf6cd83335
Use writeError for xdebug warning and fix running test suite with xdebug
2015-11-19 17:37:32 +00:00
Jordi Boggiano
d98b134dc3
Fix removal of packages installed in custom path with custom installers not overriding uninstall, fixes #2232
2015-11-19 16:36:19 +00:00
Jordi Boggiano
4071b09091
Merge pull request #4615 from staabm/xdebugwarn
...
add a warning when xdebug is loaded while running composer commands
2015-11-19 14:47:52 +00:00
Markus Staab
a59f0a7ca8
add a warning when xdebug is loaded while running composer commands
2015-11-19 13:57:57 +01:00
Jordi Boggiano
f5e0fc14b3
Clarify some error messages, fixes #3770
2015-11-18 18:53:33 +00:00
Jordi Boggiano
690c7f572f
Enable -f flag based on user selection and not only config values, refs #3789
2015-11-18 16:23:41 +00:00
Steve Buzonas
27d51642c8
stash untracked and force checkout if discarding changes
2015-11-18 16:23:40 +00:00
Markus Staab
9f5efc3091
added a troubleshooting link in case of out-of-memory errors
2015-11-17 16:25:33 +01:00
Jordi Boggiano
6f29df01d2
Fix updir regex matching, refs #4607
2015-11-14 15:44:30 +00:00
Jordi Boggiano
f674261b96
Merge remote-tracking branch 'ockcyp/exclude-classmap-parent'
2015-11-14 15:33:55 +00:00
Jérôme Tamarelle
4255db9e31
Allows SSH urls for gitlab and detect the scheme
...
SSH urls uses HTTPS to request the API
2015-11-14 16:05:05 +01:00
Jordi Boggiano
4b269f4ded
Follow stability option in create-project to select the best possible version, refs #4563
2015-11-14 15:04:04 +00:00
Jordi Boggiano
adc0bbeeb9
Forward args/flags down to referenced events
2015-11-14 14:02:47 +00:00
Jordi Boggiano
24ccaa328d
Tweak output of calls to script references, refs #4592
2015-11-14 13:52:26 +00:00
Jordi Boggiano
db5ef12540
Merge remote-tracking branch 'giosh94mhz/script_groups'
2015-11-14 13:47:09 +00:00
Jordi Boggiano
6c9b161c43
Re-use locker content hash logic to generate dist reference, refs #4515
2015-11-14 13:30:37 +00:00
Jordi Boggiano
f0a0ce5e98
Merge remote-tracking branch 'joelwurtz/patch-1'
2015-11-14 13:29:24 +00:00
Jérôme Tamarelle
ac68a721f4
Merge remote-tracking branch 'composer/master' into gitlab
...
Conflicts:
doc/04-schema.md
src/Composer/Util/RemoteFilesystem.php
2015-11-14 14:13:39 +01:00
Jerome TAMARELLE
6ccc562c0f
Add tests on GitLab class (copied from GitHubTest)
2015-11-13 18:50:50 +01:00
Jerome TAMARELLE
db056b8383
Fix retry authentification on gitlab oauth
2015-11-13 18:36:29 +01:00
Jerome TAMARELLE
211d4632bb
Fix compatibility with PHP 5.3
2015-11-13 18:06:17 +01:00
Omer Karadagli
4046ae042d
Up-level relative paths in exclude-from-classmap
2015-11-12 15:53:47 +00:00
Jordi Boggiano
2a8a9a4592
Revert "Issue #2384 allow 'prefer-stable' and 'minimum-stability' to be set via composer config command"
...
This reverts commit ed23b1c4db
.
2015-11-11 15:33:58 +00:00
Jordi Boggiano
58a6d4b7d3
Add comment
2015-11-10 16:35:29 +00:00
David Fuhr
064e1a6d6d
Fix handling of http 400 errors
...
Before 400 errors were silently dropped. This caused composer to store
the returned body (usually some html) in cache. This resulted in later
errors when composer tried to extract this error response as zip.
With this exceptions thrown it handles the error gracefully and falls
back to the next URL provided by the package configuration.
2015-11-10 16:30:01 +01:00
Jordi Boggiano
d35fc31f62
Add process error to the output of failed unzipping
2015-11-10 13:29:51 +00:00
Jordi Boggiano
fc0da27d84
Add more debug output when writing to cache
2015-11-10 13:12:53 +00:00
Giorgio Premi
fd0026b542
Detect infinite script call recursion
2015-11-09 15:34:11 +01:00
Giorgio Premi
a25492d1b9
Allow composer script call with @ syntax
2015-11-09 15:34:11 +01:00
Rob Bast
991d25115f
fixes #4562
2015-11-05 18:47:30 +01:00
Shawn Tunney
54584e6b0f
Have xcopy overwrite existing files
2015-11-04 10:46:27 -05:00
Jordi Boggiano
2d24ed8e74
Improve error reporting
2015-11-03 20:37:11 +00:00
Pierre Rudloff
3abad250e9
.tar.xz downloader
2015-10-31 18:18:11 +01:00
annesosensio
2e4157145b
Made wildcard expansion consistent with bash
2015-10-30 21:30:50 +01:00
Jordi Boggiano
ac1a0c898d
Add exclude-from-classmap support in validation
2015-10-30 20:04:25 +00:00
Jordi Boggiano
6c16510743
Add support for wildcards in exclude-from-classmap, refs #1607
2015-10-30 19:12:30 +00:00
Jordi Boggiano
f1b0c073ad
Tweaked exclude-from-classmap: windows support, normalize paths and make sure they are all package-relative and do not leak to other packages, refs #1607
2015-10-30 00:22:04 +00:00
Jordi Boggiano
084f6de24e
Merge remote-tracking branch 'trivago/add_exclude'
...
Conflicts:
doc/04-schema.md
src/Composer/Autoload/AutoloadGenerator.php
2015-10-30 00:00:44 +00:00
Jordi Boggiano
ef2856ef55
Take php version into account for create-project command version selection
2015-10-29 22:35:30 +00:00
Rob
c7ed232ef4
Merge pull request #4529 from jeroenseegers/warn-on-commit-reference
...
Generate a warning when a commit reference is used
2015-10-29 10:52:59 +01:00
xelan
32517d90d2
Escape angle brackets for commit message output
2015-10-29 09:01:28 +01:00
David Walker
e0a6419992
When classmap authoratative is enabled, there should be no reason to load 3 files, and process them when autoloader will return false
2015-10-28 14:29:36 -06:00
Jordi Boggiano
599ad77167
Merge pull request #4542 from bd808/feature/support-merge-plugin
...
Allow easier manipulation of RootAliasPackage
2015-10-28 03:45:57 +00:00
Jordi Boggiano
6582c337d0
Fix typo
2015-10-28 00:06:21 +00:00
Jordi Boggiano
8e99cec3e7
Fix ref to findShortestPath
2015-10-28 00:04:33 +00:00
Bryan Davis
dc40bf9f51
Remove unused local variables from AliasPackage
2015-10-27 14:44:57 -06:00
Bryan Davis
06c44ce998
Add setters used by composer-merge-plugin to RootPackageInterface
...
Extend RootPackageInterface with setter functions used by
composer-merge-plugin and implement them for RootAliasPackage. This will
allow composer-merge-plugin and similar code that manipulates the root
package at runtime to ignore the difference between a RootPackage and
a RootAliasPackage.
2015-10-27 14:43:29 -06:00
Jordi Boggiano
193a072d3c
Clarify that the abstract constraint should not be relied upon anymore
2015-10-27 19:13:50 +00:00
Bryan Davis
2eb0af264b
Allow RootAliasPackage to override cached values
...
AliasPackage caches the values of 'requires', 'devRequires',
'conflicts', 'provides', 'replaces' locally to allow `self.version`
references to be properly updated to reference the alias. Plugins like
composer-merge-plugin that manipulate these settings at runtime need to
be able to change the values after alias construction.
2015-10-27 12:36:13 -06:00
Jordi Boggiano
1160b782c8
Deduplicate classmap creation and add support for loading classmaps on the fly for plugins & co
2015-10-27 17:47:25 +00:00
Jordi Boggiano
8cd6598d8d
Simplify php version fetching
2015-10-27 16:40:52 +00:00
Jordi Boggiano
125dc62fab
Make trigger error visible
2015-10-27 16:11:07 +00:00
Jordi Boggiano
615638c7c3
Simplify bin-compat by removing the nosymlink option, refs #3704
2015-10-27 15:36:12 +00:00
Jordi Boggiano
c9b51a5751
Merge remote-tracking branch 'kocsismate/feature-bin-compat'
2015-10-27 15:20:53 +00:00
Jordi Boggiano
ebe0c8d79c
Fix issue #3229 , refs #3184
2015-10-27 15:12:18 +00:00
Jordi Boggiano
90a90e22de
Merge remote-tracking branch 'Wirone/unixy-proxy'
...
Conflicts:
src/Composer/Installer/LibraryInstaller.php
2015-10-27 15:10:35 +00:00
Jordi Boggiano
82349bcb2a
Fix support for extracting stability flags in multi-constraints, fixes #4440
2015-10-27 14:59:48 +00:00
Jordi Boggiano
507415e404
Make VersionSelector prefer stable by default and allow specifying a PHP version that must be matched, fixes #4318
2015-10-27 14:43:04 +00:00
Jeroen Seegers
279b5f0156
Drop irrelevant properties from composer_commit-ref.json
2015-10-27 14:20:45 +01:00
Jeroen Seegers
f3dc31839f
Refactor commit-ref validation
...
The require and require-dev arrays have been merged into one and no
longer user private methods/properties to collect warnings.
2015-10-27 13:59:29 +01:00
Jordi Boggiano
4f934d9282
Avoid sending install notifications in dry-run mode
2015-10-26 15:01:06 +00:00
Jordi Boggiano
3d9daea6a0
CS fixes
2015-10-25 15:19:15 +00:00
Boris Momčilović
b05b52ff7e
InstallationManager: notifyInstalls: append authorization header for repository
2015-10-24 00:58:34 +02:00
Jeroen Seegers
73e73c90fb
Generate a warning when a commit reference is used
...
Closes #4485
2015-10-23 21:38:11 +02:00
Rob
f85d965732
Merge pull request #4501 from tw2113/master
...
add spacing consistency around phpdoc attributes
2015-10-19 12:04:38 +02:00
Joel Wurtz
7f42fe4c10
Issue #4512 Set reference in path repository
2015-10-18 11:57:43 +02:00
npiderman
ed23b1c4db
Issue #2384 allow 'prefer-stable' and 'minimum-stability' to be set via composer config command
2015-10-17 10:58:53 -04:00
Jordi Boggiano
a54f84f05f
Merge pull request #4479 from MakiCode/feature#4397
...
Added --file flag: Feature#4397
2015-10-13 14:09:04 +01:00
Rob Bast
1c7016de45
remove dead code/class
2015-10-13 12:37:15 +02:00
Rob Bast
1bf03e9621
fixed various docblocks and class properties in solver
2015-10-13 12:27:48 +02:00
Rob Bast
b523fc0b7b
ran fixers
2015-10-13 11:35:51 +02:00
Michael Beckwith
459a48ad5b
add spacing consistency around phpdoc attributes
2015-10-13 00:46:26 -05:00