1
0
Fork 0
Commit Graph

4541 Commits (4a4e5726ddaf9cb9226cec2a14de38bffc7815b0)

Author SHA1 Message Date
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
Jordi Boggiano 6508dc4322 Allow packages with only a dist ref to be force updated when the dist ref changes 2015-09-12 22:29:19 +01:00
Jordi Boggiano 89c6a68a76 Updates to path repository and path downloader, refs #4365 2015-09-12 22:28:03 +01:00
Jordi Boggiano 3a79313b63 Merge remote-tracking branch 'sroze/feature/path-repository' 2015-09-12 21:05:12 +01:00
Jordi Boggiano afd98b74f1 Fix handling of www.github.com in GitHubDriver, fixes composer/packagist#572 2015-08-31 10:58:50 +01:00
Grégoire Paris 9e30c9b403 use different exit codes for different errors 2015-08-30 00:30:16 +02:00
James Titcumb d85bad29d6 Warn about unpushed changes
`composer status` now prevents overwriting Git package if changes have not been pushed.
2015-08-30 00:30:16 +02:00
Javi Hernández dd7243fc01 Archive command shows created package path 2015-08-26 13:08:40 +02:00
Samuel ROZE 6c16153302 Added repository tests 2015-08-25 22:06:48 +01:00
Zsolt Szeberenyi 62630e5c69 Fix strict comparison of the content hash 2015-08-21 16:55:44 +12:00
Zsolt Szeberenyi bfb83f1fb7 Add name and version to the relevant fields, move content hash checking to the Locker 2015-08-21 16:54:28 +12:00
Bryan Davis 71cb587611 Add autoloader cli options to `require` and `remove`
Update the `composer require` and `composer remove` commands to support
the `--optimize-autoloader` and `--classmap-authoritative` cli options
and associated configuration settings. All cli entry points that invoke
`Installer::run()` or `AutoloadGenerator::dump()` now have consistent
support for these autoloader optimization flags.
2015-08-19 22:18:54 -06:00
Bryan Davis cc2b9cfca5 Add cli argument for classmap-authoritative
Add a `--classmap-authoritative (-a)` argument to `composer install`,
`composer update` and `composer dumpautoload`. This enables the same
authoritative classmap behavior as the existing `classmap-authoritative`
configuration setting. The option can be used for creating highly
optimized production autoloaders via `composer install --no-dev
--optimize-autoloader --classmap-authoritative` for projects where
multiple autoloaders are present and unnecessary `file_exists` calls
introduce performance issues.

Closes #4361
2015-08-19 22:18:54 -06:00
voroks e873438dbd Merge branch 'master' of github.com:composer/composer into 4254-remove-autoload_files.php-when-needed 2015-08-19 15:08:57 +08:00
voroks 154092ba1a Added removing file 'include_path.php' (if it is empty). 2015-08-19 15:08:27 +08:00
Samuel ROZE 4ab123291d Add missing licence in VersionGuesser 2015-08-18 15:10:59 +01:00
Samuel ROZE 623f31fcc4 Use version guesser to get local package version 2015-08-18 15:08:27 +01:00
Samuel ROZE 5261a5fa03 Move version guessing in `VersionGuesser` class 2015-08-18 14:58:18 +01:00
Samuel ROZE ead68d3d49 Create the path repository and downloader 2015-08-18 14:40:48 +01:00
voroks 457bc20c34 Explicit comparison was removed. 2015-08-18 16:10:59 +08:00
voroks cca42ff0be Fixed indents: we should use spaces instead tabulation. 2015-08-18 15:29:22 +08:00
Jordi Boggiano 9859859f10 Add comment, fixes #4145 2015-08-17 15:57:00 +01:00
DSanchez abfe54f334 Add missing PHPDoc
Conflicts:
	src/Composer/Installer.php
2015-08-17 15:55:09 +01:00
DSanchez 6ce9d2e152 Remove useless variable, method return void! 2015-08-17 15:52:30 +01:00
voroks 4fa1cb2e9c Removing file autoload_files.php was added (#4254) 2015-08-15 16:12:16 +08:00
Jordi Boggiano 3c5f3e6dc7 Warn if cache isnt writable as well 2015-08-14 13:30:42 +01:00
Rob Bast 61dc752c78 Warn if cache directory cannot be created
closes #1161
2015-08-14 14:21:12 +02:00
Rob Bast 593af4b1bf add license file during autoload dumping
closes #4288
2015-08-14 12:00:21 +02:00
Jordi Boggiano a979cc78ed Suppress warnings on touch() failures of the vendor dir, refs #4070 2015-08-11 11:20:39 +01:00
Jordi Boggiano cedbe7f1a0 Bump vcs verbosity output to very verbose, refs #4330 2015-08-10 12:58:58 +01:00
Jordi Boggiano 0457ec6fb3 Remove deadcode, fixes #4345, fixes #4268 2015-08-10 12:42:51 +01:00
Jordi Boggiano 812523f1ab Add more debug info on cache write failure, refs #4249 2015-08-10 10:07:48 +01:00
Jordi Boggiano 65bb8d99f4 Fix global switch regression on config command, fixes #4344 2015-08-10 08:35:31 +01:00
Jordi Boggiano 5a26b7c102 Merge pull request #4299 from webberwu/master
show change if package directory have changed to symbolic link
2015-08-10 01:17:02 +01:00
Jordi Boggiano 4824b4504e Remove typo 2015-08-10 01:05:32 +01:00
Jordi Boggiano 33badac0a8 Include full error message in debug mode 2015-08-10 00:57:13 +01:00
Jordi Boggiano b16c5fbeb9 Shorten ternary and reuse config file instead of the null argument to figure out path to auth.json 2015-08-10 00:56:55 +01:00
Jordi Boggiano cdeb7621ba Merge remote-tracking branch 'Tehem/issue-4302' 2015-08-10 00:52:39 +01:00
Jordi Boggiano a782dab2cd Merge remote-tracking branch 'iamluc/git-diff' 2015-08-09 23:26:55 +01:00
Jordi Boggiano bd23ce672a Merge pull request #4324 from MalteWunsch/getCanonicalPackages-with-different-versions
Improve documentation for WritableRepositoryInterface::getCanonicalPackages
2015-08-09 17:36:21 +01:00
iamluc d02ab54be1 Add a new option to view local modifications (git diff) 2015-08-09 17:30:32 +02:00
Nicolas Grekas fbae6b1589 Revert "Merge pull request #3975 from marc-mabe/hotfix/3974"
This reverts commit bdb6ecb29e, reversing
changes made to 8a12e50a16.
2015-08-04 10:34:54 +02:00
Malte Wunsch 70ff00c9de Reverted inadvertent API change, improved API documentation 2015-08-04 09:32:23 +02:00
Tehem 9e592f19a1 Used shorthand version for ternary operator 2015-08-03 23:36:05 +02:00
Malte Wunsch 767279b41a getCanonicalPackages returns packages with same name in different versions 2015-08-03 18:28:04 +02:00
Thomas Marcon b35e762354 Updated configFile parsing to first look into -f parameter, then COMPOSER environment variable, then default to composer.json 2015-07-31 12:01:49 +02:00
Rob Bast 51ef7b5eef instead of generic be more verbose about possible causes 2015-07-31 10:01:58 +02:00
Rob Bast 77f1d5945f make sure php version errors are less misleading
* determine conflicting version in problem using pool package
* hide version in rule to keep it generic rather than possibly misleading

fixes #4319
2015-07-31 09:58:34 +02:00
Tehem 9392adef79 Fixes #4302 allow COMPOSER env with config statements (overrides --file) 2015-07-28 00:01:01 +02:00
Webber Wu 92530e374b Merge remote-tracking branch 'upstream/master' 2015-07-26 12:33:39 +08:00
Kocsis Máté 87c16073ec Merge branch 'master' of https://github.com/composer/composer into feature-bin-compat 2015-07-22 15:54:20 +02:00
Nicolas Toniazzi e8a6cb536b Change detection of config/cache/data dirs 2015-07-22 10:38:12 +02:00
Jordi Boggiano 00c26791fa Merge pull request #4264 from alcohol/use-composer-spdx
remove spdx files, introduce external library
2015-07-20 18:29:14 +01:00
Jordi Boggiano bbf959ac34 Do not retry failures once degraded mode is already enabled 2015-07-20 17:44:03 +01:00
Jordi Boggiano ff84b32097 Add degraded mode to try and bypass ipv6/gzip issues, refs #4142, refs #4121 2015-07-20 17:33:53 +01:00
Rob Bast 2553f5f7d4 throw error when file is loaded 2015-07-20 12:10:30 +02:00
Rob Bast 56f0d82207 get resources dir from spdxlicenses 2015-07-20 11:42:20 +02:00
Rob Bast 616585e0cc spdxlicense extends spdxlicenses, add depr error 2015-07-16 13:21:18 +02:00
Rob Bast 1f006a499e updated compiler class to include spdx sources 2015-07-16 12:03:34 +02:00
Rob Bast 5ae9e7fe22 remove spdx files, introduce external library 2015-07-16 11:42:12 +02:00
Jordi Boggiano 92faf1c7a8 Merge pull request #4228 from naderman/memory-version-constraint
Remove unnecessary version comparison cache variable and store operator as int
2015-07-14 13:37:15 +01:00
Jordi Boggiano 7e0db8aa46 Merge pull request #4239 from naderman/memory-rules
Reduce memory usage of Rule objects
2015-07-14 13:34:24 +01:00
Nils Adermann cf1af58514 Use bitwise operators directly in rules instead of get/set Bitfield 2015-07-14 14:24:18 +02:00
Nils Adermann ccaba0d2f7 Make static translation tables in version constraint private and use === 2015-07-14 14:12:19 +02:00
Jordi Boggiano c36d2a2e50 Merge pull request #4214 from legoktm/parse-links
Move VersionParser::parseLinks() to ArrayLoader::parseLinks()
2015-07-13 14:28:10 +01:00
Jordi Boggiano 42bfe9c56a Merge pull request #4219 from localheinz/feature/strict-mode
Enhancement: Also validate if lock file is up to date
2015-07-12 16:39:36 +01:00
Jordi Boggiano acc11f63c5 Merge pull request #4234 from naderman/rule-hash-int-size
Reduce rule hash size
2015-07-12 16:25:14 +01:00
Jordi Boggiano efb9f13248 Merge pull request #4229 from naderman/memory-version-array-merge
VersionParser: remove a few hundred/thousand array_merge calls
2015-07-12 16:14:16 +01:00
Andreas Möller 5828f6202d Enhancement: Also validate lock file 2015-07-10 18:07:40 -04:00
Nils Adermann de65199f31 Merge pull request #4117 from stof/patch-1
Optimize the regex detecting timestamps
2015-07-09 21:17:24 +02:00
Nils Adermann 956035e641 Remove the unnecessary return statements from setters 2015-07-09 19:40:03 +02:00
Nils Adermann f535542fca Use constants with names for bitfield offsets 2015-07-09 18:59:16 +02:00
Nils Adermann 329ab5cf41 Rename blob rule property to bitfield 2015-07-09 18:48:50 +02:00
Nils Adermann 961ea868ac Use an integer bitfield for rule properties instead of a string binary blob 2015-07-09 18:26:31 +02:00
Nils Adermann 6e81f63635 Reduce memory footprint of rules by storing data in blob
Not declaring the job property saves significant amounts of memory as
most rules leave it as null
2015-07-09 17:23:45 +02:00
Nils Adermann 3fd4672382 VersionParser: Append elements directly instead of array_merge 2015-07-09 12:57:34 +02:00
Nils Adermann c7e1f49e78 Rule hashes are only used in the rule set, so no need to store them 2015-07-08 19:11:59 +02:00
Nils Adermann 15d572da4c Use 4 byte integer from raw md5 instead of 5 hex representation chars
The hash is necessary as comparisons are significantly too slow
otherwise. The old hash function used substr on the hexadecimal
representation of the md5 hash, rather than the raw binary output. This
wastes a significant amount of memory, as each byte can only be used to
store up to 4 bit of information. The new hash has 32bit instead of
20bit and uses only a 4 byte integer instead of a 5 byte string.
2015-07-08 19:11:58 +02:00
Nils Adermann 5b1b96b61e Output the number of rules used in the solver for profiling purposes 2015-07-08 17:57:23 +02:00
Nils Adermann e88df7429f Remove a few hundred/thousand array_merge calls 2015-07-08 13:36:19 +02:00
Nils Adermann 8dd110e0a9 Remove unnecessary version comparison cache variable and store operators as int 2015-07-08 13:13:47 +02:00
Nils Adermann 07e1d227c9 Output the size of the pool after dependency resolution for users 2015-07-07 15:40:26 +02:00
Nils Adermann 22737e31a7 Merge pull request #4213 from legoktm/stabilities
Don't use BasePackage::$stabilities in VersionParser
2015-07-07 13:45:55 +02:00
Jordi Boggiano a8d71be0ef Add event name in verbose mode, refs #4123 2015-07-04 12:15:04 +01:00
Jordi Boggiano 852e4f4e26 Merge remote-tracking branch 'alcohol/output-script-command-in-verbose-mode' 2015-07-04 12:11:18 +01:00
Jordi Boggiano 0964c02acb Use only one level of verbosity 2015-07-04 12:02:57 +01:00
Jordi Boggiano 5ba41514a9 Merge remote-tracking branch 'alcohol/add-suggests-command' 2015-07-04 11:58:58 +01:00
Kunal Mehta 14d1f0f3f6 Move VersionParser::parseLinks() to ArrayLoader::parseLinks()
Working towards #3545.

parseLinks is a wrapper around VersionParser::parseConstraints() that
creates Link objects, and better belongs in ArrayLoader.
2015-07-03 19:35:54 -07:00
Kunal Mehta 0ad9e98a59 Don't use BasePackage::$stabilities in VersionParser
Working towards #3545.

This adds VersionParser::$stabilities, which is an array of the
supported stability levels. This adds a little bit of duplication,
however we were already hardcoding the various stabilities in regular
expressions and functions like parseStability().
2015-07-03 17:54:30 -07:00
Jordi Boggiano 2438105e11 Merge pull request #4086 from legoktm/format-version
Move VersionParser::formatVersion() to BasePackage::getFullPrettyVersion()
2015-07-04 00:55:50 +01:00
Jordi Boggiano e2b2f450dc Merge pull request #4144 from staabm/patch-2
Dropped unnecessary break statements
2015-07-03 21:49:05 +01:00
Jordi Boggiano 9b3e8b963e Merge pull request #4143 from staabm/patch-1
Dropped obsolete condition
2015-07-03 21:48:39 +01:00
Jordi Boggiano 01a9c3a0ce Merge pull request #4208 from alcohol/update-spdx-updater
Updated SPDX related files in light of 2.0 release of SPDX specification
2015-07-03 11:54:16 +01:00
Rob Bast 4019f7bb44 Revert "apply a regex solution instead of tokenizer"
This reverts commit 33a7305e22c8d4e2ce38586855fd3d4b7b2af3dd.
2015-07-03 12:22:16 +02:00
Rob Bast b5d286e27b apply a regex solution instead of tokenizer 2015-07-03 12:22:16 +02:00
Rob Bast e4118385a0 updated spdx related files 2015-07-03 12:22:16 +02:00
Kunal Mehta c5afb8f23a Mark VersionParser::formatVersion() as deprecated
With 1753c275ff, this will be handled nicely.
2015-07-02 00:07:04 -07:00
Kunal Mehta f634c6946d Update callers of VersionParser::formatVersion()
Tests were moved to BasePackageTest.
2015-07-02 00:06:56 -07:00
Kunal Mehta 99dab8aebd Move VersionParser::formatVersion() to BasePackage::getFullPrettyVersion()
Working towards #3545.

formatVersion() does not belong in VersionParser since it depends upon a
Package object, and is creating a more complete pretty formatted
version, not parsing anything.

The new getFullPrettyVersion() method can be seen as an extension to
getPrettyVersion(), and is located in BasePackage as a result.

Callers to VersionParser::formatVersion() were not updated in this
commit to demonstrate that no functionality was changed in this
refactor. They will be updated in a follow up commit.
2015-07-01 23:54:08 -07:00
Jordi Boggiano 8775c94895 Merge pull request #4196 from localheinz/fix/namespace
Fix: Import Symfony\Component\Finder\Finder
2015-07-01 10:29:53 +01:00
Andreas Möller 962f5a99ea Fix: Import Symfony\Component\Finder\Finder 2015-06-30 21:03:59 -04:00
Jonathan Eskew 42b025776a Move file identifier calculation to compile time 2015-06-30 09:22:51 -07:00
Jordi Boggiano 79f9158fb2 Merge pull request #4192 from localheinz/fix/import
Fix: Add missing imports
2015-06-30 15:38:46 +01:00
Jordi Boggiano 6a64041055 CS fixes 2015-06-30 15:38:32 +01:00
Jordi Boggiano 4d36622ada Merge pull request #4191 from localheinz/fix/docblock
Fix: Docblock
2015-06-30 15:25:49 +01:00
Jordi Boggiano 70f5150893 Merge pull request #4190 from localheinz/fix/unused-private-property
Fix: Remove unused private property
2015-06-30 15:14:03 +01:00
Jordi Boggiano 4307031e9b Merge pull request #4189 from localheinz/fix/unused-imports
Fix: Remove unused imports
2015-06-30 15:13:46 +01:00
Jordi Boggiano a8e004c7e7 Merge pull request #4199 from sminnee/version-comparison-docs
>=2.3.0 now includes pre-releases, added docs for this and -stable suffix Fixes #4080.
2015-06-30 14:32:20 +01:00
Jordi Boggiano b17ccbfa0d Avoid invalid warnings when scanning the same file twice, fixes #4195, fixes #4197 2015-06-30 13:27:28 +01:00
Sam Minnee 2cd698874f Include pre-releases in >=2.3.0 comparison. Fixes #4080.
This is a change to the >=2.3.0 comparison. Without this change, such a
comparison will exclude pre-release versions.

The rationale is that this makes the comparison more consistent with
<2.3.0 (which excludes all pre-releases) and ~2.3.0 (which includes
pre-releases).
2015-06-30 13:10:20 +01:00
Rob Bast 0298cdc60d change delimiter to curly braces 2015-06-30 13:52:47 +02:00
Andreas Möller 12ffe2b4d4 Fix: Add missing imports 2015-06-28 23:37:40 -04:00
Andreas Möller e184118d76 Fix: Docblock 2015-06-28 23:28:45 -04:00
Andreas Möller 3854d2d457 Fix: Remove unused private property 2015-06-28 23:25:55 -04:00
Andreas Möller eac5fbdee4 Fix: Remove unused imports 2015-06-28 23:20:54 -04:00
Jonathan Eskew 24c4322672 Use 5.3 compatible array syntax 2015-06-28 13:47:00 -07:00
Jonathan Eskew 868a872df2 Push the hash to $GLOBALS 2015-06-28 13:44:43 -07:00
Jonathan Eskew 61ed7a9547 Explicitly check if a file has already been required before requiring it 2015-06-27 14:05:59 -07:00
Jordi Boggiano 943107cfe7 Load most specific namespaces always, and dependents before dependencies when building classmaps
This also adds notifications of duplicate classes
2015-06-26 14:40:26 +01:00
Rob Bast 3dffdc8705 don't suggest packages already installed 2015-06-24 11:06:21 +02:00
Rob Bast fd34c5883a added php script handler info as well 2015-06-24 09:21:36 +02:00
Rob Bast 680082c5fe output based purely on verbosity 2015-06-23 22:46:16 +02:00
Rob Bast 33f78b2ccc limit suggestions to optional list of packages 2015-06-23 22:46:16 +02:00
Rob Bast 760eeb0b03 reworked suggests command 2015-06-23 22:46:16 +02:00
Gusakov Nikita f1af16984e [Command] Add suggests command 2015-06-23 21:04:20 +02:00
Nicolas Toniazzi 7d63eb5718 Merge remote-tracking branch 'parent/master'
Conflicts:
	doc/04-schema.md
2015-06-23 14:19:12 +02:00
Jordi Boggiano d0ff01698d Fix outdated comment 2015-06-20 12:58:19 +01:00
Jordi Boggiano d5bdf4be28 Update URLs for bitbucket as well 2015-06-19 23:23:48 +01:00
Jordi Boggiano ee1e2c6f15 Merge pull request #4167 from wimvds/fix-bitbucket-references
download correct Bitbucket archive reference when using --prefer-dist
2015-06-19 18:54:18 +01:00
Wim Vandersmissen 1ff2a02517 fix to download correct Bitbucket archive reference when using --prefer-dist 2015-06-19 15:07:16 +02:00
Jordi Boggiano e727ed4d73 --keep-vcs should only imply prefer source for the root package in create-project, refs #4063 2015-06-19 12:59:57 +01:00
Jordi Boggiano a943827371 Show that no version was found in composer show/license if root package is auto-versioned, fixes #4158 2015-06-18 23:47:17 +01:00
Jordi Boggiano c8eca6f198 Remove pool usage from ArchiveCommand 2015-06-18 17:45:37 +01:00
Jordi Boggiano 801a7fcd0a Add support for constraints and not just exact versions in RepositoryInterface::findPackage/s 2015-06-18 17:44:58 +01:00
Jordi Boggiano 049f84f21f Remove unnecessary Pool usage in HomeCommand 2015-06-18 16:33:30 +01:00
Nils Adermann 75c501251d Revert "Merge remote-tracking branch 'naderman/load-no-providers'"
This reverts commit 3e85f82373, reversing
changes made to b025d0982b.
2015-06-18 15:40:27 +02:00
Jordi Boggiano 74e7c5fe22 Merge remote-tracking branch 'legoktm/publish-name' 2015-06-18 11:40:48 +01:00
Jordi Boggiano 3e85f82373 Merge remote-tracking branch 'naderman/load-no-providers' 2015-06-18 11:32:37 +01:00
Jordi Boggiano b025d0982b Remove some state 2015-06-18 11:12:57 +01:00
Thibault Jamet 25ab752ca6 Map archive command to the archive configuration 2015-06-17 20:53:09 +02:00
Thibault Jamet 1eec4fdfa5 Add archive configuration default values 2015-06-17 20:53:09 +02:00
Jordi Boggiano e73448ae1e Add possessive quantifiers to avoid backtracking and fix segfault on large files, fixes #4153 2015-06-16 11:22:45 +01:00
Zsolt Szeberenyi 9b50ca0161 Add the extra attribute to the content hash 2015-06-15 11:31:33 +02:00
Jordi Boggiano 8e9659bd83 Merge pull request #4139 from elazar/feature/tests-in-classmap
Resolves #4138: Removed *Test.php filtering from AutoloadGenerator->dump()
2015-06-14 10:10:46 +01:00
Markus Staab 94a924b702 Dropped unnecessary break statements
Next line breaks nevertheless
2015-06-14 10:16:45 +02:00
Markus Staab a4ad3c2146 Dropped obsolete condition
The conditional a few lines above already checks for `bytesMax > 0`
2015-06-14 10:13:18 +02:00
Zsolt Szeberenyi 3e0219c438 Change the content hash to be only based on values that affect dependency resolution 2015-06-13 10:15:56 +02:00
Zsolt Szeberenyi 50b560fe4c Add the hash of the parsed content of the composer.json to the lock file, and use it to verify the json is not changed 2015-06-12 22:24:31 +02:00
Jordi Boggiano 89540c5690 Support bg colors and more clearing values in html output formatter 2015-06-12 17:23:18 +01:00
Jordi Boggiano 29dbc3835f Fix html output formatter to work with latest symfony console 2015-06-12 17:10:19 +01:00
elazar 6c029a850c Resolves #4138: Removed *Test.php filtering from AutoloadGenerator->dump() 2015-06-12 10:52:55 -05:00
Jordi Boggiano 6d15ad08b6 Add http check even if openssl is present, refs #4084 2015-06-11 19:20:09 +01:00
Jordi Boggiano 24168d9d5c Merge pull request #4133 from benbor/added-ctrl-c
Added Ctrl+C support to create-project command for unix-like systems
2015-06-11 18:32:31 +01:00
Barys Biankouski a59c46f781 [create-project] If process terminated with SIGINT then 130 IMO will be returned. Remove unused variable 2015-06-11 19:50:52 +03:00
Jordi Boggiano c471edc488 Also downgrade provider access and others 2015-06-11 11:22:19 +01:00
Barys Biankouski 38bc4e6a78 Added Ctrl+C support to create-project command for unix-like systems 2015-06-11 13:02:33 +03:00
Branden Cash 5146085dc2 Follow symlinks when searching for artifacts 2015-06-10 11:46:08 -07:00
Rob Bast 9223f4a208 show command by default 2015-06-09 14:02:51 +02:00
Rob Bast cbd61660ab implemented verbose output 2015-06-09 09:02:43 +02:00
nevvermind 12c833864c Revert converting `1.0.0` to `^1.0`. 2015-06-08 22:45:20 +01:00
Nils Adermann 8b28d4bc82 Optimisation: Composer repo version listings are index by package name 2015-06-08 18:50:15 +02:00
Nils Adermann 65243ca392 Move methods for PR readability and fix phpdoc 2015-06-08 18:45:03 +02:00
Kunal Mehta 49bd1d773b Make an invalid package name a publish error, not warning
Since invalid names will prevent publishing to packagist, they should
be considered publish errors. If people do not plan on submitting their
package to packagist, they can use the --no-check-publish flag to turn
it into a normal warning again.
2015-06-07 17:44:56 -07:00
Christophe Coevoet a014a2f803 Optimize the regex detecting timestamps
Using a possessive quantifier avoids useless backtracking.
2015-06-07 10:38:27 +02:00
Jordi Boggiano 7351136205 Merge pull request #4105 from gmsantosxl/master
Remove extra '/' when findShortestPath $from is a directory
2015-06-05 13:18:07 +01:00
Rob Bast dfbee6a532 cleaner solution 2015-06-05 13:04:56 +02:00
Rob Bast 7a50225389 disable path if no composer available, fixes #4101
gracefully remove the option and continue, after informing the user
2015-06-05 13:00:04 +02:00
gmsantosxl a060c536bb Remove extra '/' when findShortestPath $from ends with '/' 2015-06-04 14:44:09 -03:00
gmsantosxl 84c9c30b63 Remove extra '/' when findShortestPath $from is a directory 2015-06-03 16:48:01 -03:00
Jordi Boggiano cdcc99e73d Merge pull request #4088 from nevvermind/override_init_array
Fix "Invalid argument supplied for foreach()" on a new PlaformRepository obj
2015-06-03 11:40:44 +01:00
Jordi Boggiano 17c2a8019e Merge pull request #4089 from nevvermind/plugin-api-versions
Make plugins have actual constraints instead of fixed versions
2015-06-03 11:37:52 +01:00
Rob Bast b957d1c4a6 load xml as string from local file, fixes #3942
If the entity loader is disabled on a system, loading files, even from
the local file system, is considered as external to the running php
process, and thus not allowed by the libxml extension. Reading the file
contents and loading the xml as a string is a valid alternative however.
2015-06-03 09:52:36 +02:00
nevvermind ec00a4dbfa Set the platform overrides first 2015-06-03 00:06:24 +01:00
nevvermind a747b293b3 Merge remote-tracking branch 'upstream/master' into override_init_array 2015-06-03 00:04:19 +01:00
nevvermind 4fd9a3ceee compare against correct format 2015-06-02 19:59:38 +01:00
nevvermind 994b1324bc fix alignment 2015-06-02 19:58:21 +01:00
nevvermind 3032f0a538 Refactor based on code review
- Move the version api getter to the PluginManager And make it such that it can be mocked, but not pollute the public interface. That means "protected" visibility.
- The plugin api version constant should still be used throughout the code.
- Use different fixtures class names
- Use regex possessive quantifiers for performance
- Use full words for readability
2015-06-02 17:40:32 +01:00
Rob Bast 0f04f97088 Fixed failing testcase 2015-06-02 15:15:30 +02:00
nevvermind eb2aa14830 Make plugins have actual constraints instead of fixed versions
Instead of developing plugins against a single, fixed Plugin API version - `"composer-plugin-api": "1.0.0"`, this change will allow plugin developers to use versions like `"composer-plugin-api": "~1.1"` or `"composer-plugin-api": ">=2.1 <3.0"`, aka actual Composer-compatible constraints.

Only the "1.0", "1.0.0" and "1.0.0" Plugin API versions will be regarded as BC versions, and internally converted to "^1.0"; every other declared version string will be kept as it is.

Because of this new constraint flexibility, plugin version mismatches will be skipped, which means those plugin will NOT be registered to the system. Previously, a mismatch triggered a warning, but plugins were still registered.
2015-06-02 14:10:09 +01:00
Rob Bast 46e0a506b9 Added another testcase + fix 2015-06-02 14:20:48 +02:00
Rob Bast a0ca1d4d96 Consider 0 as part of a version 2015-06-02 14:14:29 +02:00
nevvermind 8c0d4857ef Fix "Invalid argument supplied for foreach()" on a new PlaformRepository obj
This happens on "new PlatformRepository(array($somePackage))".
The parent constructor calls "\Composer\Repository\ArrayRepository::addPackage()",
which, on a brand new repo object, further calls "\Composer\Repository\PlatformRepository::initialize()"
and finally this iterates over a NULLd "$this->overrides", triggering the error.
2015-05-31 15:44:12 +01:00
Jordi Boggiano 0ec86be5e9 Merge remote-tracking branch 'origin/master' 2015-05-31 12:54:08 +01:00
Jordi Boggiano 0081964428 Merge remote-tracking branch 'colinodell/fix-tag-ambiguity'
Conflicts:
	src/Composer/Downloader/GitDownloader.php
	tests/Composer/Test/Downloader/GitDownloaderTest.php
2015-05-31 12:52:27 +01:00
Jordi Boggiano ce0f617ee1 Merge pull request #4083 from nevvermind/php-dox
Added phpdocs + change to yoda comparison
2015-05-31 12:45:02 +01:00
Jordi Boggiano 1753c275ff Handle deprecation notices softer 2015-05-31 12:26:57 +01:00
nevvermind 8e79a3766d Added phpdocs + change to yoda comparison 2015-05-30 01:38:14 +01:00
Jordi Boggiano b181822e90 Fix case where touch() fails due to incorrect ownership, fixes #4070 2015-05-28 15:26:56 +01:00
Rob Bast 95dbb6d9db add docs to support section in composer schema, closes #4055
Note that this does not yet add this attribute @ packagist though
2015-05-28 13:15:56 +02:00
Jordi Boggiano 69210d5bc1 Move deprecation notice where it belongs, closes #4065 2015-05-25 14:29:26 +01:00
Jordi Boggiano 98b339e87a Make --keep-vcs imply --prefer-source, closes #4063 2015-05-25 11:28:07 +01:00
Hugo Hamon e51ff60f59 [Pear] replaces "licence" to "license". 2015-05-08 06:42:59 -04:00
Jordi Boggiano 4d5d524704 Clear stat cache after a git failure as it might have modified the filesystem 2015-05-07 16:28:18 +01:00
Jordi Boggiano 52d290f5f2 trim token just in case and update tests 2015-05-07 00:37:08 +01:00
Jordi Boggiano 41f4451c20 take care of retry-auth-failure:false in case of 403 as well 2015-05-07 00:29:45 +01:00
Jordi Boggiano e16d53893e Remove password prompt for github tokens and require the user creates a token themselves 2015-05-07 00:29:20 +01:00
Jordi Boggiano 48d8cc6465 Avoid errors when invoking composer global config and there is no global composer.json yet, refs #4002 2015-05-06 11:48:45 +01:00
Nils Adermann 63e96a41f8 Add proper docblocks in composer repo 2015-05-05 20:30:57 +02:00
Nils Adermann cfd0e44312 Move private function further down in pool 2015-05-05 20:28:22 +02:00
Nils Adermann aa7d145dd0 PHP 5.3 compatible function invokation 2015-05-05 20:24:04 +02:00
Possum 29ca21f30e PHP version checks tweaking 2015-05-05 20:18:24 +02:00
Nils Adermann ec5416f03c loadDev parameter is nonsense, properly load packages in create command 2015-05-05 19:58:03 +02:00
Nils Adermann da02c53540 Update the composer repository whatprovides test to a loadrecursively test 2015-05-05 19:44:07 +02:00
Nils Adermann b99c03ea04 Entirely remove whatProvides from Composer repository 2015-05-05 19:28:15 +02:00
Nils Adermann 090711b21c Completely move loading of packages from composer repo to pool 2015-05-05 19:08:33 +02:00
Jordi Boggiano 13a3349603 Merge pull request #3967 from xi-ao/master
Fixed svn update command
2015-05-05 18:07:08 +01:00
Possum 2e99b9fdf5 Use https where possible 2015-05-04 19:37:57 +02:00
Nils Adermann 9b9ad9d0fe Remove dead code paths and use exceptions instead of die 2015-05-04 17:34:41 +02:00
Nils Adermann 65f69c4227 Remove debug output 2015-05-04 17:28:03 +02:00
Nils Adermann 4d0db5add6 POC Implementation of loading only explicitly named package data 2015-05-04 17:25:55 +02:00
Jordi Boggiano d426246b80 Update only github dist URLs, refs #3985 2015-05-01 16:26:59 +01:00
Jordi Boggiano ab02867015 Use natural sort to sort packages, refs #3872 2015-05-01 16:16:02 +01:00
Jordi Boggiano 06fb00bfe5 Fix handling of platform packages to be future proof, refs #3872 2015-05-01 16:14:17 +01:00
Jordi Boggiano 081e26f4d7 Merge remote-tracking branch 'localheinz/feature/sort-packages' 2015-05-01 16:08:57 +01:00
Jordi Boggiano b7c827c2e5 Use external lib for hidden cli prompting 2015-05-01 15:50:01 +01:00
Jordi Boggiano 2a48b0faa0 Make autoloader suffix a reproducible value as well, refs #3927 2015-05-01 14:32:32 +01:00
Jordi Boggiano 164dc2a097 Reuse prefix only if no prefix is defined 2015-05-01 14:23:20 +01:00
Jordi Boggiano facdd8a503 Add phar-utils package to update timestamps after the build is done, refs #3927 2015-05-01 13:50:16 +01:00
Jordi Boggiano ebffb3c179 Move improvements towards reproducible builds, refs #3927 2015-05-01 11:54:55 +01:00
Jordi Boggiano 92785ac677 Make builds more reproducible, refs #3927 2015-05-01 11:21:44 +01:00
Jordi Boggiano 6199488644 Merge pull request #3989 from WyriHaximus/master
Replaced <error> with <warning> for abandoned package messages
2015-05-01 10:17:30 +01:00
Cees-Jan Kiewiet c9d9b5085a Replaced <error> with <warning> for abandoned package as it reflects the intention of this feature better 2015-04-30 23:34:26 +02:00
Daum aa4afbf49f Updated AuthHelper to pass a null for maximum attempts to the IOInterface instead of false so an exception is not thrown by Symfony Question class. 2015-04-30 15:30:01 -04:00
Jordi Boggiano bdb6ecb29e Merge pull request #3975 from marc-mabe/hotfix/3974
fixes #3974: Autoloader have to distinguish between files and directories
2015-04-30 18:26:28 +01:00
Marc Bennewitz 9455c49053 fixes #3974: Autoloader have to distinguish between files and directories 2015-04-30 19:17:19 +02:00
Jordi Boggiano 8a12e50a16 Merge pull request #3983 from alcohol/upgrade-dialoghelper
Upgrade DialogHelper to QuestionHelper
2015-04-30 17:10:26 +01:00
Jordi Boggiano 8daebe8926 Merge pull request #3962 from joshdifabio/travis-cache-fix
Fix Travis cache issue (~/.composer/cache changes on every build)
2015-04-30 17:08:26 +01:00
Nils Adermann 258fdcb44d Merge pull request #3986 from Seldaek/partial-update-keep-lock
Partial updates should not corrupt the lock if the installed repo is not up to date with it
2015-04-30 17:54:58 +02:00
Nils Adermann cb44f209f8 Merge pull request #3985 from Seldaek/update-urls
Check if package URLs are up to date after composer update is done
2015-04-30 17:48:43 +02:00
Jordi Boggiano 137c551247 Check if package URLs are up to date after an update op is done, fixes #3214 2015-04-30 16:41:28 +01:00
Jordi Boggiano 4507805508 Partial updates should not corrupt the lock if the installed repo is not up to date with it, fixes #3439, closes #3553 2015-04-30 16:39:08 +01:00
Nils Adermann b4ed331168 The Solver Request no longer depends on the Pool 2015-04-30 17:24:24 +02:00
Rob Bast acd1486406 Mark method as @private 2015-04-30 12:35:25 +02:00
Rob Bast e810a7913e Space after ? (so it doesnt glue answer to ?) 2015-04-30 12:29:19 +02:00
Rob Bast 0fbc00f3fb Switch to QuestionHelper 2015-04-30 12:23:13 +02:00
Rob Bast 290fafa156 Docs and whitespace 2015-04-30 12:22:54 +02:00
Rob Bast bef46a17dc Moved method 2015-04-30 12:22:09 +02:00
Rob Bast 3dae4cd517 Switch to QuestionHelper 2015-04-30 12:20:32 +02:00
Rob Bast 00fcd63c04 Remove redundant helper 2015-04-30 12:17:56 +02:00
Rob Bast e7c044d4b2 Remove dead code 2015-04-30 12:17:14 +02:00
Rob Bast fb5394ce70 Use constants directly 2015-04-30 12:17:13 +02:00
Rob Bast 7279c25839 Switched to QuestionHelper 2015-04-30 12:17:13 +02:00
Rob Bast ee4044efcd Adjusted interface to reflect values from Console 2015-04-30 12:17:13 +02:00
Jordi Boggiano d6620195e5 Prioritize repository over package versions in the default policy, fixes #3509 2015-04-30 10:43:04 +01:00
Jordi Boggiano 4ce0adb23c Use the caret operator for all require operations 2015-04-29 23:53:40 +01:00
Jordi Boggiano 43c1caad0d Merge remote-tracking branch 'Seldaek/caret-op-for-semver'
Conflicts:
	tests/Composer/Test/Package/Version/VersionSelectorTest.php
2015-04-29 23:49:27 +01:00
Jordi Boggiano fa398e14c7 Fix indent detection in json files when an empty line starts the object 2015-04-29 22:42:57 +01:00
Jordi Boggiano 32a479a1e7 Fix subkey manipulation when the main key does not exist yet 2015-04-29 22:42:41 +01:00
Jordi Boggiano a57c51e8d7 Finalize platform override feature
- Added tests, docs
- Persist to lock file
- Add support in config command
- Added to json schema
2015-04-29 22:38:07 +01:00
Jordi Boggiano 80b0a35a68 Merge remote-tracking branch 'HuffAndPuff/ignore-platform'
Conflicts:
	src/Composer/Config.php
	src/Composer/Repository/PlatformRepository.php
2015-04-29 21:03:51 +01:00
Jordi Boggiano fd7e28b8b4 Restore special handling of conflict/provide/replace 2015-04-29 20:57:00 +01:00
Vadim Tyukov b02bdb4c7a [alias] RootAliasPackage manages the requirements correctly 2015-04-29 20:56:58 +01:00
Jordi Boggiano a811142ff2 Merge pull request #3978 from marc-mabe/hotfix/3976
fixes #3976: drop ext/ctype dependency
2015-04-29 20:38:10 +01:00
Marc Bennewitz ff1ce78e6b fixes #3976: drop ext/ctype dependency 2015-04-29 21:19:15 +02:00
Markus Staab c9bdf3a07a added the actual phpversion into the error message when phpversion doesn satisfy the requirement 2015-04-29 18:21:18 +02:00
Anael Ollier 27074083cc Replaced join() by implode() 2015-04-28 13:23:00 +02:00
Anael Ollier 2f82ed7035 Fixed the fix :) 2015-04-28 11:19:29 +02:00
Anael Ollier b2efb95f33 Fixed svn update command (fails before attempting to use authentication provided in auth.json) 2015-04-27 15:26:32 +02:00
Jordi Boggiano 1cb427ff5c Force http1.1 protocol 2015-04-26 22:18:04 +01:00
Josh Di Fabio 051b7bd44b Touch access time only when reading from cache 2015-04-23 16:08:03 +01:00
Jordi Boggiano 2e73811211 Fix process timeout not being initialized correctly when loading a config without creating a full composer instance, closes #3952, fixes #3946 2015-04-21 21:02:17 +01:00
Jordi Boggiano 35a9b5dbf9 Merge pull request #3953 from alcohol/allow-numeric-author-name
Allow numeric author name
2015-04-21 20:47:49 +01:00
Evan Mattson ec9eb2b799 update init type question 2015-04-21 13:19:18 -04:00
Evan Mattson 5ed001765f allow package type to be set with init command 2015-04-21 13:19:18 -04:00
Rob Bast c7d387f599 Allow numeric characters 2015-04-20 13:09:25 +02:00
Steve Buzonas b44c3bee52 add tests to cover different use cases of package install preferences 2015-04-18 20:59:51 -04:00
Steve Buzonas 73c1f8c0e0 prefer strings for install handling when possible 2015-04-18 18:31:16 -04:00
Steve Buzonas 124739d055 fix preference resolution to be backwards compatible 2015-04-18 18:25:59 -04:00
Jordi Boggiano a32c919145 Return null instead of false 2015-04-18 19:11:12 +01:00
Jordi Boggiano 921b3a0eba Fix regression with non-SPDX licenses in show command, refs #3885 2015-04-15 19:27:04 +01:00
Jordi Boggiano 99694a0381 Merge pull request #3940 from phansys/ticket_3859
[bugfix] Fixed undefined var in DiagnoseCommand::execute().
2015-04-15 19:14:17 +01:00
Jordi Boggiano 4aa431025b Merge pull request #3845 from vlakoff/empty-composer.json
Avoid parser error if composer.json existing but empty
2015-04-15 02:51:00 +01:00
Jordi Boggiano ec6d727af8 Add comment about --, refs #3853 2015-04-15 02:48:10 +01:00
Jordi Boggiano e50b5fe990 Merge pull request #3853 from hakre/fix/git-checkout
Git Checkout Branch / File Differentiation
2015-04-15 02:46:16 +01:00
Javier Spagnoletti 294185d1d3 [bugfix] Fixed undefined var in DiagnoseCommand::execute(). 2015-04-14 22:36:54 -03:00
Jordi Boggiano 05e08889ed Add BC method for old usage, refs #3857 2015-04-15 02:23:46 +01:00
Jordi Boggiano 6b3178b169 Merge remote-tracking branch 'isoroku/fix-misspellings'
Conflicts:
	doc/articles/handling-private-packages-with-satis.md
2015-04-15 02:21:44 +01:00
Jordi Boggiano dbfd47eeca CS fixes 2015-04-15 01:22:19 +01:00
Jordi Boggiano 3a06e6f036 Merge pull request #3885 from jakoch/patch-spdx
updated spdx-license handling to include metadata
2015-04-14 23:37:03 +01:00
Jordi Boggiano 66dc66c283 Merge pull request #3929 from phansys/ticket_3859
[bugfix] Fix for #3859
2015-04-14 23:30:15 +01:00
Jordi Boggiano 5fbd4ee0c9 Merge pull request #3923 from mathielen/patch-1
Silence symlink() error
2015-04-14 23:12:02 +01:00
Jordi Boggiano f41c1217f5 Merge pull request #3913 from hannesvdvreken/patch-2
Remove unused variable
2015-04-14 23:10:39 +01:00
Jordi Boggiano e0ddc25db4 Merge pull request #3911 from hannesvdvreken/patch-1
Unused variable
2015-04-14 23:10:17 +01:00
Roshan Gautam 98bc4e4483 Gitlab:Use proper fallbacks if archive download is failing 2015-04-13 21:22:41 +00:00
Javier Spagnoletti 5b2a7e6bad [bugfix] Updated ```DiagnoseCommand::execute()``` and ```DiagnoseCommand::getGithubRateLimit()```
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #3859
| Doc PR        | none

Fixes #3859.
2015-04-11 21:05:17 -03:00
Roshan Gautam 7bf886b3ba Remove two factor authentication 2015-04-11 17:56:11 +00:00
Roshan Gautam 4d5e5b3fb5 Remove parasite 2015-04-11 14:16:08 +00:00
Roshan Gautam f870396568 Add oauth2 support for gitlab 2015-04-10 21:45:24 +00:00
Markus Thielen bd802407a8 Silence symlink() error
If not silenced it gives "symlink(): Operation not supported" on my ubuntu system with mounted cifs share.
2015-04-09 09:45:50 +02:00
Rob Bast 117b7ea033 Fixes #3900 2015-04-08 15:43:30 +02:00
Hannes Van De Vreken b85cb7df82 Remove unused variable 2015-04-07 10:36:11 +02:00
Hannes Van De Vreken d017fa4a1d Unused variable 2015-04-06 11:58:12 +02:00
Frederik Bosch 951b07eabc Fix #3903 2015-04-04 12:38:12 +02:00
Kocsis Máté f385518e1a Fixed merge conflict 2015-03-30 22:38:16 +02:00
Kocsis Máté 985c49d47c Removed unnecessary cwd 2015-03-30 22:27:13 +02:00
Kocsis Máté 258408524f Converted Symlink utility to UTF-8 2015-03-30 20:03:25 +02:00
Kocsis Máté 38c26ae26b Added Symlink utility class 2015-03-30 20:00:12 +02:00
jakoch 74a077dd3d updated spdx-license handling to include metadata
issue https://github.com/composer/composer/issues/3744

summary of changes
- replaced bin script "fetch-spdx-identifiers" by "update-spdx-licenses"
- "update-spdx-licenses" uses "Composer/Util/SpdxLicensesUpdater" to update "spdx-licenses.json" file with license identifier, fullname and osi-approved-status
- dropped "spdx-identifiers.json" (identifiers only)
- dropped "SpdxLicenseIdentifier", it's just "SpdxLicense" now
- modified "ShowCommand" to output the license with metadata and removed some unused method arguments (cleanup)
2015-03-29 22:46:38 +02:00
Frederik Bosch 79490f662e Revert #3813, implement differently
Fix #3830
2015-03-28 20:48:19 +01:00
msiebeneicher 7522a33079 Merge branch 'master' of https://github.com/composer/composer into add_exclude
# By Jordi Boggiano (30) and others
# Via Jordi Boggiano (37) and Morgan Campbell (1)
* 'master' of https://github.com/composer/composer: (83 commits)
  Update 01-basic-usage.md
  Revert 331425bcb3 as well, fixes #3612
  Revert "Disable overwrites when no-ansi is present, fixes #3612"
  Update deps
  Use justinrainbow/json-schema 1.4
  Improved wording
  Fix docs basic-auth => http-basic
  Add test for Generics class
  Single variable for traits and enums
  Use HHVM_VERSION instead of HPHP_VERSION
  Add support for using classmap to autoload Hack enums
  Re-use existing autoloader suffix if available, fixes #3701
  Report Travis CI build success early
  Test on HHVM nightly releases. Allow to fail.
  Make parseJson safer
  Use get home from Config instead of factory
  Fix env override regression, fixes #3820
  [create-project] Used no progress value for dependencies
  Add docBlock and fix CS
  Fix output of first line of progress when output is not decorated, refs #3818
  ...
2015-03-25 16:27:23 +01:00
Andreas Möller 32538a21a2 Enhancement: Sort packages by importance, then alphabetically 2015-03-25 14:10:20 +01:00
Jordi Boggiano c5cd184767 Revert 331425bcb3 as well, fixes #3612 2015-03-24 01:36:30 +00:00
Jordi Boggiano 66b73ea456 Revert "Disable overwrites when no-ansi is present, fixes #3612"
This reverts commit e0d36e19eb.

Conflicts:
	src/Composer/IO/ConsoleIO.php
2015-03-24 01:31:53 +00:00
Stanislav Khromov 6c35dd6b2d Improved wording
All other verbs use are in the form of "doing something", ie Installing, Downloading. "connection" is the odd one out.
2015-03-23 19:36:16 +01:00
Jordi Boggiano ab3622dff1 Merge pull request #3365 from WouterJ/patch-1
Updated validator
2015-03-23 11:56:30 +00:00
isoroku e0657b60a2 Fix misspellings 2015-03-20 14:23:24 +00:00
hakre 7077803aa4 Git Checkout Branch / File Differentiation
This fixes a minor inaccuracy issue when creating git checkout commands
for branches.

The git checkout command used within `GitDownloader::updateToCommit()`
does not use the "`--`" sequence to separate branch from file parameters.

This leads to an inaccuary as git tries as well the branch name as file
name. If the non-existent branch is actually the name of a file, the file
is checked out. If the non-existent branch is not the name of a file, an
error message is given:

> error: pathspec 'non-existent-branch' did not match any file(s) known to
git.

Both cases are not expected for the program flow in
`GitDownloader::updateToCommit()`.

The only thing that is expected is a non-existent branch to fail to
checkout - but with a different error message:

> // reference was not found (prints "fatal: reference is not a tree:
 $ref")

This can be easily fixed by adding the missing separator when constructing
the command which is applied with this commit.
2015-03-19 12:50:06 +01:00
vlakoff d5ab072ec1 Optimize check for empty file 2015-03-17 15:52:44 +01:00
vlakoff 3a68534d20 Fix parser error if composer.json existing but empty 2015-03-14 15:26:53 +01:00
Fred Emmott bdf51ab16d Single variable for traits and enums 2015-03-09 10:05:12 -07:00
Fred Emmott cb1ea889d6 Use HHVM_VERSION instead of HPHP_VERSION 2015-03-09 10:02:10 -07:00
Fred Emmott 33ea86573e Add support for using classmap to autoload Hack enums
fixes composer/composer#3823

Ran tests with both PHP5.5.9-1ubuntu4.5 and HHVM 3.6. Test fails on HHVM only
if I back out the ClassMapGenerator.php change.
2015-03-09 09:38:02 -07:00
Jordi Boggiano b296e654eb Re-use existing autoloader suffix if available, fixes #3701 2015-03-09 11:13:01 +00:00
Jordi Boggiano 9f9cff558e Merge pull request #3825 from fonsecas72/ppp
Use get home from Config instead of factory
2015-03-08 18:02:57 +00:00
Hugo Fonseca e79d067690 Make parseJson safer 2015-03-07 19:01:54 +00:00
Hugo Fonseca c41a187b62 Use get home from Config instead of factory 2015-03-07 13:00:21 +00:00
Jordi Boggiano b80038804f Fix env override regression, fixes #3820 2015-03-06 16:21:40 +00:00
Francis Besset 4f57fafb8d [create-project] Used no progress value for dependencies 2015-03-06 14:09:50 +01:00
Hugo Fonseca 1bb871dca8 Add docBlock and fix CS 2015-03-05 22:01:09 +00:00
Jordi Boggiano 3470cef1f1 Merge pull request #3818 from Hellov/master
Duplicate download progress
2015-03-05 14:44:34 +00:00
Jordi Boggiano 331425bcb3 Fix output of first line of progress when output is not decorated, refs #3818 2015-03-05 14:44:15 +00:00
Jordi Boggiano ad40cdc3fe Fix overwriteError behavior, fixes #3817 2015-03-05 14:40:29 +00:00
Jordi Boggiano d9b5c884ba Detect and warn JSON encoding failures, refs #3786 2015-03-05 14:24:43 +00:00
Hello ef0191ee6a Duplicate download progress 2015-03-05 16:27:27 +03:00
Jérôme Tamarelle c1edfbb65c Add tests on GitLabDriver
Add an interactive prompt for gitlab token

Update doc for gitlab-domains

Add tests on GitLabDriver::supports

Update doc + CS

Optimize branch detection + fix typos

Fix test on GitLab support as it depends on SSL

Remove useless method + fix repository URL containing .git
2015-03-04 00:08:44 +01:00
Jérôme Tamarelle 802b57417a Pass GitLab credential by HTTP header instead of query string to improve security 2015-03-04 00:08:42 +01:00
Jérôme Tamarelle 48fc2eafa0 Add gitlab.com as default GitLab domain 2015-03-04 00:08:42 +01:00
Jerome TAMARELLE 5fece6ae83 Use Gitlab blob API to retreive composer.json files
Store missing composer.json into the cache

[GitLab] Reduce API calls by caching

Download ZIP archives from gitlab + fix repo URL

Fix cached commit objects
2015-03-04 00:08:39 +01:00
Henrik Bjørnskov 782c6303bc Initial GitLab Driver
This is a proof of concept, and mostly done to gather feedback on the
structure of the driver and to see if this is something that Composer
should include in core.

Various review changes based on Stof comments.

* Remove cleanup() as it is implemented by the abstract class.
* Remove wrong comment in getReferences
* Implement getSource (as GitHubDriver does)
* Finish phpDocs for methods.
2015-03-04 00:08:30 +01:00
Nicolas Grekas be22a87d9c Run processes with predictable LANGUAGE=C 2015-03-03 13:10:41 +01:00
Jordi Boggiano eadc167b12 Fix BC layer for events 2015-03-02 18:20:22 +00:00
Jordi Boggiano 82b7fdf4c1 Add BC for Script\Event instances, fixes #3811 2015-03-02 17:02:20 +00:00
Jordi Boggiano b098a2fdde Fix clear cache when a dir does not exist, fixes #3810 2015-03-02 16:40:05 +00:00
Kunal Mehta 05e196893b Add --no-check-publish option to "composer validate"
This is useful when you want to use composer to manage dependencies, but
don't actually want your project to be installable as a composer package.

Any issues that would prevent publishing are still shown, but as a warning
instead of an error.
2015-02-28 12:59:43 -08:00
Jordi Boggiano d5feea83b6 Sync up diagnose command with the installer 2015-02-28 20:20:22 +00:00
Jordi Boggiano 45b1f356c2 Add debug output when a plugin is loaded 2015-02-27 14:31:27 +00:00
Jordi Boggiano 4d665f59b0 Create lock if we only have platform dependencies 2015-02-27 12:20:42 +00:00
Steve Buzonas bf08b6eb90 add support for package based install type preferences 2015-02-26 11:21:14 -05:00
Jérémy Derussé 86e0b847be Allow plugins to register commands 2015-02-26 09:14:25 +01:00
Jordi Boggiano e5985a9b55 Merge pull request #3778 from edhgoose/patch-1
Fix reference to getIO as per #3777
2015-02-25 19:44:34 +00:00
Jordi Boggiano 2eb69f120e Move check to follow the previous code change 2015-02-25 19:30:51 +00:00
Jordi Boggiano 0c775e997e Fallback to https directly if ssh proto is disabled on github private repos, fixes #2786 2015-02-25 18:47:31 +00:00
Edward Hartwell Goose bcb5e479b7 Fix reference to getIO as per #3777 2015-02-25 18:41:13 +00:00
Jordi Boggiano e0ce559838 Merge remote-tracking branch 'alcohol/write-errors-to-stderr'
Conflicts:
	src/Composer/Command/LicensesCommand.php
2015-02-25 18:02:49 +00:00
Jordi Boggiano c573ae5781 Add missing LICENSE files from dependencies, fixes #3776 2015-02-25 17:48:01 +00:00
Jordi Boggiano 182cfbc249 Merge remote-tracking branch 'SofHad/licenses'
Conflicts:
	src/Composer/Command/LicensesCommand.php
2015-02-25 17:30:34 +00:00
Jordi Boggiano 3ba581f0df Improve error messages for required hhvm/php versions, fixes #3767 2015-02-25 16:24:39 +00:00
Christian Flothmann fa3ea2a626 remove unused method argument
Unlike the `TableHelper`, the `render()` method of the `Table` class
does not make use of an `$output` argument. The actual `OutputInterface`
to send the table to is passed in the constructor instead.
2015-02-25 11:54:18 +01:00
Rob Bast 3d329622d7 overwrite -> overwriteError 2015-02-25 11:00:35 +01:00
Rob Bast 3c7a617753 overwriteError + ask[X]() to stderr 2015-02-25 11:00:35 +01:00
Rob Bast ec434e4576 Formatting only 2015-02-25 11:00:35 +01:00
Rob Bast cb336a5416 Implement writeError throughout Composer 2015-02-25 11:00:35 +01:00
Jordi Boggiano 84d4594278 Merge remote-tracking branch 'alcohol/update-tablehelper-to-table' 2015-02-24 14:23:33 +00:00
Jordi Boggiano 0b4a9235f4 CS fixes 2015-02-24 14:22:54 +00:00
Jordi Boggiano 3cff4a3bb9 Check for homepages in local repo first if available to make the home command faster 2015-02-24 13:07:40 +00:00
Jordi Boggiano 09da587ee2 Forward args 2015-02-23 16:37:50 +00:00
Jordi Boggiano 074a748675 missing use statements :s 2015-02-23 16:35:54 +00:00
Jordi Boggiano 3efed220a6 Clean up event dispatching code and make package events extend installer events 2015-02-23 15:34:49 +00:00
Rob Bast 3dd93c91b8 TableHelper is deprecated, switched to Table 2015-02-19 13:56:07 +01:00
Nimit Kalra b2b9688c92 Conform with Symfony Coding Standards
According to Symfony Coding Standards, a single space must be added around binary operators excluding the concatenation operator.

"Add a single space around binary operators (==, &&, ...), with the exception of the concatenation (.) operator" (http://symfony.com/doc/current/contributing/code/standards.html)
2015-02-18 15:06:36 -06:00
Kocsis Máté 7b4fe767a4 Added space before assignment operator 2015-02-18 20:23:13 +01:00
Jordi Boggiano 833ce98426 Merge pull request #3747 from vkartaviy/patch
Added missing $learnedWhy property
2015-02-17 21:55:44 +00:00
Jordi Boggiano 5744981795 Merge pull request #3702 from alcohol/feature/list-scripts
Added --list to run-script command, closes #3671
2015-02-17 20:23:05 +00:00
Jordi Boggiano 0e977e3fde Add more docs to config command 2015-02-17 20:06:02 +00:00
Jordi Boggiano efcd1e4247 Merge pull request #3749 from alcohol/allow-setting-packagist-to-false-through-config-command
composer config repositories.packagist false
2015-02-17 19:41:03 +00:00
Jordi Boggiano b4698568d2 Adjust tests and fix installer code to create the pool using locked requirements and not the composer.json reqs 2015-02-17 14:37:33 +00:00
Felix Kiss b86f9bf4ba Update RootPackageInterface.php
Fix typo
2015-02-17 01:20:56 +01:00
Rob Bast 47d75f77d5 Let's be gentle and allow FALSE too 2015-02-16 16:54:52 +01:00
Rob Bast ef92a06205 composer config repositories.packagist false
closes #3728, closes #3713, closes #3290, not sure about #3025
2015-02-16 16:44:13 +01:00
Vladimir Kartaviy 813fd0b703 Added missing $learnedWhy property 2015-02-16 15:23:06 +02:00
Jordi Boggiano 781d8cb925 Merge pull request #3740 from bestform/ignore-root-requirements-in-installer
Ignore root requirements in installer when installing from locked state
2015-02-14 17:12:21 +00:00
Jordi Boggiano 53925295c3 Merge pull request #3699 from trivago/non_feature_branches
added non-feature-branches
2015-02-14 15:44:45 +00:00
Matthias Derer c9cff6387a removed requirements from the root package should we install from the lock file 2015-02-13 16:15:34 +01:00
msiebeneicher 3682a9f5a7 * Cleanup code comments 2015-02-12 10:18:00 +01:00
msiebeneicher dad6b05ca7 Merge branches 'add_exclude' and 'master' of https://github.com/trivago/composer into add_exclude
* Resolve conflicts and update unit test
2015-02-11 18:04:57 +01:00
msiebeneicher f28785a49d Merge branches 'add_exclude' and 'master' of https://github.com/trivago/composer into add_exclude
* 'add_exclude' of https://github.com/trivago/composer:

# By Jordi Boggiano (239) and others
# Via Jordi Boggiano (184) and others
* 'master' of https://github.com/trivago/composer: (638 commits)
  Simplified syntax
  github deprecation changes
  fix bug in GitDriver::supports for remote repo
  strict check, testcase(s)
  Fix regex matching and add more tests for addSubNode, refs #3721, fixes #3716
  solve edge case for `composer remove vendor/pkg`
  chmod 644 src/Composer/Command/RemoveCommand.php
  Avoid failing on composer show of lazy providers
  Show more info when a download fails
  Add notion of autoloader skipping autoload-dev rules
  Satis grammar fix.
  remove unused statements
  removed needless output param
  + limit git ls-remote to heads + escape repo url
  add check for remote Repository in GitDriver::supports
  suppress the prefix
  Improve notice about /usr/local/bin
  Reuse current file permissions
  Add the P character to the regex pattern
  Added deprecated warning for the dev option
  ...

Conflicts:
	src/Composer/Autoload/AutoloadGenerator.php
	src/Composer/Autoload/ClassMapGenerator.php
2015-02-11 17:54:35 +01:00
Jordi Boggiano 1d8f05f1dd Merge pull request #3726 from davidverholen/patch-1
fix bug in GitDriver::supports for remote repo
2015-02-11 11:31:57 +00:00
Francis Besset 16578d1d01 Simplified syntax 2015-02-11 11:40:41 +01:00
Jordi Boggiano 1f1b334f46 Merge pull request #3711 from alcohol/github-api-v3-deprecations
GitHub api v3 deprecations, closes #3566
2015-02-11 10:28:17 +00:00
Rob Bast a34335a9bb github deprecation changes
- added some tests
- minor bug fixes discovered during testing
- resolved two deprecations (rate limit api and authorizations api)
- added some more comments to make the flow more understandable
2015-02-11 10:18:47 +01:00
David Verholen 2d9401fb13 fix bug in GitDriver::supports for remote repo
for some reason it does not work (in packagist) without the $output param. I don't get any error message here, maybe someone has an idea, why?

Anyway, need this ;)
2015-02-10 13:33:09 +01:00
Jordi Boggiano 6c971c3028 Fix regex matching and add more tests for addSubNode, refs #3721, fixes #3716 2015-02-09 19:11:32 +00:00
Kocsis Máté d7437f19ad Changed config key order 2015-02-04 19:40:50 +01:00
Kocsis Máté f503ee2f4e Adding composer config bin-compat command 2015-02-03 20:34:26 +01:00
Kocsis Máté 08c4732d1e Improving bin-compat configuration 2015-02-03 19:27:29 +01:00
Rob Bast 1b10740473 Added --list to run-script command, closes #3671 2015-02-03 13:56:15 +01:00
Jordi Boggiano 07c644ac22 Merge remote-tracking branch 'alcohol/modify-diagnose-output' 2015-02-03 12:51:10 +00:00
Kocsis Máté 6a776c5edf Supporting bin_compat option 2015-02-03 00:37:11 +01:00
Rob 27d211096c chmod 644 src/Composer/Command/RemoveCommand.php 2015-02-02 16:31:31 +01:00
rkerner abc9d60fcc added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches 2015-02-02 14:36:50 +01:00
Nicolas Toniazzi 865eab602f Merge remote-tracking branch 'parent/master'
Conflicts:
	src/Composer/Factory.php
2015-02-02 14:03:13 +01:00
Jordi Boggiano 8b46880f42 Avoid failing on composer show of lazy providers 2015-01-31 21:24:50 +00:00
Jordi Boggiano 777f2e81a3 Show more info when a download fails 2015-01-31 21:24:48 +00:00
Jordi Boggiano be23cbfa6e Merge pull request #3691 from bragento/master
add check for remote Repository in GitDriver::supports
2015-01-30 20:24:26 +00:00
Jordi Boggiano cee89b5be4 Merge pull request #3694 from TaeL/master
remove unused statements
2015-01-30 10:58:26 +00:00
SofHad f9777bc70a Check if input is interactive 2015-01-30 11:53:42 +01:00
SofHad 1a82ecad91 Refactor the loop + add private method isInteractive 2015-01-30 11:29:58 +01:00
Jordi Boggiano b39e0a271f Merge pull request #3517 from WouterJ/patch-2
Added deprecated warning for the dev option
2015-01-30 10:00:15 +00:00
TaeL Kim 0ec4505401 remove unused statements 2015-01-30 16:39:55 +09:00
Padraic Brady 939a4aa9c2 Get tests running to prep for fixes 2015-01-29 20:59:27 +00:00
Padraic Brady 510ec6b91c A couple of minor omissions from the merge 2015-01-29 20:57:23 +00:00
Padraic Brady 19e24c5804 Merge branch 'master' into tls-config
Conflicts:
	.travis.yml
	doc/03-cli.md
	src/Composer/Command/ConfigCommand.php
	src/Composer/Command/CreateProjectCommand.php
	src/Composer/Command/DiagnoseCommand.php
	src/Composer/Command/InstallCommand.php
	src/Composer/Command/RequireCommand.php
	src/Composer/Command/SelfUpdateCommand.php
	src/Composer/Command/ShowCommand.php
	src/Composer/Command/UpdateCommand.php
	src/Composer/Config.php
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Factory.php
	src/Composer/Repository/ComposerRepository.php
	src/Composer/Repository/PearRepository.php
	src/Composer/Repository/Vcs/VcsDriver.php
	src/Composer/Util/GitHub.php
	src/Composer/Util/RemoteFilesystem.php
2015-01-29 20:31:56 +00:00
brandung GmbH & Co. KG d650f05ddf removed needless output param 2015-01-29 20:00:49 +01:00
Jordi Boggiano 27ce5ec336 Merge pull request #3688 from jeremy-derusse/improve-selfupdate-chmod
Reuse current file permissions in selfupdate
2015-01-29 18:25:30 +00:00
davidverholen 50d068b977 + limit git ls-remote to heads
+ escape repo url
2015-01-29 17:08:32 +01:00
davidverholen 80d7ab57ed add check for remote Repository in GitDriver::supports 2015-01-29 15:46:11 +01:00
Nils Adermann 71f83599bb Merge pull request #3592 from SofHad/show-homepage
Only show instead of open the repository or homepage URL
2015-01-29 13:44:11 +01:00
Nils Adermann c1a722b341 Merge pull request #3678 from arcturial/regex-named-group-fix
Add the P character to the regex pattern
2015-01-29 13:42:11 +01:00
shaddag 0b2a31a89d suppress the prefix 2015-01-29 10:20:31 +01:00
Jérémy Derussé e7f4014018 Reuse current file permissions 2015-01-28 20:00:16 +01:00
Chris Brand 87b7de4d0a Add the P character to the regex pattern
According to http://php.net/manual/en/function.preg-match.php and some other sources named groups should contain a 'P' character after the '?'

Without this, I receive the following error when running an update:

[ErrorException]
  preg_match(): Compilation failed: unrecognized character after (?< at offset 4

Exception trace:
 () at phar:///var/www/git/smmqa/app/admin/composer.phar/src/Composer/Package/Version/VersionParser.php:181
2015-01-28 18:41:54 +02:00
Wouter J 32218e97d1 Added deprecated warning for the dev option 2015-01-28 17:16:58 +01:00
Nils Adermann 2697673666 Merge pull request #3685 from xfornesa/issue3647
fix for issue #3647
2015-01-28 16:17:56 +01:00
Xavier Fornes 2936dc0e55 some micro-optimizations made
refs issue #3657
2015-01-28 14:43:58 +01:00
Xavier Fornes a4ffda699f remove by reference on message parameter
refs issue #3657
2015-01-28 13:38:43 +01:00
Xavier Fornes 3f59c007f7 fix implementation for php 5.3
refs issue #3657
2015-01-28 11:50:54 +01:00
Nils Adermann 0543a32d39 Merge pull request #3610 from bd808/feature/classmap-authoritative
Add classmap-authoritative config setting
2015-01-28 11:26:28 +01:00
Nils Adermann 25d4b85f06 Merge pull request #3665 from theravel/master
#3663 fix error message for config command
2015-01-28 11:19:50 +01:00
Xavier Fornes bb0a2df293 fix for issue #3657
ConsoleIO writing a message which contains end of lines characters
2015-01-28 08:49:38 +01:00
Dmitry Tarasov e047ca9944 #3665 fix exception message coding style 2015-01-23 10:52:53 +03:00
Rob Bast cdcf39b2f0 Don't show download progress 2015-01-22 09:45:26 +01:00
Dmitry Tarasov 506d923e7c #3663 fix error message for config command 2015-01-22 11:26:25 +03:00
Rob Bast 4038477a7f Missed a - 2015-01-21 15:44:59 +01:00
Rob Bast 5b8f9b0390 Altered output of diagnose
- added some docblocks
- added rate limit check for users that have no oauth token configured
- made it 'scream' less (yellow text instead of yellow background)
- reformatted the php ini checks slightly to be more condensed
2015-01-21 15:40:43 +01:00
Jordi Boggiano 825b4b9c63 Improve error message and fix typo, closes #3657 2015-01-20 16:39:06 +00:00
Jordi Boggiano c8011af219 Improve message some more, refs #3655 2015-01-20 10:49:03 +00:00
Jordi Boggiano 57468f6204 Merge pull request #3656 from theravel/master
Improve error message for case with incorrect "repositories"
2015-01-20 10:46:36 +00:00
Dmitry Tarasov f50cfe6d45 Improve error message for case with incorrect "repositories" 2015-01-20 13:44:29 +03:00
Jordi Boggiano 7b308a27f6 Merge pull request #3655 from theravel/master
Fix error handling for incorrect "repositories" array
2015-01-20 10:35:14 +00:00
Jordi Boggiano cd38d1e096 Tweaks to also support 1.0-dev style aliases, refs #3480 2015-01-20 10:26:10 +00:00
Dmitry Tarasov 3b678ee379 Fix error handling for incorrect "repositories" array 2015-01-20 13:03:55 +03:00
Damian Mooyman 7bb85ff21e Support aliases for numeric branches. Fixes #3461 2015-01-20 17:42:01 +13:00
SofHad dd9e208bc7 update the logic 2015-01-20 00:45:39 +01:00
Jordi Boggiano 2a1a963b00 support bitbucket URLs with plain http 2015-01-19 17:56:20 +00:00
Rob Bast 296252330e fix-token-retrying-itself 2015-01-19 17:28:27 +01:00
Alexander Schwenn 395903863b Add 'info' alias for 'show' command 2015-01-15 22:33:31 +01:00
Vladimir Kartaviy 9f0d36290b Added missing variable 2015-01-12 22:48:19 +02:00
Jordi Boggiano 0662036f5e Merge pull request #3641 from cebe/patch-1
Updated the documentation of the require command
2015-01-11 23:38:42 +00:00
Jordi Boggiano c9f666f60b Also clean up DYLD_LIBRARY_PATH before running git, refs #2146 2015-01-11 23:09:41 +00:00
Wouter J 3bf1ee939b Fixed validator to accept 'a/b' and 'a/b ~2.3' 2015-01-11 15:42:13 +01:00
SofHad 6fff09c82a Simplified questionnaire 2015-01-10 23:24:24 +01:00
Carsten Brandt 7e3f4805c0 Updated the documentation of the require command
It did not mention that it is possible to leave out the version constraint.
2015-01-10 17:25:31 +01:00
SofHad aca619e130 Interactive interface with autocompletion 2015-01-09 21:44:39 +01:00
Webber Wu 261a31c149 show change if package directory have changed to symbolic link 2015-01-07 22:52:40 +08:00
Bryan Davis 8ceb5714a4 Fix spelling of "Authoritative"
- classMapAuthoratative -> classMapAuthoritative
- getClassMapAuthoratative -> isClassMapAuthoritative
- Don't use elseif since if block returns
2015-01-05 11:48:34 -07:00
Jordi Boggiano c58b7d917c Disable progress when no-ansi is specified, refs #3612 2015-01-05 16:31:16 +00:00
Jordi Boggiano e0d36e19eb Disable overwrites when no-ansi is present, fixes #3612 2015-01-05 16:17:15 +00:00
Bryan Davis ad1f8e6c5a Add classmap-authoritative config setting
Add a "classmap-authoritative" configuration setting that can be used to
disable searching the various prefix and fallback directories for
classes that have not been registered with the
Composer\Autoload\ClassLoader class map. This setting can be used to
optimize performance by avoiding a potentially large number of
`file_exists` calls when Composer is being used in a program with
additional autoloader facilities. Use of the setting implies
"optimize-autoloader" to ensure that the most complete class map
possible is generated.

Closes #3603
2015-01-03 17:35:25 -07:00
Jordi Boggiano e172cd81a1 Fix lax validation of packages when loading them, fixes #3606, fixes #3605 2015-01-02 07:55:29 +00:00
Jordi Boggiano ddc1d377d7 Merge pull request #3601 from SofHad/unused-parameters
Suppress unused parameters in HomeCommand
2015-01-01 20:54:37 +00:00
Jordi Boggiano 8d0c1a14b3 Add --ignore-platform-reqs to create-project, refs #1426 2015-01-01 16:21:22 +00:00
SofHad 5c43485e57 Suppress unused parameters in HomeCommand 2014-12-29 21:43:57 +01:00
Jordi Boggiano 095dc61295 Rename runAutoloader to dumpAutoloader, refs #3453 2014-12-29 20:29:13 +00:00
Jordi Boggiano b8f4960f0d Merge remote-tracking branch 'mattsah/master' 2014-12-29 20:21:43 +00:00
Jordi Boggiano 82b84f7a0a Fix formatting of constraint output 2014-12-29 19:39:57 +00:00
Jordi Boggiano 0a0ad6c335 Merge pull request #3562 from stof/patch-1
Add the package license for PEAR packages
2014-12-28 15:09:37 +00:00
SofHad 45089a6771 [Minor] remove the unused private variables 2014-12-28 00:45:27 +01:00
SofHad 844b57bf7f Fixed render method 2014-12-27 16:25:21 +01:00
SofHad dc9429c82a Remove deprecated TableHelper and update table style 2014-12-26 01:43:36 +01:00
SofHad c93305a805 To show instead of open the repository or homepage URL 2014-12-26 00:07:49 +01:00
Christophe Coevoet d8813341c3 Support parsing stability flags on complex constraints
Fixes #3570
2014-12-22 12:31:34 +01:00
Jordi Boggiano 60ac971419 Fix relative path fetching when a var uses var replacement, fixes #3564 2014-12-17 21:57:27 +00:00
Jordi Boggiano e0291f3a30 Fix parsing of empty git commits, fixes #3565 2014-12-17 15:25:22 +00:00
Christophe Coevoet d22070526f Add the package license for PEAR packages
Refs https://github.com/composer/satis/issues/192
2014-12-16 18:08:38 +01:00
Jordi Boggiano c54d6f93e3 Add --absolute to resolve absolute paths in config command, otherwise set default back to relative 2014-12-16 14:28:51 +00:00
Jordi Boggiano 331bda235c Fix activation of global plugins, fixes #3557 2014-12-16 11:12:13 +00:00
Jordi Boggiano 2b16a73659 Load plugins before purging packages, fixes #3557 2014-12-15 20:34:23 +00:00
Jordi Boggiano 0c87048fed Also detect full temp dir, fixes #3559 2014-12-15 20:22:08 +00:00
Nicolas Toniazzi 1a5b87442a Fix directory paths when using XDG 2014-12-15 15:10:15 +01:00
Nicolas Toniazzi ad9c3d3b30 Merge branch 'master' of https://github.com/composer/composer
Conflicts:
	src/Composer/Factory.php
2014-12-15 14:36:43 +01:00
Nicolas Toniazzi d3e6a464d6 Fix home directory when system does not support XDG 2014-12-15 14:21:03 +01:00
Rob Bast 47fd093a44 added --no-progress to self-update
closes composer/composer#3555
2014-12-15 08:45:13 +01:00
Jordi Boggiano 901fd838f3 Merge pull request #3450 from nicolas-grekas/prefer-lowest-stable
add --prefer-lowest and --prefer-stable to update command
2014-12-14 13:02:06 +00:00
Jordi Boggiano d621c51b2c Bullet-proof global composer instantiation 2014-12-14 12:36:58 +00:00
Nicolas Grekas e821ac2772 Persist prefer-lowest in composer.lock 2014-12-14 10:29:41 +01:00
Jordi Boggiano 0627d846a5 PluginManager refactoring, fixes #3550 2014-12-13 18:54:42 +00:00
Jordi Boggiano 1622b9a390 Fix tests 2014-12-13 16:14:03 +00:00
Jordi Boggiano 90a29c127f Fix bug when installing 2014-12-13 16:10:51 +00:00
Jordi Boggiano cf9d5f637b Suppress errors when creating global composer 2014-12-13 15:58:42 +00:00
Jordi Boggiano dcd2c9c7c6 Make sure global plugins are purged as well, fixes #3115 2014-12-13 15:49:35 +00:00
Jordi Boggiano cc4223e6f9 Avoid loading plugins that have had their code wiped from filesystem, fixes #3115, closes #3538 2014-12-13 14:54:34 +00:00
Jordi Boggiano bef89604e2 Fix parsing of strings, fixes #3543 2014-12-13 14:31:58 +00:00
Jordi Boggiano aec1af4e11 Point users at troubleshooting if they get known exceptions 2014-12-13 11:47:22 +00:00
Jordi Boggiano 07ad1da3ac Fix HHVM interop 2014-12-13 11:13:25 +00:00
Nicolas Grekas 98b254a3ec split update --prefer-lowest and --prefer-stable 2014-12-13 11:51:30 +01:00
Nicolas Grekas 4a0feb0189 add --prefer-lowest-stable to update command 2014-12-13 11:51:30 +01:00
Andreas Möller 6ddd8d4ec7 Enhancement: Add sort-packages option which allows sorting of packages 2014-12-13 00:24:14 +01:00
Rob d9b8b3611b fixes composer/composer#3546 2014-12-12 22:33:04 +01:00
Rob Bast 113606be7b should fix composer/composer#3382 2014-12-12 18:41:37 +01:00
Jordi Boggiano 8dad846613 Add SNI settings for SSL URLs that are proxied, fixes #3204 2014-12-12 12:25:21 +00:00
Jordi Boggiano 4a6503fe36 Add suppor for https_proxy, fixes #3204 2014-12-11 17:42:55 +00:00
Jordi Boggiano 2131c8b480 Simplify tag probe 2014-12-09 22:40:08 +00:00
Thijs Lensselink 6ccc804094 Fix #3521 version mismatch when running diag, Replaced git command to get current checked out tag 2014-12-09 21:41:31 +01:00
Jordi Boggiano 5133c3fe9a Merge pull request #3424 from kaktus42/master
return false if local file path does not exist in GitDriver and HgDriver
2014-12-09 14:12:13 +00:00
Jordi Boggiano 10401d544b Avoid leftovers in temp dir 2014-12-09 11:32:02 +00:00
Jordi Boggiano 3ff8bcffea Allow loading of real composer repos by local path, fixes #1899 2014-12-08 22:04:10 +00:00
Jordi Boggiano d8f043e12c Remove object state from methods to simplify things, refs #3385 2014-12-08 21:19:55 +00:00
Jordi Boggiano dc6da039d5 Merge remote-tracking branch 'gimler/licenses_no_dev' 2014-12-08 21:09:44 +00:00
Jordi Boggiano d4523119ea Use caret operator for 0.x releases when guessing versions, fixes #3518 2014-12-08 17:05:50 +00:00
Jordi Boggiano 06e96a78e2 Update ranges for 0.N versions, refs #3518 2014-12-08 17:04:59 +00:00
Jordi Boggiano 9438f3a58f Use better semver ranges for 0.x versions, fixes #3518 2014-12-08 16:57:27 +00:00
Jordi Boggiano 92f4c1fb35 Allow and ignore semver build metadata, fixes #2422 2014-12-08 15:52:32 +00:00
Jordi Boggiano f363f9d370 Add support for caret (^) operator 2014-12-08 15:39:52 +00:00
Jordi Boggiano ebab9db27a Add support for hyphen ranges 2014-12-08 13:44:42 +00:00
Jordi Boggiano 69ef80124f Add support for capital X in 3.X and || for OR 2014-12-08 12:59:01 +00:00
Jordi Boggiano 4c713978e9 Add more tests and validate that there is only one comma 2014-12-07 18:07:30 +00:00
Jordi Boggiano ca168d478b Spaces are now equivalent to comma in constraints and mean AND 2014-12-07 18:07:29 +00:00
Jordi Boggiano 029f709300 Fix parsing stability suffixes in multi constraints, fixes #1732 2014-12-07 17:46:04 +00:00
Jordi Boggiano fc3c7838b2 CS fixes 2014-12-07 13:54:29 +00:00
Jordi Boggiano 59648b12a4 Add HHVM support in UA header 2014-12-07 13:47:34 +00:00
Jordi Boggiano d249d0c121 Reset composer to load the new requirements, fixes #3511 2014-12-05 11:58:21 +00:00
Nils Adermann 6340f4ca58 Merge pull request #3493 from spreston/master
Fixed dependency problem caused by pull request #3482
2014-12-04 16:46:55 +01:00
Nils Adermann 859c8f5bb3 Use the repositories configured in composer.json for the require command 2014-12-04 16:14:32 +01:00
Jordi Boggiano 37ec0bde9d Merge pull request #3502 from acoulton/patch-1
Prevent APC causing random fatal errors [fixes #264]
2014-12-03 15:33:35 +00:00
Andrew Coulton 9ca99762f9 Prevent APC causing random fatal errors [fixes #264]
Update the phar stub to prevent APC attempting to run the composer classes through
the opcode cache on supported APC versions to avoid the random fatal "duplicate
class" errors at runtime as reported in #264.

Prior to APC version 3.0.12 this was a PHP_INI_SYSTEM directive, so output a
warning instead.
2014-12-03 15:11:51 +00:00
Douglas Greenshields fac3e135e3 fix typo 2014-12-03 13:25:25 +00:00
Jordi Boggiano 2b7b605839 Skip empty time values 2014-12-03 13:06:46 +00:00
Nicolas Toniazzi 75448ff09c Merge branch 'master' of github.com:ntoniazzi/composer
Conflicts:
	doc/04-schema.md
	src/Composer/Factory.php
2014-12-03 11:58:49 +01:00
Nicolas Toniazzi 83a1441285 Added support for backup PHARs 2014-12-03 11:56:58 +01:00
ntoniazzi b79f38fd99 Conforming to XDG Base Directory Specification (http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html) 2014-12-03 11:55:50 +01:00
ntoniazzi c6860400f0 Conforming to XDG Base Directory Specification (http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html) 2014-12-03 11:53:09 +01:00
Steve Preston dfe18d2e7f Fixed dependency problem caused by pull request #3482 2014-12-02 11:46:56 -05:00
Yagiz Nizipli bf210a340b Free up memory before disabling gc. 2014-12-02 16:02:20 +02:00
Jordi Boggiano 947c1fbabb Merge pull request #3484 from stof/fix_rule
Fix the display of rules
2014-12-02 10:28:03 +00:00
Jordi Boggiano ac676f47f7 Disable GC when computing deps, refs #3482 2014-12-02 10:23:21 +00:00
Christophe Coevoet 7fd9341464 Fix the display of rules
Close #3483
2014-12-01 22:56:59 +01:00
Nils Adermann 91dd999eb6 Merge pull request #3383 from mpoiriert/patch-1
change preProcess from private to public
2014-12-01 20:19:35 +01:00
Nils Adermann b2d5bb7583 Merge pull request #3389 from andrerom/undefied_getio_fn
Fix use of non existing ->getIO() function
2014-12-01 20:17:30 +01:00
Nils Adermann 4a945da55b Avoid generating duplicate conflict rules
For each version of each package we create a conflict rule with each
other version. These are then added to the rule set and skipped if
duplicate so instead we can just generate them only once to begin with
and avoid unnecessary memory allocation and duplication lookups.
2014-12-01 20:10:05 +01:00
Jordi Boggiano f291bf6f5c Merge pull request #3481 from naderman/optimize-solver
Solver optimizations
2014-12-01 19:05:42 +00:00
Nils Adermann 6f41e99fe2 Add back ruleById function for BC 2014-12-01 19:11:02 +01:00
Nils Adermann 2c43a3bcd0 Improve docblocks of public properties 2014-12-01 19:07:26 +01:00
Nils Adermann 107a736440 Recreate getLiterals method for BC 2014-12-01 19:05:01 +01:00
Nils Adermann 26598c4a9a Remove unnecessary pool reference from rules 2014-12-01 19:02:50 +01:00
Nils Adermann d77400ade2 Make ruleById lookup table in rule set public
Saves about 500k function calls on a packagist update
2014-12-01 18:28:45 +01:00
Nils Adermann 5c0efdcaa2 Move public properties to top and document them 2014-12-01 18:25:22 +01:00
Nils Adermann c6af09b1da Make project id public
Reduction of rougly 1.3 million function calls on packagist update
2014-12-01 18:18:02 +01:00
Nils Adermann ef41f136f8 Literals on rule are now public
This causes a reduction of ~500k function calls for packagist composer
update (~14 million total).
2014-12-01 18:08:56 +01:00
Matthew J. Sahagian 55b2afe9ad Expose no autoloader option to update command 2014-11-21 13:22:17 -08:00
Matthew J. Sahagian 198ac7bc5b Expose no autoloader option to install command 2014-11-21 13:20:48 -08:00
Matthew J. Sahagian 5896f283be Allow for disabling autoloader on Installer 2014-11-21 13:16:19 -08:00
Nils Adermann b23a3cd368 Merge pull request #3423 from Michael-Gusev/patch-1
Issue #3422
2014-11-21 18:59:11 +01:00
Nils Adermann 96955dd23b Merge pull request #3264 from duncan3dc/remove-self-update-warning
Don't display the dev warning time when running self-update
2014-11-21 18:51:14 +01:00
Nils Adermann b21f2be651 Merge pull request #3448 from cs278/config-env-test
Fix config tests when environment variables are set
2014-11-21 15:57:16 +01:00
Nils Adermann 5333017aea Remove unused selectNewestPackages method in DefaultPolicy
Unused as of 1b6f57e651
2014-11-21 15:26:09 +01:00
Chris Smith 86b5938cdb Allow reading of COMPOSER_ environment variables to be disabled 2014-11-21 10:14:40 +00:00
Craig Duncan b84c3f0268 Don't display the dev warning time when running self-update
Use the Application::find() method to resolve the command name, as Application::getCommandName() only returns whatever was entered as the first argument.
If the user only entered enough of the command to be unambiguous (eg self-up) then the warning would still show
By calling Application::find() we ensure that if we are going to run the self-update command then we will not show the warning, no matter what the user entered
2014-11-20 18:21:14 +00:00
Nils Adermann dccb728e10 Remove further unnecessary checks for packages being arrays 2014-11-20 17:42:05 +01:00
Nils Adermann 89bd9be295 This entirely removes StreamableRepositories and minimal package arrays 2014-11-20 17:23:51 +01:00
Sam Mousa 670ca2f889 Fixed issue #3441 2014-11-20 14:17:40 +01:00
Nils Adermann 6f4be698a5 Merge pull request #3325 from rdohms/implementing-abandoned-packages
Abandoned Package Warnings
2014-11-20 13:09:18 +01:00
Nils Adermann 9751e1ab58 Remove unnecessary collection of names which isn't used 2014-11-20 12:54:56 +01:00
Nils Adermann 83159dc153 Use elseif instead of else { if { 2014-11-20 12:54:56 +01:00
Nils Adermann 0daaa1a902 Reduce whatProvides overhead 2014-11-20 12:54:56 +01:00
Nils Adermann ee56db8767 Remove the handling of updates in the generator
Updates are implicitly handled by whatProvides for install requests
2014-11-20 12:54:53 +01:00
Nils Adermann 8a40b2443e Merge pull request #3419 from olaurendeau/master
Add --ignore-platform-reqs for remove and require commands
2014-11-19 17:25:43 +01:00
Christophe Coevoet b0f13e0ab6 Fix typo 2014-11-18 11:39:47 +01:00
Christophe Coevoet c571ccafd3 Restrict the JSONC fix to affected versions 2014-11-18 11:37:26 +01:00
Christophe Coevoet f3d8323a71 Fixed the json formatting when using JSONC 2014-11-18 11:18:14 +01:00
Michael Gusev a531594a4a Issue #3422
https://github.com/composer/composer/issues/3422
2014-11-17 11:05:23 +01:00
kaktus42 116ccdac62 return false if local file path does not exist in GitDriver and HgDriver 2014-11-16 23:34:25 +01:00
Olivier Laurendeau b6b3cf3a49 Add ignore-platform-reqs option to require command 2014-11-14 17:32:42 +01:00
Olivier Laurendeau 6784570691 Add ignore-platform-reqs option to remove command 2014-11-14 17:32:31 +01:00
Colin O'Dell f304611014 Fix Git failures due to tag ambiguity (issue #3417) 2014-11-14 10:31:52 -05:00
d060631 cfa8432a60 add no-dev option to licenses command 2014-11-06 08:12:22 +01:00
André R 9e0a85fb64 Fix use of non existing ->getIO() function 2014-11-03 19:31:00 +01:00
mpoiriert 2a4b125125 change preProcess from private to public
I need to override the preProcess method from a child class.

The use case is related to package renaming in a private satis repository. I understand the implication for packagist (and other public repository) but keeping the root packageName cause problem when you need to rename a package.

I will override override the name assignation with this

```PHP

// use the main identifier if name is not present
$data['name'] = !isset($data['name']) ? $this->packageName : $data['name'];

```
2014-10-30 09:19:10 -04:00
Jordi Boggiano a309e1d89d Fix tests and run it before the push url updater 2014-10-20 20:16:14 +01:00
Jordi Boggiano fb1747624c Force the origin remote url to be the original one and not that of a mirror 2014-10-20 19:50:22 +01:00
Jordi Boggiano 373c688f8c Merge pull request #3362 from phansys/composer_version
Added branch-alias to version output when it is aliasing dev-master
2014-10-17 20:28:38 +01:00
Javier Spagnoletti 5a473439ed Updated $branchAliasVersion set based on @Seldaek's suggestion. 2014-10-17 15:07:26 -03:00
Jordi Boggiano 3e1d0681d1 Merge pull request #3334 from NAYZO/master
minor fixes in DownloadManager.php
2014-10-17 19:01:20 +01:00
Jordi Boggiano 94926218e8 CS fixes 2014-10-17 18:57:27 +01:00
Jordi Boggiano 751190aafd Add new github-expose-hostname to docs/schema/config command, refs #3164 2014-10-17 17:21:59 +01:00
Jordi Boggiano e4d96750ee Merge pull request #3164 from xelan/github-expose-hostname-setting
Option to disable inclusion of hostname in OAuth app name
2014-10-17 17:16:30 +01:00
Jordi Boggiano be53c5dd2c Merge pull request #3207 from cs278/handle-low-diskspace
Handle low diskspace errors
2014-10-17 17:12:31 +01:00
Jordi Boggiano 0c5e178b9d Merge pull request #3363 from aaukt/master
Add fallback for findPackage(s) for repo without provider
2014-10-17 16:48:51 +01:00
Jordi Boggiano 332a933e8b Remove fallback on missing commit, fixes #3314, fixes #3147 2014-10-17 16:33:00 +01:00
Jordi Boggiano 9c32f24cfc Remove original indent if present, fixes #3143 2014-10-17 16:06:01 +01:00
Jordi Boggiano e38ec7162a Merge remote-tracking branch 'origin/master' 2014-10-17 15:30:41 +01:00
Jordi Boggiano ec0463a400 Add tests for platform packages required by root and avoid creating rules altogether instead of disabling them, refs #3320 2014-10-17 15:30:27 +01:00
aaukt f8fae61b05 Add fallback for findPackage(s) for repo without provider
This was introcuced in a4d43ee860, but is missing the fallback for a repository without providers.
2014-10-17 09:10:47 +02:00
Javier Spagnoletti e36f2ea618 Added branch-alias for dev-master to --version|-V output when current version is actually a revision (a non release/git tag).
This replies the work done in #3352 respecting other uses of ```Composer::VERSION``` constant.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Doc PR        | none
2014-10-16 22:13:17 -03:00
Nicolas Toniazzi 50c6c100fa Added support for backup PHARs 2014-10-16 14:39:48 +02:00
Jordi Boggiano b0cabd1e98 Revert "Added branch-alias for dev-master to ```--version|-V``` output when current", fixes #3356
This reverts commit 225a8f7a56.
2014-10-16 08:43:09 +01:00
Jordi Boggiano 71976a638c Merge remote-tracking branch 'alu/ignore-ext-require'
Conflicts:
	src/Composer/Installer.php
2014-10-15 14:42:07 +01:00
Jordi Boggiano c33c5196b1 Merge pull request #3352 from phansys/composer_version
Added branch-alias to version output when no tags present
2014-10-15 14:11:07 +01:00
Nicolas Toniazzi e6560c0462 Merge origin/master
Conflicts:
	doc/03-cli.md
	doc/04-schema.md
	src/Composer/Factory.php
2014-10-15 15:08:59 +02:00
Jordi Boggiano ded4950433 Merge pull request #3348 from jakoch/patch-isdryRun
added $installer->isDryRun()
2014-10-15 13:58:05 +01:00
Jordi Boggiano 4bdd7adc55 Merge pull request #3319 from desyncr/bugfix/missing-default-author-value-validation
Fix missing validation on default value for author input
2014-10-15 13:33:30 +01:00
Jordi Boggiano b7bd165fed Merge pull request #3122 from garthkerr/patch-1
Add blank line to output for FileDownloader.
2014-10-14 18:21:22 +01:00
Javier Spagnoletti 225a8f7a56 Added branch-alias for dev-master to ```--version|-V``` output when current
version is actually a revision (a non release/git tag).
Example:

Before:
```
$ composer --version
Composer version 73e9db5d99 2014-10-07 15:03:19
```

After:
```
$ composer --version
Composer version 1.0-dev (73e9db5d99) 2014-10-07 15:03:19
```

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Doc PR        | none
2014-10-13 16:17:28 -03:00
jakoch 24b4ce8831 added $installer->isVerbose() 2014-10-11 19:46:37 +02:00
jakoch c8b9d299d5 added $installer->isDryRun() 2014-10-11 19:30:19 +02:00
Ala Eddine Khefifi 7cea912d30 minor fixes in DownloadManager.php
We should use "===" instead of "==" since it's better and faster in this case.
2014-10-08 11:25:00 +01:00
alu b7fa302b90 add ignore-platform-package-requirements for update/install commands. 2014-10-08 14:20:36 +09:00
Jordi Boggiano 73e9db5d99 Fix the problem at the source, refs #3322 2014-10-07 16:03:19 +01:00
Jordi Boggiano 5c42cc8c8c Merge remote-tracking branch 'AydinHassan/hotfix/init-virtual-packages' 2014-10-07 15:51:21 +01:00
Jordi Boggiano df7c8915fa Skip notification about matches found in case we have an exact match, refs #3261 2014-10-07 15:45:25 +01:00
Jordi Boggiano d4062a5594 Merge remote-tracking branch 'kayladnls/kayla' 2014-10-07 15:40:33 +01:00
Jordi Boggiano d093481ed5 Merge remote-tracking branch 'garoevans/intelligent-auth'
Conflicts:
	src/Composer/Util/Git.php
2014-10-07 15:15:23 +01:00
Jordi Boggiano 6e4a21d700 Merge remote-tracking branch 'hakre/patch-2' 2014-10-07 14:10:29 +01:00
Jordi Boggiano 923191a489 Merge remote-tracking branch 'hakre/patch-1' 2014-10-07 13:45:32 +01:00
Jordi Boggiano 4ce9252255 Avoid passing args to CLI handlers when none are needed, fixes #3332 2014-10-07 11:27:24 +01:00
Jordi Boggiano 382b6c64d5 Output CWD change, refs #3332 2014-10-07 10:17:48 +01:00
Christophe Coevoet 4685b4bf49 Fixed the resetting of the json file on removal failures
Closes #3329
2014-10-05 14:30:44 +02:00
Jordi Boggiano 2e1373b339 Update require message and delete empty file at the end in case of failure, fixes #3260 2014-10-04 17:31:45 +01:00
Jordi Boggiano 109f4ffd5e Normalize json across all php versions, fixes #3226 2014-10-04 17:02:42 +01:00
Jordi Boggiano fc14d33491 Fix json nesting issue, fixes #3323 2014-10-04 16:35:10 +01:00
Artur Eshenbrener 56482cff0a Changed short array syntzx to long 2014-10-03 18:31:02 +04:00
Artur Eshenbrener ad1d0be420 Accessing to option 'optimize-autoloder' inside 'post-autoload-dump' script event. 2014-10-03 18:28:16 +04:00
Rafael Dohms 346133d2a1 PR Review
- reverted comma removal
- made getReplacementPackage consistent
- removed abandoned flag if false
2014-10-03 15:12:16 +02:00
Rafael Dohms f9f2bbac59 Abandoned packages support
Added warning to the installer process.
If any installed packages are flagged, the user will get a warning at the end
of the install/update process.
2014-10-03 14:48:28 +02:00