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
fa398e14c7
Fix indent detection in json files when an empty line starts the object
2015-04-29 22:42:57 +01:00
32a479a1e7
Fix subkey manipulation when the main key does not exist yet
2015-04-29 22:42:41 +01:00
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
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
fd7e28b8b4
Restore special handling of conflict/provide/replace
2015-04-29 20:57:00 +01:00
b02bdb4c7a
[alias] RootAliasPackage manages the requirements correctly
2015-04-29 20:56:58 +01:00
a811142ff2
Merge pull request #3978 from marc-mabe/hotfix/3976
...
fixes #3976 : drop ext/ctype dependency
2015-04-29 20:38:10 +01:00
ff1ce78e6b
fixes #3976 : drop ext/ctype dependency
2015-04-29 21:19:15 +02:00
c9bdf3a07a
added the actual phpversion into the error message when phpversion doesn satisfy the requirement
2015-04-29 18:21:18 +02:00
1cb427ff5c
Force http1.1 protocol
2015-04-26 22:18:04 +01:00
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
35a9b5dbf9
Merge pull request #3953 from alcohol/allow-numeric-author-name
...
Allow numeric author name
2015-04-21 20:47:49 +01:00
ec9eb2b799
update init type question
2015-04-21 13:19:18 -04:00
5ed001765f
allow package type to be set with init command
2015-04-21 13:19:18 -04:00
c7d387f599
Allow numeric characters
2015-04-20 13:09:25 +02:00
a32c919145
Return null instead of false
2015-04-18 19:11:12 +01:00
921b3a0eba
Fix regression with non-SPDX licenses in show command, refs #3885
2015-04-15 19:27:04 +01:00
99694a0381
Merge pull request #3940 from phansys/ticket_3859
...
[bugfix] Fixed undefined var in DiagnoseCommand::execute().
2015-04-15 19:14:17 +01:00
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
ec6d727af8
Add comment about --, refs #3853
2015-04-15 02:48:10 +01:00
e50b5fe990
Merge pull request #3853 from hakre/fix/git-checkout
...
Git Checkout Branch / File Differentiation
2015-04-15 02:46:16 +01:00
294185d1d3
[bugfix] Fixed undefined var in DiagnoseCommand::execute().
2015-04-14 22:36:54 -03:00
05e08889ed
Add BC method for old usage, refs #3857
2015-04-15 02:23:46 +01:00
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
dbfd47eeca
CS fixes
2015-04-15 01:22:19 +01:00
3a06e6f036
Merge pull request #3885 from jakoch/patch-spdx
...
updated spdx-license handling to include metadata
2015-04-14 23:37:03 +01:00
66dc66c283
Merge pull request #3929 from phansys/ticket_3859
...
[bugfix] Fix for #3859
2015-04-14 23:30:15 +01:00
5fbd4ee0c9
Merge pull request #3923 from mathielen/patch-1
...
Silence symlink() error
2015-04-14 23:12:02 +01:00
f41c1217f5
Merge pull request #3913 from hannesvdvreken/patch-2
...
Remove unused variable
2015-04-14 23:10:39 +01:00
e0ddc25db4
Merge pull request #3911 from hannesvdvreken/patch-1
...
Unused variable
2015-04-14 23:10:17 +01:00
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
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
117b7ea033
Fixes #3900
2015-04-08 15:43:30 +02:00
b85cb7df82
Remove unused variable
2015-04-07 10:36:11 +02:00
d017fa4a1d
Unused variable
2015-04-06 11:58:12 +02:00
951b07eabc
Fix #3903
2015-04-04 12:38:12 +02:00
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
79490f662e
Revert #3813 , implement differently
...
Fix #3830
2015-03-28 20:48:19 +01:00
c5cd184767
Revert 331425bcb3 as well, fixes #3612
2015-03-24 01:36:30 +00:00
66b73ea456
Revert "Disable overwrites when no-ansi is present, fixes #3612"
...
This reverts commit e0d36e19eb
2015-03-24 01:31:53 +00:00
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
ab3622dff1
Merge pull request #3365 from WouterJ/patch-1
...
Updated validator
2015-03-23 11:56:30 +00:00
e0657b60a2
Fix misspellings
2015-03-20 14:23:24 +00:00
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
d5ab072ec1
Optimize check for empty file
2015-03-17 15:52:44 +01:00
3a68534d20
Fix parser error if composer.json existing but empty
2015-03-14 15:26:53 +01:00
bdf51ab16d
Single variable for traits and enums
2015-03-09 10:05:12 -07:00
cb1ea889d6
Use HHVM_VERSION instead of HPHP_VERSION
2015-03-09 10:02:10 -07:00
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