2a92b904d2
Correct placing of braces
2012-02-19 15:44:02 +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
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
fd0bf14eb2
Support both require and requires as depends link-type arg
2012-02-19 15:09:29 +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
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
f54b04aac8
Restore realpath behavior
2012-02-18 23:28:47 +01:00
3fb75faa75
Now that no more update rules are created the code that handles them can be removed too.
...
Also adapted the tests that used TYPE_UPDATE exemplarily to use TYPE_FEATURE.
2012-02-18 19:19:49 +01:00
ec61297122
Remove the allowUninstall policy option and clean up the only usage
2012-02-18 18:31:19 +01:00
cbc021c05d
featureRule no longer exists, only update rule
2012-02-18 18:04:45 +01:00
54a8dc1d9c
Merge pull request #317 from edorian/remove-allowDowngrade
...
Removed the option to disallowed downgrades
2012-02-18 08:59:52 -08:00
5fdca19880
Removed the option to disallowed downgrades and simplifed some places where it was used
2012-02-18 17:50:15 +01:00
e2199b2b03
Fixed automatic date parsing of versions
2012-02-18 17:05:13 +01:00
230e145053
Fix downloader tests on windows and mock Filesystem properly
2012-02-18 17:00:07 +01:00
e7441edcf1
Merge pull request #315 from edorian/cleanup-update-all
...
Cleanup unreachable code
2012-02-18 07:18:09 -08:00
a28fa790be
Fix regex
2012-02-18 16:03:49 +01:00
cc80e5a3b1
Cleanup unreachable code
2012-02-18 14:29:58 +01:00
7609f27052
Merge branch 'add-tests' of https://github.com/l3l0/composer into new-master
...
* 'add-tests' of https://github.com/l3l0/composer :
Made fixes after review.
Made changes which fied warnings and errors in tests.
Fixed tests after update and merge of changes from upstream/master
Fixed code. Changes improved code testability
Added and extended some unit tests
2012-02-18 13:08:20 +01:00
5e3bf86851
Remove .swp file
2012-02-18 12:50:45 +01:00
fb69ef64c5
Fix Solver function visibility to reflect what acutally should be the public interface
2012-02-18 12:44:52 +01:00
fa8cb14073
Simplify check
2012-02-18 12:12:02 +01:00
f152fe723d
Allow local file system git repos & do not restrict to valid http* urls
2012-02-18 12:00:30 +01:00
cac51b1baf
Merge pull request #309 from naderman/fix-assert
...
Off by one error in the solver - 1 cannot be false
2012-02-17 15:17:04 -08:00
cb7f656fa9
Off by one error in the solver - 1 cannot be false
...
Fixes #133 , #160 , #162 , #177 , #289
2012-02-18 00:11:08 +01:00
28d3d4b130
Added a NullIO
2012-02-18 00:00:38 +01:00
70bea8fe57
Fix previous commit
2012-02-17 17:01:45 +01:00
b2076c2462
Re-order repos so that packagist always has the lowest priority
2012-02-17 16:59:26 +01:00
4d7ecdcb69
Fix authentication behavior when re-entering get()
2012-02-17 12:35:42 +01:00
a8aef7e203
Text tweaks
2012-02-17 12:19:29 +01:00
35cca1ed7f
Do not reveal input length
2012-02-17 12:18:48 +01:00
60fddb2c09
Use parse_url instead of manual parsing
2012-02-17 12:13:56 +01:00
8b7a64ab28
Limit progress output, mitigates #283
2012-02-17 11:53:38 +01:00
844c43092f
Fix re-entrant behavior
2012-02-17 11:53:09 +01:00
db03b7bbbd
Fix line endings
2012-02-17 11:50:36 +01:00
d0f6b679bc
Merge remote-tracking branch 'francoispluchino/master'
2012-02-17 11:45:55 +01:00
8dcb75080e
Merge remote-tracking branch 'wookieb/installer_dry_run'
2012-02-17 10:47:40 +01:00
deaaf2ef37
Merge pull request #307 from hason/slashes
...
Added support for JSON_UNESCAPED_SLASHES
2012-02-17 01:26:06 -08:00
e621495c4d
Added support for JSON_UNESCAPED_SLASHES
2012-02-17 10:06:59 +01:00
ea05f678fd
Exception mentioned PEAR repository when should be VCS, was misleading
2012-02-16 19:42:19 -05:00
56150fd98f
Merge remote branch 'composer/master'
2012-02-16 23:53:17 +01:00
dbfbbab904
Add changes requested
2012-02-16 23:41:26 +01:00
2467456d3f
Fix installer that create vendor and bin directory even if --dry-run parameter provided
...
* Move directories creation from constructor to "install" and "update" method
* Tests for LibraryInstaller
2012-02-16 22:43:10 +01:00
26f2b9e93f
Merge pull request #303 from MattKetmo/directory_inception
...
[BUG] Fix error when moving up a directory content
2012-02-16 11:45:37 -08:00
1e6633b3c3
Allow search command to work without a composer.json
2012-02-16 20:42:47 +01:00
ee7b68c049
Allow people to manually enter requirements
2012-02-16 20:41:16 +01:00
9a2204cd74
Improve username detection and other minor fixes
2012-02-16 20:40:57 +01:00
f48cfb4fdf
Avoid requirement on composer.json to search for requirements
2012-02-16 20:39:59 +01:00
23aade21f0
Show empty default value when one is specified
2012-02-16 20:38:43 +01:00
Nils Adermann