1
0
Fork 0
Commit Graph

4 Commits (c1b8e308df69b60e83c2af82cd112f2e751ba823)

Author SHA1 Message Date
Igor Wiedler 2df96bcad3 [schema] Fix invalid JSON 2012-02-19 21:15:51 +01:00
Igor Wiedler ee73b332e5 Merge remote-tracking branch 'upstream/master' into docs
* upstream/master: (42 commits)
  Correct the parent path in the watch tree, after moving a rule out of the path
  Add config in composer json schema
  Add scripts to json schema
  Use updateAll request method in upddate mode in install command
  Readd update-all jobs and make them available through the request
  Fix local git repo handling in GitDriver
  Add getVersionConstraint test case to avoid version normalization issues
  Fix line endings of Composer TestCase
  Correct placing of braces
  Clean up the incomplete marker like suggested in https://github.com/composer/composer/pull/324#r465391
  When changing watched literals of a rule, update the parent's next pointer
  Fix TODO tags to confirm with the projects standard
  Display undecided literals as undecided with a ?, when printing the decision map
  Add a debug print method for the entire watch tree to the solver
  Support both require and requires as depends link-type arg
  Create an impossible rule when trying to install something that doesn't exist.
  Add todos to explain why try/catch is inside the test
  Add SolverProblemsException and test basic solver failures
  Deciding to install a package and wanting to install it, is not a conflict
  Restore realpath behavior
  ...

Conflicts:
	Resources/composer-schema.json
2012-02-19 21:09:06 +01:00
Igor Wiedler f4511271a8 [docs] schema chapter describing composer.json 2012-02-19 21:07:30 +01:00
Igor Wiedler 61d24acaa2 [docs] introduction chapter 2012-02-18 13:34:07 +01:00