1
0
Fork 0
Commit Graph

704 Commits (672e7d85a1cb2c2c9eaf5f89f33f886ac8b183f8)

Author SHA1 Message Date
Jordi Boggiano f73c08043f Refactor VcsRepo to follow new dev model 2012-02-19 16:57:29 +01:00
Jordi Boggiano 3e6176eccf Update version parser to support any branch name 2012-02-19 16:57:29 +01:00
Jordi Boggiano 32157a3904 Fix local git repo handling in GitDriver 2012-02-19 16:38:07 +01:00
Nils Adermann 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
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
Volker Dusch e20a79ac61 Fix TODO tags to confirm with the projects standard 2012-02-19 15:30:53 +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
Volker Dusch 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
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 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
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
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
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 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
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 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 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
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
Jordi Boggiano db03b7bbbd Fix line endings 2012-02-17 11:50:36 +01:00
Jordi Boggiano d0f6b679bc Merge remote-tracking branch 'francoispluchino/master' 2012-02-17 11:45:55 +01:00
Jordi Boggiano 8dcb75080e Merge remote-tracking branch 'wookieb/installer_dry_run' 2012-02-17 10:47:40 +01:00
Jordi Boggiano deaaf2ef37 Merge pull request #307 from hason/slashes
Added support for JSON_UNESCAPED_SLASHES
2012-02-17 01:26:06 -08:00
Martin Hasoň e621495c4d Added support for JSON_UNESCAPED_SLASHES 2012-02-17 10:06:59 +01:00
Logan Aube ea05f678fd Exception mentioned PEAR repository when should be VCS, was misleading 2012-02-16 19:42:19 -05:00
François Pluchino 56150fd98f Merge remote branch 'composer/master' 2012-02-16 23:53:17 +01:00
François Pluchino dbfbbab904 Add changes requested 2012-02-16 23:41:26 +01:00
Wookieb 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
Jordi Boggiano 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
Jordi Boggiano 1e6633b3c3 Allow search command to work without a composer.json 2012-02-16 20:42:47 +01:00
Jordi Boggiano ee7b68c049 Allow people to manually enter requirements 2012-02-16 20:41:16 +01:00
Jordi Boggiano 9a2204cd74 Improve username detection and other minor fixes 2012-02-16 20:40:57 +01:00
Jordi Boggiano f48cfb4fdf Avoid requirement on composer.json to search for requirements 2012-02-16 20:39:59 +01:00
Jordi Boggiano 23aade21f0 Show empty default value when one is specified 2012-02-16 20:38:43 +01:00
Jordi Boggiano d1d9c715c9 Add newline at the end of formatted jsons 2012-02-16 20:37:05 +01:00
Jordi Boggiano 33fcb959ea Refactor JsonFile::encode to match json_encode 2012-02-16 20:28:02 +01:00
Jordi Boggiano 95883f058c Merge remote-tracking branch 'justinrainbow/init_command' 2012-02-16 19:30:25 +01:00
Jordi Boggiano 01cb2c5dd7 Fix typo 2012-02-16 18:58:25 +01:00
François Pluchino 2e3eed081a Merge remote branch 'composer/master'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
2012-02-16 18:11:01 +01:00
MattKetmo 7d5ba2d756 [DownloadFile] Renamed wrapper directory after extract
This fixes error when the extracted directory (from an archive) contains
a folder with the same name. Example:

    $ mv test/test test
    mv: test/test and test/test are identical
2012-02-16 17:26:42 +01:00
Jordi Boggiano 13183753e6 Merge remote-tracking branch 'hason/unicode' 2012-02-15 18:38:20 +01:00
Jordi Boggiano 6905e3a7ae Disable gzip compression of the phar 2012-02-15 18:21:17 +01:00
François Pluchino bc232af018 Bug fix display downloading info 2012-02-15 14:16:42 +01:00
François Pluchino 953f0992f7 Merge callback method of FileDownloader and VcsDriver
Required corrections added
2012-02-15 13:11:29 +01:00
Martin Hasoň ff0f833b3e Added support for JSON_UNESCAPED_UNICODE and fixed parsing string 2012-02-15 12:00:04 +01:00
Jordi Boggiano 256bfedea1 Merge remote-tracking branch 'jalliot/proxy2'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Repository/PearRepository.php
2012-02-14 17:01:15 +01:00
Jordi Boggiano e92e3ba355 Simplify code 2012-02-14 16:06:09 +01:00
Henrique Moody b030a36bf5 Some PEAR repositories does not works because of a wrong link parse. 2012-02-14 12:29:32 -02:00
Martin Hasoň 01be62d842 Updated ArrayDumper 2012-02-14 12:57:15 +01:00
François Pluchino 9638247e44 Move to Util Class 2012-02-14 11:25:00 +01:00
Nils Adermann b1da7f704c Merge pull request #294 from simensen/prefer-source
Rename --dev to --prefer-source
2012-02-14 02:15:56 -08:00
Jordi Boggiano 9e1843a334 Merge remote-tracking branch 'origin/master' 2012-02-13 23:10:14 +01:00
Jordi Boggiano 416ae21a5a Robustness fixes for new PEAR2 compat code 2012-02-13 23:07:18 +01:00
Beau Simensen 81d41fc442 Rename --dev to --prefer-source 2012-02-13 13:05:44 -08:00
François Pluchino f5d90e1340 Download Dist Package when the info is defined in root composer file 2012-02-13 17:40:54 +01:00
Justin Rainbow 24d85a48f0 Removing the JsonFormatter as it is part of the JsonFile now 2012-02-11 17:13:39 -07:00
Justin Rainbow 604f2836e3 Adding a JSON string formatter to the JsonFile class 2012-02-11 17:13:39 -07:00
Justin Rainbow 3a5d09a8b0 Removing the 'writeSection' method from 'DialogHelper' 2012-02-11 17:13:38 -07:00
Justin Rainbow 7a0a1788e3 Moved DialogHelper into the base Application 2012-02-11 17:13:38 -07:00
Justin Rainbow 9ec641659e Validating package name input for init command 2012-02-11 17:13:38 -07:00
Justin Rainbow 950bbcbed9 Init now asks user if they want to ignore the vendor dir 2012-02-11 17:13:38 -07:00
Justin Rainbow cd9c86c70c Adding author defaults to init command 2012-02-11 17:13:38 -07:00
Justin Rainbow 6ff7694de1 Fixing error when no requirements are defined 2012-02-11 17:13:38 -07:00
Justin Rainbow 42d55bf510 Removing the JsonFormatter as it is part of the JsonFile now 2012-02-11 17:13:38 -07:00
Justin Rainbow 2fbd9490b1 Adding a requirement definition stage to init command 2012-02-11 17:13:38 -07:00
Justin Rainbow 5933f34d6f Adding a JSON string formatter to the JsonFile class 2012-02-11 17:13:38 -07:00
Justin Rainbow 10ca974f33 Quick change to the help text for InitCommand 2012-02-11 17:13:37 -07:00
Justin Rainbow 34bbfb70d2 Initial version of InitCommand
This command allows a user to create a basic composer.json
definition easily.  The idea is to create a command similar
to the `npm init` command.

This version only has `name` and `description` support.
Additional fields will be added such as `require`, `authors`,
`version`, etc.
2012-02-11 17:13:37 -07:00
Henrique Moody 230f43d009 Chaged the key "recommend" for "suggest" in the parse of the PEAR2 dependences. 2012-02-11 15:17:27 -02:00
Henrique Moody 61c66b98a8 Correction of wrong variable name. 2012-02-11 13:33:25 -02:00
Henrique Moody b3d91cab02 Update dependence resolution for PEAR2 packages. 2012-02-11 13:04:33 -02:00
Henrique Moody 9ca157913a Remotion of a debug code. 2012-02-11 12:57:41 -02:00
Henrique Moody 234a6710a1 Correction at method parseVersion() of Composer\Repository\PearRepository. 2012-02-11 12:57:40 -02:00
Henrique Moody be448e09b4 Update src/Composer/Repository/PearRepository.php 2012-02-11 12:57:40 -02:00
Henrique Moody dd2174885b Correction of variable overwrite used during an iteration and now the versions of PHP extensions are parsed like packages. 2012-02-11 12:57:40 -02:00
Henrique Moody 4e6a9806b6 Correction of wrong type suggestion. 2012-02-11 12:57:40 -02:00
Henrique Moody 6c47d6efe2 Renamed methods of Composer\Repository\PearRepository: fetchPearRepositories() to fetchPearPackages() and fetchPear2Repositories() to fetchPea2Packages(). 2012-02-11 12:57:40 -02:00
Henrique Moody b62a90a981 Removed hard code - suggestion of a PHP version. 2012-02-11 12:57:40 -02:00