1
0
Fork 0
Commit Graph

859 Commits (af408eee9a5b480e385fd6dc5b452eabe78cd905)

Author SHA1 Message Date
Nils Adermann af408eee9a Fix line endings of Composer TestCase 2012-02-19 15:58:16 +01:00
Jordi Boggiano 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
Nils Adermann 2a92b904d2 Correct placing of braces 2012-02-19 15:44:02 +01:00
Nils Adermann 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
Nils Adermann 8484199677 Display undecided literals as undecided with a ?, when printing the decision map 2012-02-19 15:20:13 +01:00
Nils Adermann 0b8fb68e93 Add a debug print method for the entire watch tree to the solver 2012-02-19 15:19:34 +01:00
Jordi Boggiano fd0bf14eb2 Support both require and requires as depends link-type arg 2012-02-19 15:09:29 +01:00
Jordi Boggiano c97a33577b Merge pull request #321 from naderman/error-reporting
Basic error reporting for solver problems
2012-02-18 15:22:04 -08:00
Nils Adermann e6143d1584 Add todos to explain why try/catch is inside the test 2012-02-19 00:21:39 +01:00
Nils Adermann 52d876e11e Add SolverProblemsException and test basic solver failures 2012-02-19 00:15:23 +01:00
Nils Adermann 8fd4e56029 Deciding to install a package and wanting to install it, is not a conflict 2012-02-19 00:13:21 +01:00
Jordi Boggiano f54b04aac8 Restore realpath behavior 2012-02-18 23:28:47 +01:00
Nils Adermann fea16b39a1 Merge pull request #318 from edorian/remove-allowUninstall
Remove the allowUninstall policy option and clean up the only usage
2012-02-18 10:26:16 -08:00
Volker Dusch 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
Volker Dusch ec61297122 Remove the allowUninstall policy option and clean up the only usage 2012-02-18 18:31:19 +01:00
Nils Adermann cbc021c05d featureRule no longer exists, only update rule 2012-02-18 18:04:45 +01:00
Nils Adermann 54a8dc1d9c Merge pull request #317 from edorian/remove-allowDowngrade
Removed the option to disallowed downgrades
2012-02-18 08:59:52 -08:00
Volker Dusch 5fdca19880 Removed the option to disallowed downgrades and simplifed some places where it was used 2012-02-18 17:50:15 +01:00
Nils Adermann 1dd15e5662 Merge pull request #316 from edorian/solver-update-tests
Some added update tests
2012-02-18 08:45:08 -08:00
Jordi Boggiano e2199b2b03 Fixed automatic date parsing of versions 2012-02-18 17:05:13 +01:00
Jordi Boggiano 230e145053 Fix downloader tests on windows and mock Filesystem properly 2012-02-18 17:00:07 +01:00
Volker Dusch a8b2db64d5 Expaned the update tests to make sure a) Only requested updates execute and b) Installed repos with no actions get pruned from the jobqueue 2012-02-18 16:55:45 +01:00
Nils Adermann e7441edcf1 Merge pull request #315 from edorian/cleanup-update-all
Cleanup unreachable code
2012-02-18 07:18:09 -08:00
Jordi Boggiano a28fa790be Fix regex 2012-02-18 16:03:49 +01:00
Volker Dusch cc80e5a3b1 Cleanup unreachable code 2012-02-18 14:29:58 +01:00
Nils Adermann 8aa0127de8 Remove test of undefined behaviour for unknown types in rulesets 2012-02-18 13:09:19 +01:00
Nils Adermann 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
Jordi Boggiano 5e3bf86851 Remove .swp file 2012-02-18 12:50:45 +01:00
Jordi Boggiano 0ee505a246 Merge pull request #314 from edorian/solver-visibility
Clean up Solver public api
2012-02-18 03:49:53 -08:00
Volker Dusch fb69ef64c5 Fix Solver function visibility to reflect what acutally should be the public interface 2012-02-18 12:44:52 +01:00
Jordi Boggiano 43ce9ab14f Merge pull request #313 from naderman/fix-assert
Add a test for the off by one error in solver conflict resolution
2012-02-18 03:38:12 -08:00
Nils Adermann 460822fb96 Fix indentation of doc comment 2012-02-18 12:37:45 +01:00
Nils Adermann 3b54316e91 Add a test for the off by one error in solver conflict resolution 2012-02-18 12:33:55 +01:00
Nils Adermann 3167cccb6f Merge pull request #311 from Seldaek/allow_local_fs
Allow local file system git repos & do not restrict to valid http* urls
2012-02-18 03:14:58 -08:00
Jordi Boggiano fa8cb14073 Simplify check 2012-02-18 12:12:02 +01:00
Jordi Boggiano f152fe723d Allow local file system git repos & do not restrict to valid http* urls 2012-02-18 12:00:30 +01:00
Jordi Boggiano 1d15e64205 Merge pull request #310 from edorian/test-skip-mbstring
Skip tests if mbstring is not installed
2012-02-18 02:44:50 -08:00
Volker Dusch 9ede082371 Skip tests if mbstring is not installed 2012-02-18 11:36:11 +01:00
Jordi Boggiano 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
Nils Adermann 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
Jordi Boggiano 9f2efee207 Merge pull request #308 from stof/null_io
Added a NullIO
2012-02-17 15:05:16 -08:00
Christophe Coevoet 28d3d4b130 Added a NullIO 2012-02-18 00:00:38 +01:00
Jordi Boggiano 70bea8fe57 Fix previous commit 2012-02-17 17:01:45 +01:00
Jordi Boggiano b2076c2462 Re-order repos so that packagist always has the lowest priority 2012-02-17 16:59:26 +01:00
Jordi Boggiano 4d7ecdcb69 Fix authentication behavior when re-entering get() 2012-02-17 12:35:42 +01:00
Jordi Boggiano a8aef7e203 Text tweaks 2012-02-17 12:19:29 +01:00
Jordi Boggiano 35cca1ed7f Do not reveal input length 2012-02-17 12:18:48 +01:00
Jordi Boggiano 60fddb2c09 Use parse_url instead of manual parsing 2012-02-17 12:13:56 +01:00
Jordi Boggiano 8b7a64ab28 Limit progress output, mitigates #283 2012-02-17 11:53:38 +01:00
Jordi Boggiano 844c43092f Fix re-entrant behavior 2012-02-17 11:53:09 +01:00