1
0
Fork 0
Commit Graph

3386 Commits (e810a7913eee474576be809f542d57bdd74f595e)

Author SHA1 Message Date
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 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
Jordi Boggiano 1cb427ff5c Force http1.1 protocol 2015-04-26 22:18:04 +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
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