1
0
Fork 0
Commit Graph

3952 Commits (e830a611ec620237534822991675a3da3018bbf0)

Author SHA1 Message Date
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
MakiCode 1c0b9cd65f Removed test for non-string file name check 2015-10-12 10:20:45 -05:00
MakiCode fefc106ef6 Removed type check on ArchiveManager 2015-10-12 10:18:57 -05:00
MakiCode 22e93f110b Fixed indentation 2015-10-07 15:52:58 -05:00
MakiCode 7005d89847 Fixed bug 2015-10-07 12:44:23 -05:00
MakiCode 63ede6c9dd Fixed issues with PR 2015-10-07 12:42:19 -05:00
Rob 7a9eb02190 Merge pull request #4455 from samsaggace/config_archive
Enable command line configuration for archive-dir and archive-format
2015-10-07 12:05:33 +02:00
Nicolas Toniazzi b6df8549cd Merge remote-tracking branch 'parent/master'
Conflicts:
	src/Composer/Factory.php
2015-10-05 09:52:52 +02:00
MakiCode 0d00338bdb Added better messages and fixed bugs 2015-10-04 20:03:06 -05:00
MakiCode 906c1c2e66 Added check for filename in archive manager and added test 2015-10-04 19:53:07 -05:00
MakiCode 87b5af60a8 Almost finished adding --file option, need to add unit test 2015-10-02 09:09:09 -05:00
Rob edf14dab15 Merge pull request #4469 from Soullivaneuh/patch-1
PackageInterface[] on RepositoryInterface php doc
2015-10-01 22:12:34 +02:00
Jordi Boggiano 790a941cba Merge pull request #4470 from alcohol/fix-config-lookup
itteratively expand key and attempt to match
2015-10-01 14:48:22 +01:00
Rob Bast 7bd0c5abdd itteratively expand key and attempt to match
fixes #4459 (also)
2015-10-01 15:05:38 +02:00
Sullivan SENECHAL 4f4d236be3 PackageInterface[] on RepositoryInterface php doc 2015-10-01 14:54:45 +02:00
Jordi Boggiano 5ccaad92c1 Merge remote-tracking branch 'alcohol/weird-config-listing-issue' 2015-09-30 11:52:04 +01:00
Rob Bast 2dbad30336 fixes #4459 2015-09-29 20:57:26 +02:00
Sebastien Chemin 3896a6c263 Enable cmdline configuration for archive-dir and archive-format
Examples of commands :
composer config --global  archive-dir $HOME/.composer/repo
composer config --global  archive-format zip
2015-09-28 13:22:38 +02:00
Jordi Boggiano ce08582671 Fix CS 2015-09-28 10:53:24 +01:00
Jordi Boggiano c41079192f Merge pull request #4454 from alcohol/urlencode-urls-only
only urlencode $ if filename is not local
2015-09-28 10:38:16 +01:00
Rob Bast b219abe8f6 @seldaek damn your assignment in expression 2015-09-28 10:59:26 +02:00
Rob Bast e491b72a8c only urlencode $ if filename is not local 2015-09-28 10:39:36 +02:00
Rob Bast 1328d9c3b2 rename baseversionparser to semverversionparser
and fix docblock as per @stof request
2015-09-25 11:05:38 +02:00
Rob Bast 89717fa593 implement old linkconstraintinterface for BC 2015-09-25 10:59:56 +02:00
Rob Bast 0adcab7a19 compile phar with semver included 2015-09-24 16:49:10 +02:00
Rob Bast a1ad7fc435 fix classname clashing cause of existing class in current namespace 2015-09-24 16:48:46 +02:00
Rob Bast ddb1c1e052 these 2 use parseNameVersionPairs 2015-09-24 16:34:48 +02:00
Rob Bast a1427d7fd6 replace all occurences in code and comments 2015-09-24 16:32:36 +02:00
Rob Bast 1ccfc8eb96 add semver, deprecated existing classes 2015-09-24 16:28:28 +02:00
Dennis Birkholz 9febf55f76 Store url relative again, fix 4439 2015-09-23 17:51:41 +02:00
Gavin Staniforth c1e60a0abd Ensure the bin directory exists before checking empty
Line 130 has similar logic so avoided doing the check withiin `isDirEmpty()`
2015-09-23 13:46:35 +01:00
Jordi Boggiano 41a87a3ae7 Adjust file path output, refs #4379 2015-09-23 00:41:24 +01:00
Jordi Boggiano 9b61b808ec Merge remote-tracking branch 'javihgil/master' 2015-09-23 00:32:26 +01:00
Jordi Boggiano 80f1e4372a Remove empty bin dir after all binaries have been removed from it, fixes #3451 2015-09-22 23:54:43 +01:00
Jordi Boggiano 9f2e562e48 Add --strict flag to validate command to treat warnings as failures as well, refs #3202 2015-09-20 19:44:55 +01:00
Jordi Boggiano ae23979dfa Add validation warning for prs-0/4 definitions without namespace prefix, refs #3202 2015-09-20 19:29:53 +01:00
Jordi Boggiano e61b3a6370 Allow the validate command to validate dependencies with -A/--with-dependencies, refs #3202 2015-09-20 19:29:04 +01:00
Jordi Boggiano ed95448523 URL-encode dollar signs to work around bad proxy failures 2015-09-20 18:26:23 +01:00
Jordi Boggiano 1e8d7255b7 Fix access to undefined var, refs #4422 2015-09-20 17:39:00 +01:00
Jordi Boggiano 8f44f9cc67 Merge pull request #4422 from dennisbirkholz/wildcard-repositories
Enable wildcards in path names for path repositories
2015-09-20 16:41:02 +01:00
Jordi Boggiano 8913ac2fff Merge pull request #4362 from bd808/classmap-authoritative-cli
Add cli argument for classmap-authoritative
2015-09-20 16:00:21 +01:00
Dennis Birkholz 681e543793 Make check more obvious 2015-09-18 17:55:07 +02:00
Dennis Birkholz 6b1c9882dd Replace tracking variable with direct package count check 2015-09-18 17:26:31 +02:00
Jordi Boggiano 9e67bc761b Merge pull request #4131 from ammmze/artifact-follow-symlink
Follow symlinks when searching for artifacts
2015-09-18 15:32:06 +01:00
Jordi Boggiano 5736a59fe3 Merge pull request #4428 from webfactory/update-source-type-and-ref
Update source type and reference along with URLs
2015-09-18 15:02:05 +01:00
Matthias Pigulla 3c08318ea0 Add test 2015-09-18 15:31:54 +02:00
Dennis Birkholz 2fb7dd881a Fix missing trailing / in repository paths 2015-09-18 15:03:15 +02:00
Dennis Birkholz 3ef222c920 Make repository path absolute (again) 2015-09-18 15:01:06 +02:00
Dennis Birkholz 973491b65d Fix docblock, path names returned by glob() are not necessary absolute 2015-09-18 14:31:42 +02:00
Dennis Birkholz 19146d1cec Docblock fix as suggested by @alcohol 2015-09-18 14:26:01 +02:00
Jordi Boggiano f96ec35c1d Merge pull request #4423 from dennisbirkholz/minor-changes
Fix check for flag in case RELATIVE_PATHS should be changed somehow
2015-09-18 13:10:05 +01:00
Matthias Pigulla 2db52ebeba Also update source type and reference when changing URLs 2015-09-18 12:04:21 +02:00
Jordi Boggiano 0cbf679f21 Avoid failing to write the lock file if a lock file is present but corrupt/conflicted 2015-09-17 14:46:19 +01:00
Samuel ROZE f6d5d65bcd Use shortest relative paths for symlinks 2015-09-16 10:06:32 +01:00
Dennis Birkholz c06edd61e4 Fail if no repository was found 2015-09-15 18:28:17 +02:00
Dennis Birkholz e4435790a4 Documentation 2015-09-15 17:39:55 +02:00
Dennis Birkholz 1d7fa565e6 Fix check for flag in case RELATIVE_PATHS should be changed somehow 2015-09-15 17:33:31 +02:00
Dennis Birkholz 4209fd2e4a Store correct url for package, not original url containing wildcards. 2015-09-15 17:27:36 +02:00
Dennis Birkholz 323537ad0f Allow wildcards in repository path names. 2015-09-15 16:41:07 +02:00
Jordi Boggiano 7267b2ed90 Merge pull request #4418 from olvlvl/olvlvl-optimize-getio
Optimized this->getIO()
2015-09-14 15:48:45 +01:00
Samuel ROZE d0a9550dea Uses `realpath` to fix relative path issues 2015-09-14 15:20:06 +01:00
Olivier Laviale cc522c20bb Optimized this->getIO() 2015-09-14 14:30:26 +02:00
Samuel ROZE a3f5f60359 Update output to have a coherent one 2015-09-14 10:18:55 +01:00
Samuel ROZE 0e8c5fa62e Store path from composer.json with the `path` repository to ensure lock file to be reused 2015-09-14 10:18:46 +01:00
Jordi Boggiano 66acee7feb Add config.platform to the list of locked properties 2015-09-12 23:04:37 +01:00
Jordi Boggiano 74e56fd5c6 Merge remote-tracking branch 'szeber/master' 2015-09-12 22:53:27 +01:00