1
0
Fork 0
Commit Graph

3411 Commits (ab02867015786c742e2a57d3be0eb50648945088)

Author SHA1 Message Date
Rob Bast c7d387f599 Allow numeric characters 2015-04-20 13:09:25 +02: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
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
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
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
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
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
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
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
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
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
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
Jordi Boggiano 8b46880f42 Avoid failing on composer show of lazy providers 2015-01-31 21:24:50 +00:00