1
0
Fork 0
Commit Graph

942 Commits (85caa6508875b9943528bb4e54999e39b0397ace)

Author SHA1 Message Date
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
Henrique Moody 0c6d806791 Correction of typo. 2012-02-11 12:57:40 -02:00
Henrique Moody 1e11aff456 Create method parseVersion for parsing of package versions. Now includes "max" version of the package. 2012-02-11 12:57:40 -02:00
Henrique Moody c7e0fb7e58 Correction of typo error. 2012-02-11 12:57:40 -02:00
Henrique Moody 60831ac3fc Update src/Composer/Repository/PearRepository.php 2012-02-11 12:57:40 -02:00
Henrique Moody 14adc0213e Added suport for PEAR2 repositories. 2012-02-11 12:57:39 -02:00
Beau Simensen 3cbbe1fd82 No need for group or world write permissions. 2012-02-09 14:18:25 -08:00
Beau Simensen 04f0ecfc01 Change permission of bin links if they exist and are already links 2012-02-09 10:21:16 -08:00
Jordi Boggiano 5da021ffa7 Moved Filesystem to base Util namespace 2012-02-09 18:45:28 +01:00
Jordi Boggiano ec352b1e84 Add support for adding more than one fallback dir 2012-02-09 18:18:43 +01:00
Beau Simensen 030b81b199 DebugPackagesCommand has been removed. 2012-02-09 08:14:06 -08:00
Jordi Boggiano 6971657ad0 Merge debug:packages into the show command (if used without package arg) 2012-02-09 16:30:55 +01:00
Jordi Boggiano 0e7c0d918f Add useIncludePath support to ClassLoader 2012-02-09 15:42:47 +01:00
Jordi Boggiano 247d19e2f8 Add type hints 2012-02-08 18:12:46 +01:00
Jordi Boggiano 93baa38d5c Allow show command to work without a composer.json 2012-02-08 10:24:36 +01:00
Jordi Boggiano 2d780fbef6 Register all packages via the autoload generator before dispatching events 2012-02-07 11:13:29 +01:00
Jordi Boggiano 5daaba9e62 Extract some code in a AutoloadGenerator::buildPackageMap method 2012-02-07 11:12:03 +01:00
Jordi Boggiano 8c535b1961 Allow the Composer ClassLoader to be unregistered easily 2012-02-07 11:11:39 +01:00
Jordi Boggiano f761bf8d99 Simplify install() signature 2012-02-06 13:59:46 +01:00
Beau Simensen d05f0a6e40 Addressed coding standard issues reported by @stof 2012-02-05 18:25:41 -08:00
Beau Simensen e1370be7a0 Continued refactoring of install() method, mainly by way of adding Composite Repository
* Rewritten `install()` method now takes a repository instead of a list of packages (per @nadermen)
 * Added Composite Repository
 * Added tests for Composite Repository
 * Removed "local repository" concept from Platform Repository
 * Removed some `use` statements for Platform Repository where it was not actually being used
2012-02-05 18:25:41 -08:00
Beau Simensen 473f127ff1 Super simplified, works, but needs refactoring w/ Composer Repository 2012-02-05 18:22:56 -08:00
Beau Simensen df72919ba3 @naderman says this is wrong. 2012-02-05 18:22:56 -08:00
Beau Simensen 57ffc9d59b Changed some variable names, continue 2, locked install changed
Changed some some instances of the $package variable name to be
able to be consistent in all branches of the "add to request"
section of code.

Updated an instance of "break" to "continue 2" as it was resulting
in the same package getting both update() and install() called
on request. Seems like this is probably not needed, should be
just one or the other? (could be way wrong on this)

Gave "locked" branch of the update/locked/install code some
logic to handle internally installed packages.
2012-02-05 18:22:56 -08:00
Beau Simensen c1ba2be345 Provide the ability to specify internally installed packages (i.e., embedded in phar) 2012-02-05 18:22:56 -08:00
Beau Simensen c94d867c07 Make install method self contained
Experimental: Updated `install()` method to accept its Composer
and input option dependencies as method arguments.
2012-02-05 18:16:50 -08:00
Jordi Boggiano 385075cda3 Cosmetic fixes 2012-02-05 22:38:42 +01:00
Jordi Boggiano d35a1a4a9d Stylistic fixes to the previous merge 2012-02-05 21:08:43 +01:00
Jordi Boggiano d52feb1a9f Merge remote-tracking branch 'digitalkaoz/issue_209' 2012-02-05 20:59:30 +01:00
François Pluchino a0afb88d5d Fix bug on authorization of file download for the private repositories 2012-02-05 20:21:06 +01:00
Jordi Boggiano d43dd33632 Add scripts loading 2012-02-05 16:14:44 +01:00
Jordi Boggiano 7add1001ae Refactor scripts 2012-02-05 16:14:25 +01:00
Jordi Boggiano c2aac6a37c Merge remote-tracking branch 'francoispluchino/master' 2012-02-05 14:07:08 +01:00
Jordi Boggiano 568d9dabf6 fix previous commit 2012-02-03 20:32:09 +01:00
Pádraic Brady 3f7e7dff33 Fix a small bug where some PEAR channels' category link href doesn't contain a starting forward slash 2012-02-02 19:57:37 +00:00
Jordi Boggiano 15d78e6ad1 Fix autoload generator with vendor-dir = working-dir 2012-02-02 16:38:48 +01:00
Martin Hasoň d27989c808 Fixed obscure code 2012-02-02 15:36:38 +01:00
Justin Rainbow 8e64229461 Increasing version number to include 5.3.3 which also has an issue with SplFixedArray 2012-02-01 09:31:27 -07:00
Artem Lopata 7d994b5de4 Added ErrorHandler for handling E_NOTICE, E_WARNING, E_ERROR 2012-01-27 10:37:45 +02:00
François Pluchino c7b898d10d Remove TriggerEvent setter and adding arguments to the constructor 2012-01-25 17:31:46 +01:00
François Pluchino 0bcf3c26d9 Add .composer/autoload.php in namespace loader 2012-01-25 17:08:06 +01:00
François Pluchino f017074655 Remove package trigger
Rename GetTriggerEvent on TriggerEvent
Remove get/set Application in TriggerEvent
Remove get/set Dispatcher in TriggerEvent
Add get/set Composer in TriggerEvent
Add get/set IO in TriggerEvent
Restaure ConsoleIO and IOInterface
Update Faq
2012-01-25 00:22:12 +01:00
Leszek Prabucki f59ca1e2f8 Made fixes after review. 2012-01-24 18:48:42 +01:00
Leszek Prabucki 3f38eede8a Made changes which fied warnings and errors in tests. 2012-01-24 18:48:42 +01:00
Leszek Prabucki 9488b0f85f Fixed code. Changes improved code testability 2012-01-24 18:44:55 +01:00
François Pluchino b147210ff4 Adding access to input's options and arguments used by the triggers 2012-01-24 18:10:22 +01:00
François Pluchino 2f6a3ce8b9 Add system trigger 2012-01-24 18:08:41 +01:00
Martin Hasoň e46e1fb981 Changed method to static - JsonFile::encode 2012-01-24 15:57:23 +01:00
Martin Hasoň 76a2be5ae0 Fixed detection of missing comma and added detection of missing colon in json 2012-01-24 15:10:55 +01:00
Martin Hasoň 6227b5ec4e Fixed copy-paste bug 2012-01-24 13:18:54 +01:00
Brian Clozel 23d85f1900 fix typo 2012-01-24 10:38:32 +01:00
Brian Clozel 33a0ba69de fix issue #251 - Using $this not in object context 2012-01-23 19:41:44 +01:00
digitalkaoz 3d43bdce45 refactored install 2012-01-23 16:19:37 +01:00
digitalkaoz 4d0fae688e removed replace, reinstalling as install 2012-01-23 15:43:42 +01:00
digitalkaoz 30e89a2402 fixed broken packages on filesystem 2012-01-23 15:19:05 +01:00
Jordi Boggiano e90a8dc4c9 Fix feedback from 7222c1 2012-01-23 10:28:15 +01:00
Jordi Boggiano 0a4f36ea6d Fix phar compilation 2012-01-23 10:02:28 +01:00
Jordi Boggiano 7222c111ed Make sure multiple autoload files can be used together, fixes #207 2012-01-22 22:40:04 +01:00
Jordi Boggiano 565e084769 Revert "Added "-d detect_unicode=0" to the php shebang to work around https://bugs.php.net/bug.php?id=36711."
This reverts commit 045ae0e5ce.
2012-01-22 21:42:50 +01:00
Jordi Boggiano a6ce43817e Overhaul VCS downloaders, added base class and uniformized 2012-01-22 21:14:56 +01:00
Jordi Boggiano d3d16789d0 Enable tar/phar downloaders 2012-01-22 20:43:37 +01:00
Jordi Boggiano a41fefd1d9 Fix way of checking for Windows 2012-01-22 20:21:14 +01:00
Jordi Boggiano afa7fb8d75 Check for changes before updating/removing svn checkouts 2012-01-22 20:08:59 +01:00
Jordi Boggiano 702d415472 Fix usage of the ProcessExecutor 2012-01-22 20:08:57 +01:00
Jordan Alliot b4d87af959 Changed array_merge to array_merge_recursive 2012-01-21 20:58:36 +01:00
Jordan Alliot 468eb0ed8d Merge default options after buildind proxy one 2012-01-21 20:58:36 +01:00
Jordan Alliot 054faef5eb New context at each call and possibility to add more options and params to the context 2012-01-21 20:58:36 +01:00
Jordan Alliot 9c27e38654 Moved proxy handling to a new class so that it can be reused in other parts of Composer 2012-01-21 20:58:36 +01:00
Jordi Boggiano 5ce9de422b Merge pull request #232 from robywan/hidden-password-fix
Fixed detection of hidden password input capability
2012-01-21 11:34:25 -08:00
Jordi Boggiano 294217317b Merge pull request #235 from francoispluchino/master
Remove the warning of copy() in FileDownloader
2012-01-21 11:28:42 -08:00
digitalkaoz 627deab51c fixed #230 2012-01-20 20:50:21 +01:00
François Pluchino 1c65fd2078 Remove the Warning, because managed in the callbackGet notification 2012-01-20 12:15:18 +01:00
Roberto Ricci ec665a01ab Fixed detection of hidden password input capability 2012-01-19 21:10:10 +01:00
Joseph Bielawski 188d8beb79 Class name typo fix 2012-01-19 16:58:59 +01:00
Jordi Boggiano f6efa3aa24 Merge pull request #226 from justinrainbow/bug_211
PHP 5.3.2 segmentation fault fix
2012-01-19 07:38:32 -08:00
Jordi Boggiano 191b8344e9 Merge pull request #228 from jakzal/JsonEncodeFix
Fixed json encoding when quoted value contains trailing backslash.
2012-01-19 01:10:36 -08:00
Jordi Boggiano 9125f4dc90 Merge pull request #201 from msonnabaum/master
Add detect_unicode=0 workaround to shebang
2012-01-19 01:04:26 -08:00
Jakub Zalas dcdb761e17 Used strict comparision. 2012-01-19 00:14:48 +00:00
Jakub Zalas c680ec7e51 Fixed json encoding when quoted value contained trailing backslash.
Condition checking if current character is inside a quoted string did not consider the case when backslash before quote is escaped with another backslash.
2012-01-19 00:01:56 +00:00
Justin Rainbow 7eda0a8823 PHP 5.3.2 segmentation fault fix
For some reason, using the SqlFixedArray causes a Segmentation Fault during
an install or update.  Changing to a simple array fixes this issue, but in
turn uses more memory.  Which is why there is the version test.
2012-01-18 15:56:29 -07:00
Jordi Boggiano 4dee2528e9 Fix typo 2012-01-18 17:36:57 +01:00
Kai W. 6cf5c6e040 Restoring FileDownloader constructor compatibility in ZipDownloader 2012-01-18 17:11:26 +01:00
Jordi Boggiano f5ac5b9b3e Fix ZipDownloader, fixes #221 2012-01-18 16:38:06 +01:00
Jordi Boggiano 405f876fa6 Merge pull request #204 from simensen/GenerateAutoloadRevised
Autoload Generator handles multiple PSR-0 paths
2012-01-18 07:15:26 -08:00
François Pluchino 6d4ccaa398 Fix display overwrite() 2012-01-18 13:58:44 +01:00
François Pluchino 76deb2d302 Fix bug on askAndHideAnswer() (because of the writeln() deletation) 2012-01-18 13:07:49 +01:00
François Pluchino 3cbe7cf590 Fix bug display in FileDownloader 2012-01-18 12:51:37 +01:00
Jordi Boggiano 9987b2aa83 Fix compiler 2012-01-18 10:47:56 +01:00
Jordi Boggiano 6c2ec966ff Fix ConsoleIO::overwrite 2012-01-18 10:35:02 +01:00
Jordi Boggiano e218b811e0 Convert static Process into an executor that can be injected 2012-01-18 09:27:57 +01:00
Jordi Boggiano e4dbee2648 Fix tests 2012-01-17 23:13:35 +01:00
Jordi Boggiano 434c9ecdeb Cleanups of IOInterface 2012-01-17 23:08:12 +01:00
Jordi Boggiano edf948454b Remove IO from Solver, debug methods don't need it 2012-01-17 22:46:52 +01:00
Jordi Boggiano 6492118f29 Merge remote-tracking branch 'francoispluchino/master'
Conflicts:
	src/Composer/Repository/Vcs/GitDriver.php
	src/Composer/Repository/Vcs/HgDriver.php
	src/Composer/Repository/Vcs/SvnDriver.php
2012-01-17 22:31:27 +01:00
Jordi Boggiano 6cfed52aae Merge remote-tracking branch 'digitalkaoz/process' 2012-01-17 21:47:37 +01:00
François Pluchino 8053878b6a Merge branch 'master'
Conflicts:
	src/Composer/Console/Application.php
2012-01-17 17:56:06 +01:00
François Pluchino 03f5eee3fa Fix some improvements 2012-01-17 14:53:50 +01:00
François Pluchino 9963bde367 Fix some improvements 2012-01-17 13:24:18 +01:00
François Pluchino 541285022d Replace CURL with copy() and file_get_contents() 2012-01-17 12:52:14 +01:00
Jordi Boggiano d1416a35a2 Fix missing arg 2012-01-17 12:10:34 +01:00
Jordi Boggiano 3bed815b19 Restore bindir/vendordir behavior, fixes #216 2012-01-17 11:54:02 +01:00
François Pluchino a5fb4abb36 Fix some improvements 2012-01-17 10:29:54 +01:00
Igor Wiedler 81f9adc596 Refactor Application::bootstrapComposer into a factory class (split from #178) 2012-01-17 10:00:53 +01:00
Jordi Boggiano bfe28905d0 Fix formatting and make pretty-printing optional 2012-01-17 01:33:02 +01:00
Justin Rainbow 447230d77a Extracting JsonFile additions for prettifying JSON 2012-01-16 16:42:36 -07:00
Christophe Coevoet bca786d5c3 Fixed the tests
array_filter preserves the keys even when filtering an array indexed
numerically.
2012-01-16 22:40:14 +01:00
Christophe Coevoet bd1d20b2c9 Fixed CS 2012-01-16 22:11:31 +01:00
François Pluchino 0f9dcc9618 Remplace all echo with writeln method of IO 2012-01-16 20:44:06 +01:00
François Pluchino 7888ec5313 Add Authentification in FileDownloader 2012-01-16 20:09:32 +01:00
François Pluchino a10f92aafe Convert Wrapper class to ConsoleIO class 2012-01-16 14:14:15 +01:00
Christophe Coevoet 1fdb7aef56 Changed the ShowCommand to use the new method 2012-01-16 12:52:17 +01:00
Christophe Coevoet fc17e26bc3 Added a method to find packages by name 2012-01-16 12:44:47 +01:00
Jordi Boggiano cc1dbbc36f Add --link-type option to select link types in DependsCommand 2012-01-15 13:39:48 +01:00
Beau Simensen 2d721f5792 Standards fixes per @stof 2012-01-12 21:40:53 -06:00
Beau Simensen e8fcf281fa Autoload Generator handles multiple PSR-0 paths
The Autoload Generator was not behaving exactly as expected.
This PR is an alternate version of #203 based on some of
@stof's input on that PR.

The main differences are:

 * The main package is added first instead of last
 * parseAutoloads returns a different structure:
     array('psr-0' => array('Ns\\Foo' => array('installDir')))
 * dump and createLoader updated to account for new structure
2012-01-12 21:14:30 -06:00
François Pluchino f65b34860f Merge branch 'test'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Repository/Vcs/HgBitbucketDriver.php
2012-01-12 12:19:13 +01:00
Mark Sonnabaum 045ae0e5ce Added "-d detect_unicode=0" to the php shebang to work around https://bugs.php.net/bug.php?id=36711. 2012-01-11 21:05:27 -06:00
François Pluchino 9af46ad800 Add Helper Wrapper 2012-01-11 13:55:05 +01:00
Hugo Hamon 398efbb894 [Repository] removed unused local $versions variable from VcsRepository::initialize() method. 2012-01-11 11:38:51 +01:00
Hugo Hamon 09f0ba6604 [Repository] removed unused local $match variable from HgBitbucketDriver::supports() method. 2012-01-11 11:35:36 +01:00
Hugo Hamon 70d7ab43ee [Repository] removed unused local $match variable from GitHubDriver::supports() method. 2012-01-11 11:34:45 +01:00
Hugo Hamon 7842149a51 [Repository] removed unused local $match variable from GitBitbucketDriver::supports() method. 2012-01-11 11:33:21 +01:00
Hugo Hamon 66f214e446 [Repository] removed unused $requires local variable from PearRepository::fetchFromServer() method. 2012-01-11 11:30:46 +01:00
Hugo Hamon 488928b9b5 [Package] removed unused local $key variable from VersionParser::parseConstraints() method. 2012-01-11 11:29:12 +01:00
Hugo Hamon 2d1ad6ca32 [Package] removed unused local $repositories variable from RootPackageLoader::load() method. 2012-01-11 11:26:45 +01:00
Hugo Hamon 535455606b [Downloader] fixed incorrect variable name in FileDownloader class. 2012-01-11 11:23:23 +01:00
Hugo Hamon 9acbb0c026 [DependencyResolver] removed unused local variables and fixed some wrong local variable names in Solver class. 2012-01-11 09:11:27 +01:00
Hugo Hamon 747abf6843 [Command] removed unused local variable $composer in UpdateCommand::execute() method. 2012-01-11 09:05:23 +01:00
Hugo Hamon c993f3e92d [Command] removed unused local $recommendedDependencies variable in DependsCommand::getReferences() method. 2012-01-11 09:02:59 +01:00
François Pluchino cad1497b95 Keep history action on download 2012-01-11 01:26:44 +01:00
François Pluchino 86070a8b6e Replace getHttpSupport() to getScheme() 2012-01-11 01:11:56 +01:00
François Pluchino 9b0e50cdc2 Restore the old regex 2012-01-11 01:09:30 +01:00
François Pluchino 9c7e7a2c4a Remove comment 2012-01-10 21:29:41 +01:00
François Pluchino 395e2e040d Add callback download informations 2012-01-10 21:22:52 +01:00
François Pluchino 2f0162053d Add OutputConsole and format the download output 2012-01-10 20:06:15 +01:00
François Pluchino 013d145bcd Add InputInterface and OutputInterface 2012-01-10 18:50:16 +01:00
François Pluchino fa793649fa Add a VcsDriver abstract class.
All XxxDriver extends this abstract class now.
2012-01-10 15:44:13 +01:00
Jordi Boggiano 3d52798c0f Merge pull request #192 from biozshock/master
After mesage "Installing dependencies" composer dies silently.
2012-01-09 00:49:46 -08:00
Jordi Boggiano 83a106bd79 Add recommends and package versions to the depends command 2012-01-08 22:39:42 +01:00
Jordi Boggiano 81d80b2a04 Merge remote-tracking branch 'justinrainbow/depends_command' 2012-01-08 22:27:54 +01:00
Artem Lopata (bumz) de066de198 Fix for composer. When running update/install command it's just do nothing, except writing "Installing dependencies" 2012-01-08 23:24:58 +02:00
Jordi Boggiano 126c57d07c Fix notice 2012-01-08 19:26:40 +01:00
Jordi Boggiano 9630f44922 Fix errors in case packages is empty 2012-01-07 17:04:41 +01:00
Jordi Boggiano 56e43e4397 Add tests 2012-01-07 17:04:40 +01:00
Jordi Boggiano 462ebdf752 Detect lock file changes and warn users on install, fixes #75 2012-01-07 17:04:38 +01:00
Nils Adermann 855b1cb9d3 Merge pull request #173 from Seldaek/update
Fix update, fixes #125
2012-01-06 04:52:07 -08:00
Jordan Alliot 3444bdae82 Check openssl extension for proxy 2012-01-05 11:58:49 +01:00
Jordan Alliot 1471b41ba8 Handle system proxy in file downloads 2012-01-05 11:40:11 +01:00
digitalkaoz 897ff9126d seperate class for Process, using this one all over the place 2012-01-05 11:12:54 +01:00
Justin Rainbow 981477dd17 New 'depends' command added
Basic command to display where a given package is referenced.
This helps in figuring out where a package is used, and even
can help in troubleshooting dependency issues.
2012-01-04 20:11:37 -07:00
digitalkaoz a15567cea6 make use of process component fixes #105 2012-01-03 17:07:56 +01:00
Fabien Potencier 90f2a9f406 Use JSON_PRETTY_PRINT option when dumping JSON to help debugging 2011-12-27 11:33:43 +01:00
Jordi Boggiano 9b2694351b Less confusing error message 2011-12-24 14:57:05 +01:00
Jordi Boggiano 6ac38f111d Fix typo 2011-12-24 14:23:34 +01:00
Jordi Boggiano 719d3074f0 Dump bin info 2011-12-24 14:18:20 +01:00
Jordi Boggiano 4a10850759 Fix output 2011-12-24 14:18:06 +01:00
Jordi Boggiano 8cfbf9e198 Fix update, fixes #125 2011-12-24 14:15:10 +01:00
Jordi Boggiano 5c8eb355ce License now defaults to an empty array 2011-12-22 10:07:58 +01:00
Jordi Boggiano 3b9dd59da3 Fix typo 2011-12-22 10:07:39 +01:00
Jordi Boggiano 2c367e7f39 Allow multiple fallback dirs 2011-12-21 16:56:18 +01:00
Jordi Boggiano f051778192 Clean up unneeded initialization stuff 2011-12-21 16:43:37 +01:00
Jordi Boggiano 9452a94e30 Fix regression in previous merge 2011-12-21 16:43:35 +01:00
Igor Wiedler 85ec42bac3 display highest package version by default on show command 2011-12-21 16:43:34 +01:00
Jordi Boggiano 66cdd64e88 Merge pull request #165 from simensen/InstallMessage
Updated lockfile message for "composer install" command
2011-12-21 07:12:26 -08:00
Jordi Boggiano 16093fdfeb Merge remote-tracking branch 'pminnieur/classloader' 2011-12-21 16:00:52 +01:00
Jordi Boggiano c921a8884e Adjust operation output, fixes #166 2011-12-21 15:57:39 +01:00
Pierre Minnieur 3b1843827a removed the `return false` as we only need a positive return information 2011-12-21 13:30:25 +01:00
Pierre Minnieur 4242a05a0e added Boolean return values for loadClass() method 2011-12-21 11:50:24 +01:00
Beau Simensen 2791e57930 Updated lockfile message for "composer install" command
The behaviour of the lockfile was a little confusing to me.
I assumed if I added a new dependency I should run
'composer install' again. It was not immediately obvious
from the output of the install command what was going on
and I was confused why my new package had not been installed.

I understand that a better fix would be to compare
composer.json to the lockfile, but until that has been
implemented this will maybe help some newbies out.
2011-12-20 12:09:16 -06:00
Sebastian Kurfuerst 03e627e444 Fix fatal error if class is not specified 2011-12-19 12:11:21 +01:00
Jordi Boggiano 680db4d1da Fix bug with drive names of different cases 2011-12-18 21:10:10 +01:00
Jordi Boggiano d22b80d13b Allow "" as autoload prefix for fallback dir 2011-12-18 21:09:40 +01:00
Jordi Boggiano 10c94c5ba4 Workaround for checking out branch whose names are missing the origin/ prefix 2011-12-18 20:32:26 +01:00
Jordi Boggiano b1f528fb06 Add fallback to unzip, refs #158 2011-12-16 22:22:08 +01:00
Jordi Boggiano 2ba48b58db Preserve case of packages for installations 2011-12-15 15:07:55 +01:00
Per Bernhardt df5da58b87 Made HgDriver work on Ubuntu 2011-12-13 06:50:35 +01:00
root 399a406018 Fixed notices for edge cases. 2011-12-13 06:49:55 +01:00
Per Bernhardt 2fc49aa88b Stop hg from parsing project's repository information while installing dependencies from source (HgDownloader) or initializing a VcsRepository (HgDriver). 2011-12-13 06:49:03 +01:00
Per Bernhardt d78548cbf9 Added mercurial's "default" branch as a valid dev version (same as master / trunk). 2011-12-13 06:47:33 +01:00
Per Bernhardt f74dafc08c Fixed root identifier: Use global hash instead of local revision 2011-12-13 06:47:00 +01:00
Jordi Boggiano f6b9488bf0 Move root package handling to a dedicated loader and make ArrayLoader more strict 2011-12-13 01:05:29 +01:00
Jordi Boggiano a2caa7c5e6 Adjustments to the show command 2011-12-12 22:47:41 +01:00
Jordi Boggiano 7caf61fc66 Set return code to non-zero when validate fails 2011-12-12 22:23:51 +01:00
Jordi Boggiano 666ac623f4 Merge remote-tracking branch 'digitalkaoz/show_command'
Conflicts:
	src/Composer/Console/Application.php
2011-12-12 22:18:15 +01:00
Jordi Boggiano d62a1ad1c1 Adjustments to the validate command 2011-12-12 22:14:01 +01:00
Jordi Boggiano a193ec9942 Merge remote-tracking branch 'digitalkaoz/validate_command' 2011-12-12 22:07:57 +01:00
Jordi Boggiano f27926e7b4 Add ENV var support for COMPOSER_VENDOR_DIR and COMPOSER_BIN_DIR, fixes #152 2011-12-12 21:18:15 +01:00
Jordi Boggiano 50d4e0606f Merge pull request #155 from webfactory/fix_array_dumper_links
Correctly dump link info
2011-12-12 05:17:24 -08:00
Matthias Pigulla 737fe32f4d Use {}for foreach 2011-12-12 12:51:42 +01:00
Jordi Boggiano 82a2a1f7ac Merge pull request #154 from webfactory/fix_driver_detection
Fix driver detection
2011-12-12 03:40:28 -08:00
Matthias Pigulla 3bbe3306fc Correctly dump link info 2011-12-12 12:01:13 +01:00
Matthias Pigulla ebbc807de0 Fix whitespaces and add strict return code checking 2011-12-12 10:57:57 +01:00
Matthias Pigulla 8ab60b7030 Still did not get it right 2011-12-10 14:23:37 +01:00
Matthias Pigulla f24164dc16 forgot this when testing 2011-12-10 14:15:00 +01:00
Matthias Pigulla 7cdb8b6b3b Some changes as suggested in the pr 2011-12-10 14:11:51 +01:00
Matthias Pigulla 54cf9aeb46 Make sure the target-dir exists 2011-12-10 00:24:02 +01:00
Matthias Pigulla 4e1cb32f8c Allow for file://-URLs here as well 2011-12-09 23:37:52 +01:00
Matthias Pigulla 2fc8e06d81 hg repos must not be hosted somewhere in particular, but detection may become expensive.
Additionally, suppress warnings and support file://-local repos
2011-12-09 23:10:31 +01:00
digitalkaoz 9a50fd6492 added validate task, closes #81 2011-12-08 11:42:26 +01:00
digitalkaoz 6451087039 added a show command for packages 2011-12-07 22:42:58 +01:00
Jordi Boggiano 381fcb248a Allow parsing of branches with invalid names but explicit versions in composer.json 2011-12-07 11:44:03 +01:00
Jordi Boggiano 283745d76d Do case-insensitive searches, avoid printing multiple results if multiple tokens match, highlight matched area 2011-12-06 23:07:47 +01:00
Jordi Boggiano c7deaa8a1f Add highlight style 2011-12-06 23:07:06 +01:00
Jordi Boggiano 8675d4eb6a Make search token required 2011-12-06 23:06:49 +01:00
Jordi Boggiano 8273579461 Merge remote-tracking branch 'digitalkaoz/command_refactorings' 2011-12-06 22:47:48 +01:00
Jordi Boggiano 139de0f79d Fix handling of git repos with no tag, fixes #146 2011-12-06 22:19:24 +01:00
digitalkaoz 6c870e23e0 added search command, colorized ouput, tiny fixes 2011-12-06 21:19:12 +01:00
digitalkaoz 87831d8c1c fixed typo 2011-12-06 21:13:04 +01:00
Nils Adermann a697488948 Merge pull request #142 from Seldaek/autoload_test
Autoload test
2011-12-04 13:44:59 -08:00
Jordi Boggiano 927be089ba Added more tests for Filesystem util and some fixes 2011-12-04 22:40:30 +01:00
Jordi Boggiano 304ce3b375 Fix relative target dirs 2011-12-04 22:13:11 +01:00
Jordi Boggiano 37df1a0d15 Fix self.version replacement 2011-12-04 21:58:42 +01:00
Jordi Boggiano a19695cdcb Tentative fix for *nix 2011-12-04 18:44:40 +01:00
Jordi Boggiano 4517a2e51e Added tests and fixed some incorrect behaviors in Filesystem 2011-12-04 18:35:45 +01:00
Jordi Boggiano bc88d86983 Make use of Filesystem class in AutoloadGenerator 2011-12-04 18:35:44 +01:00
Nils Adermann 71a6b47e90 Merge pull request #140 from Seldaek/bins
Add binaries support
2011-12-04 09:31:43 -08:00
Jordi Boggiano 3be6511af7 Fix unixy proxy under git-bash 2011-12-03 21:54:54 +01:00
Jordi Boggiano 725850c521 Fix github ssl bypass with http:// urls 2011-12-03 21:40:02 +01:00
Jordi Boggiano f0d8626993 Cleanups 2011-12-03 21:20:20 +01:00
Jordi Boggiano 9028546c5a Move bin dir to a subdir of vendor 2011-12-03 20:47:02 +01:00
Jordi Boggiano 7e3f8099b1 Add proxy files for windows instead of copying, removed PEAR-style substitution 2011-12-03 20:44:00 +01:00
Jordi Boggiano aa94918d50 Add binaries support in composer 2011-12-03 15:39:06 +01:00
Jordi Boggiano 456d442f6e Fix bootstrap 2011-12-03 12:46:28 +01:00
Jordi Boggiano 2e8762744f Fix ComposerRepository ctor 2011-12-03 12:43:38 +01:00
Jordi Boggiano aacdcb1570 Allow self-update to be called outside of a project context 2011-12-03 11:57:59 +01:00
Jordi Boggiano 7fa74f8f8e Add COMPOSER env var to override the composer.json file name 2011-11-30 21:50:11 +01:00
Jordi Boggiano 94e277698e Delay bootstrap until it's really necessary, fixes #121 2011-11-30 21:30:51 +01:00
Jordi Boggiano 3ebfbd78ac Merge remote-tracking branch 'jsor/install_update_flags' 2011-11-30 21:11:15 +01:00
Nils Adermann 64e925cd89 Merge pull request #136 from Seldaek/svndriver
Add SvnDriver for the VcsRepository
2011-11-28 13:31:48 -08:00
Jordi Boggiano b8a9bf7b60 Fix typo 2011-11-28 20:58:16 +01:00
jsor 28a8b3e4c5 Fix link collection 2011-11-28 08:51:00 +01:00
Jordi Boggiano 1277277ec6 Fix CS 2011-11-27 20:25:30 +01:00
Jordi Boggiano 8df7eb0475 Add SvnDriver for the VcsRepository 2011-11-27 20:07:42 +01:00
Jordi Boggiano 9f55335011 Expose the Driver of the VcsRepository 2011-11-27 20:02:28 +01:00
jsor e512e16e35 Rename flags after feedback in #132 2011-11-25 18:01:12 +01:00
jsor 9af21fd461 Install recommended deps by default and introduce flags for including/excluding required/recommended/suggested deps 2011-11-25 16:44:50 +01:00
Jordi Boggiano eef37c450f Fix error detection to support replaces and provides 2011-11-24 09:57:08 +01:00
Jordi Boggiano e340022cce Allow the use of self.version in package links 2011-11-23 16:47:23 +01:00
Jordi Boggiano 22858e81ef Fix .* version constraints parsing to include nonstable versions 2011-11-23 16:41:27 +01:00
Jordi Boggiano 0d304550b5 Clarify error message when packages are not found, fixes #128 2011-11-22 11:09:59 +01:00
Jordi Boggiano 68512714f4 Fix update command by using remove+install (and for now ignoring uninstalls of non-existing packages) 2011-11-21 18:18:06 +01:00
Jordi Boggiano f2662b193d Add --dry-run option and list all operations on --verbose 2011-11-21 17:56:21 +01:00
Jordi Boggiano d020f2701d Merge pull request #118 from naderman/priority-replace-any-version
Replaced packages have higher priority even if wrong version is replaced
2011-11-21 08:30:40 -08:00
Jordi Boggiano 3544b415a3 Merge pull request #122 from naderman/add-rule-peformance
addRule peformance improvement
2011-11-21 08:06:41 -08:00
Nils Adermann 5d5d6462e3 Correctly declare all literal properties 2011-11-21 16:14:16 +01:00
Nils Adermann 40b33914b3 Compute rule hashes for faster duplicate detection 2011-11-21 16:04:33 +01:00
Nils Adermann 69f55d37bb Generate literal ids only once and use in equals()
Significant speedup because equals and getId() are called so frequently.
2011-11-21 16:04:26 +01:00
Nils Adermann bca746c947 Don't consider a revert to level 1 (base level) in sat solver a failure 2011-11-21 15:02:42 +01:00
Nils Adermann b717ad8851 Display rules in more readable format 2011-11-21 15:01:10 +01:00
Jordi Boggiano cb44ba8325 Fix autoload handling of main project 2011-11-21 11:33:30 +01:00
Jordi Boggiano f5b7e968b2 Minor adjustments to merged PR 2011-11-20 22:03:11 +01:00
Jordi Boggiano 5b87a02767 Merge remote-tracking branch 'prodigitalson/master' 2011-11-20 21:43:31 +01:00
Jordi Boggiano 8a127ed131 Fix URL handling for PEAR repositories 2011-11-20 21:33:54 +01:00
Jordi Boggiano 4fdc602037 Make VcsRepository drivers configurable 2011-11-20 21:23:50 +01:00
Jordi Boggiano 63d52b3e1b Minor fixes to allow branch -dev versions 2011-11-20 21:13:17 +01:00
Jordi Boggiano de111b73dd Add homepage to MemoryPackage 2011-11-20 19:35:43 +01:00
Jordi Boggiano aab9116f67 Add description to MemoryPackage 2011-11-20 19:30:35 +01:00
Jordi Boggiano 52a9014f1a Add prettyConstraint on Links 2011-11-20 18:56:00 +01:00
Jordi Boggiano a54ec23e38 Fix typo 2011-11-20 16:56:24 +01:00
Jordi Boggiano a13c35537c Add parsing of keywords/authors/release date to the ArrayLoader 2011-11-20 16:51:04 +01:00
Jordi Boggiano 3b8ee5dd54 Use pretty name/version in lock file and debug:packages, fixes #98 2011-11-20 15:42:32 +01:00
Jordi Boggiano 8e6f8ae57e Add prettyVersion to packages, fixes #76 2011-11-20 15:06:12 +01:00
Nils Adermann 46e1001b4b Replaced packages have higher priority, even if wrong version is replaced 2011-11-19 15:00:56 +01:00
Nils Adermann 4140f08d9c Use a map of installed package ids in the solver
The assumption package.repo == installed no longer holds for installed
packages because there are multiple wrapped installed repositories.
2011-11-19 00:27:35 +01:00
Ant Cunningham e0400773f7 Adding support for configurable vendor path in composer.json. 2011-11-18 13:31:50 -05:00
Ben Bieker 0e6f3834ec Added an SvnDownloader
The Svn Downloader can be used like the already implemented
GitDownloader, for example

{
    "name": "my-project",
    "version": "1.0.0",
    "repositories": {
        "MyRepo": {
            "package": {
                "name": "mypackage",
                "version": "2.0",
                "source": {
                    "url": "https://repo.com/svnrepo",
                    "type": "svn",
                    "reference": "tags/v2.0"
                }
            }
        }
    },
    "require": {
        "mypackage": "2.0"
    }
}
2011-11-17 16:56:01 +01:00
Jordi Boggiano 761ad6d171 Only allow self-updates when called from within a phar 2011-11-16 13:50:32 +01:00