1
0
Fork 0
Commit Graph

5619 Commits (6f21bd425a560ac491e9c58d1b22872569c05302)

Author SHA1 Message Date
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
Jordi Boggiano 46924cf5f5 Merge pull request #3854 from hakre/fix/symlink-missing
Prevent fatal error on missing symlink() function in tests
2015-04-15 02:43:13 +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 c3ce13c87c Update contributing 2015-04-15 02:16:05 +01:00
Jordi Boggiano 30df3236bd Add multiline_array_tailing_comma fix 2015-04-15 02:13:18 +01:00
Jordi Boggiano 39c912005b Merge pull request #3869 from SchulteMarkus/patch-1
Explaining how to deal with cyclic dependency problems within Jenkins-bu...
2015-04-15 02:05:50 +01:00
Jordi Boggiano 1b3ca77bd5 Merge pull request #3878 from jakoch/patch-docu-httpheaderauth
added "example using a custom HTTP Header field" to docu, issue https://...
2015-04-15 01:59:55 +01:00
Jordi Boggiano d0695b2a6d Merge pull request #3784 from slbmeh/feature/update-rm-tests
Use data provider in RepositoryManager tests
2015-04-15 01:36:01 +01:00
Jordi Boggiano fda4a594f9 Add PHPCSFixer config 2015-04-15 01:22:20 +01:00
Jordi Boggiano dbfd47eeca CS fixes 2015-04-15 01:22:19 +01:00
Jordi Boggiano 8a154d7300 Merge pull request #3891 from geo4orce/patch-1
Update 04-schema.md
2015-04-14 23:51:12 +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
Jordi Boggiano 87f3a0060e Merge pull request #3902 from TomasVotruba/patch-1
Readme: 00-intro - use __DIR__
2015-04-14 23:04:31 +01:00
Jordi Boggiano 31359510e5 Merge pull request #3936 from ajpevers/patch-1
Ignore all .git dirs in the vendor dir recursively
2015-04-14 23:01:56 +01:00
Jordi Boggiano 467f82fc15 Merge pull request #3935 from hannesvdvreken/patch-3
Link to semver version constraint tester
2015-04-14 23:01:25 +01:00
Jordi Boggiano 6afa0d1094 Merge pull request #3931 from richardkmiller/patch-1
Fix typo in aliases.md
2015-04-14 23:00:23 +01:00
Jordi Boggiano 775f6cd5c6 Update changelog 2015-04-14 22:18:51 +01:00
Anton Evers cc3a8379e2 Ignore all .git dirs in the vendor dir recursively
In accordance with http://git-scm.com/docs/gitignore
2015-04-14 09:46:53 +02:00
Hannes Van De Vreken 93f73ecc8c Link to semver version constraint tester 2015-04-14 09:21:48 +02:00
Richard K Miller 5b3457f812 Fix typo in aliases.md 2015-04-13 10:49:35 -06: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
Jordi Boggiano 4d134ce8a2 Merge pull request #3917 from alcohol/lowercase-packagename-before-lookup
Fixes #3900
2015-04-08 14:43:49 +01:00
Rob Bast 117b7ea033 Fixes #3900 2015-04-08 15:43:30 +02:00
Jordi Boggiano 213d4803ac Merge pull request #3909 from frederikbosch/auth-fix-mirror
Fix #3903
2015-04-08 11:39:02 +01: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
Tomáš Votruba 0924318c17 Readme: 00-intro - use __DIR__
It is best practice to use `__DIR__` constant. Also it's used in `autoload.php` itself.
2015-04-02 02:22:46 +02:00
Geo 2070b95e27 Update 04-schema.md 2015-03-30 17:19:20 -04: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
Jordi Boggiano f10c714751 Merge pull request #3884 from frederikbosch/auth-fix-chh
Fix #3813,  #3830
2015-03-29 15:37:42 +01:00
Frederik Bosch 79490f662e Revert #3813, implement differently
Fix #3830
2015-03-28 20:48:19 +01:00
jakoch cf7441bc27 added "example using a custom HTTP Header field" to docu, issue https://github.com/composer/composer/issues/3756 2015-03-27 19:01:16 +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
Jordi Boggiano 8cfd48c479 Merge pull request #3873 from jmorganc/patch-1
Update 01-basic-usage.md
2015-03-25 14:32:49 +00:00
Morgan Campbell 7cb9b9a985 Update 01-basic-usage.md
Added a missing "the" so the sentence flows a little better.
2015-03-25 08:32:29 -05:00
Andreas Möller 32538a21a2 Enhancement: Sort packages by importance, then alphabetically 2015-03-25 14:10:20 +01:00