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
f4511271a8
[docs] schema chapter describing composer.json
2012-02-19 21:07:30 +01:00
dd443cd570
Complete circular dependency with alternatives through virtual packages test
2012-02-19 20:08:15 +01:00
716d9dc80a
Merge pull request #331 from naderman/fix-rule-parent-path
...
Correct the parent path in the watch tree, after moving a rule out of the path
2012-02-19 10:22:15 -08:00
ff620afe05
Correct the parent path in the watch tree, after moving a rule out of the path
2012-02-19 19:20:12 +01:00
d0d5329f6f
Fix package repositories
2012-02-19 19:12:56 +01:00
44e76e06fc
Refactor repositories configuration
2012-02-19 19:00:12 +01:00
0cb02cf3ca
Add config in composer json schema
2012-02-19 18:24:27 +01:00
ab51095f4c
Add scripts to json schema
2012-02-19 18:11:38 +01:00
bb160a3162
Merge pull request #328 from naderman/update-all
...
Update all
2012-02-19 08:16:20 -08:00
509188c112
Use updateAll request method in upddate mode in install command
2012-02-19 17:14:11 +01:00
3e1749fbad
Readd update-all jobs and make them available through the request
2012-02-19 16:59:04 +01:00
c95b4d05fd
Fix forcing of the source-ref from lock file
2012-02-19 16:57:36 +01:00
4233a4823d
Skip platform repo and only force-update packages that have a new source ref
2012-02-19 16:57:36 +01:00
646d01658a
Rename source_ref to source-ref
2012-02-19 16:57:35 +01:00
c12dccd3d4
Restore quality of debug output
2012-02-19 16:57:34 +01:00
d7350b66d5
Ensure dev packages have a source
2012-02-19 16:57:33 +01:00
88b018068c
Force dev packages to update to latest ref on update
2012-02-19 16:57:33 +01:00
496188f714
Force installs from lock to reinstall dev packages from the exact locked reference
2012-02-19 16:57:32 +01:00
c1baa20fec
Lock reference of dev packages
2012-02-19 16:57:31 +01:00
3fe87b1e35
Force dev packages to be installed from source
2012-02-19 16:57:30 +01:00
f73c08043f
Refactor VcsRepo to follow new dev model
2012-02-19 16:57:29 +01:00
3e6176eccf
Update version parser to support any branch name
2012-02-19 16:57:29 +01:00
ae7107fc22
Add more test requirements
2012-02-19 16:57:28 +01:00
882496b926
Adjust version parser tests
2012-02-19 16:57:27 +01:00
a175ebed33
Add failing test for new dev behavior
2012-02-19 16:57:26 +01:00
9725e814d7
Merge pull request #327 from Seldaek/git-fix
...
Fix local git repo handling in GitDriver
2012-02-19 07:50:20 -08:00
32157a3904
Fix local git repo handling in GitDriver
2012-02-19 16:38:07 +01:00
9b8e62396c
Merge pull request #324 from edorian/installNonExistingPackage
...
Create an 'impossible rule' when installing non existent packages
2012-02-19 07:05:21 -08:00
57ac535dc8
Merge pull request #326 from naderman/master
...
Add getVersionConstraint test case to avoid version normalization issues
2012-02-19 07:03:22 -08:00
3b06a22e69
Add getVersionConstraint test case to avoid version normalization issues
2012-02-19 15:58:19 +01:00
af408eee9a
Fix line endings of Composer TestCase
2012-02-19 15:58:16 +01:00
1f311de982
Merge pull request #325 from naderman/fix-watches-infinite-loop
...
When changing watched literals of a rule, update the parent's next pointer
2012-02-19 06:44:41 -08:00
2a92b904d2
Correct placing of braces
2012-02-19 15:44:02 +01:00
f304a0f129
Clean up the incomplete marker like suggested in https://github.com/composer/composer/pull/324#r465391
2012-02-19 15:38:03 +01:00
1ee5d99405
When changing watched literals of a rule, update the parent's next pointer
...
The previous rule was not previously updated to point to the next rule when
removing a middle rule from the watch tree for a literal. This resulted in
jumping from one literal's watch tree to another's, which could then jump
back to the original and cause infinite loop in a case like #265 .
Fixes #265
2012-02-19 15:35:13 +01:00
e20a79ac61
Fix TODO tags to confirm with the projects standard
2012-02-19 15:30:53 +01:00
8484199677
Display undecided literals as undecided with a ?, when printing the decision map
2012-02-19 15:20:13 +01:00
0b8fb68e93
Add a debug print method for the entire watch tree to the solver
2012-02-19 15:19:34 +01:00
57c13df37e
[docs] chapter about the cli
2012-02-19 15:16:25 +01:00
fd0bf14eb2
Support both require and requires as depends link-type arg
2012-02-19 15:09:29 +01:00
eafe13d5a5
Create an impossible rule when trying to install something that doesn't exist.
...
The rule isn't acted upon yet (hence the incomplete test) but it is there as a reminder that this case needs to be handled.
2012-02-19 14:55:14 +01:00
7a66eb3367
[docs] add a note about the lock file to the libs chapter
2012-02-19 13:12:34 +01:00
c97a33577b
Merge pull request #321 from naderman/error-reporting
...
Basic error reporting for solver problems
2012-02-18 15:22:04 -08:00
e6143d1584
Add todos to explain why try/catch is inside the test
2012-02-19 00:21:39 +01:00
52d876e11e
Add SolverProblemsException and test basic solver failures
2012-02-19 00:15:23 +01:00
8fd4e56029
Deciding to install a package and wanting to install it, is not a conflict
2012-02-19 00:13:21 +01:00
868fc255b1
[docs] add section about publishing to vcs and on packagist
2012-02-18 23:43:45 +01:00
f54b04aac8
Restore realpath behavior
2012-02-18 23:28:47 +01:00
f4984e9a1e
[docs] first parts of the libraries chapter
2012-02-18 20:03:24 +01:00
Igor Wiedler