public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code
2,230 Commits
3 Branches
206 Tags
52 MiB
Commit Graph

2230 Commits (573aad880121297fa823d303e1d1b296eb503cb4)

Author SHA1 Message Date
Jordi Boggiano 27f8019dbd Refactor init & require commands 2012-05-26 14:45:19 +02:00
Jordi Boggiano f5e0918104 Add JsonManipulator class for doing raw manipulation of json strings 2012-05-26 14:44:24 +02:00
Jordi Boggiano 7cd5f4c142 Add Factory::getComposerFile 2012-05-26 14:43:44 +02:00
Jordi Boggiano b33496c853 Merge remote-tracking branch 'jeremyFreeAgent/master' 
Conflicts:
	doc/03-cli.md
 2012-05-26 12:40:36 +02:00
Jordi Boggiano 5357e3503f Update changelog 2012-05-25 10:55:01 +02:00
Jordi Boggiano 1127cd5c8a Merge pull request #735 from ajshort/composer-installer-multiple 
Support multiple installers in a composer-installer package.
 2012-05-25 01:53:31 -07:00
Andrew Short e0a1d9ef58 Support multiple installers in a composer-installer package. 2012-05-25 18:28:53 +10:00
Jordi Boggiano 3122df16a7 Merge pull request #733 from naderman/require-alias 
Require aliases from root packages, not original packages
 2012-05-25 00:45:08 -07:00
Nils Adermann 41215a0e47 Require first version of a root package alias, rather than alias 
This makes sure that the alias will always be installed, even if it isn't
technically needed.
 2012-05-24 23:29:08 +02:00
Jordi Boggiano b7082df8a4 Merge pull request #727 from jmfontaine/homebrew-fix 
Fixed the name of the homebrew package
 2012-05-24 12:11:44 -07:00
Jordi Boggiano 356a01b480 Switch back to getOption since hasOption always returns true 2012-05-24 21:07:07 +02:00
Jordi Boggiano 9857145830 Add failing test when aliasing a feature to an aliased version 2012-05-24 20:53:13 +02:00
Jordi Boggiano 5498b8d6a0 Add COMPOSER_ROOT_VERSION env var to override the root version 2012-05-24 20:36:47 +02:00
Jordi Boggiano 0930abd67e Update vendors 2012-05-24 18:16:41 +02:00
Jean-Marc Fontaine 545d3cb06b Fixed the name of the homebrew package 2012-05-23 16:08:37 +02:00
Jordi Boggiano 79826ee5c9 Fix dry-run output 2012-05-23 16:04:28 +02:00
Jordi Boggiano 4afca78daa Add missing class 2012-05-23 15:39:57 +02:00
Jordi Boggiano 0752e2b96b Fix output of dry run with --dev, fixes #676 2012-05-23 15:39:33 +02:00
Jordi Boggiano 63d7abf196 Fix dry run skipping some critical steps 2012-05-23 15:16:24 +02:00
Jordi Boggiano 1095d84256 Rename --skip-scripts to --no-scripts 2012-05-23 13:28:47 +02:00
Jordi Boggiano e25ccddeb7 Skip all scripts and not just command ones 2012-05-23 11:45:04 +02:00
Jordi Boggiano 1f2f161508 Merge remote-tracking branch 'pjedrzejewski/feature/skipping-scripts-execution' 
Conflicts:
	src/Composer/Installer.php
 2012-05-23 11:11:19 +02:00
Jordi Boggiano d853337616 Show output when test fails to resolve 2012-05-23 11:07:04 +02:00
Jordi Boggiano c440b4594a More PSR-2 goodness 2012-05-22 17:13:15 +02:00
Jordi Boggiano 99513ba52b Adjust output for create project, refs #724 2012-05-22 16:06:22 +02:00
Jordi Boggiano 713309b38c Show exact version being installed in create-project, fixes #724 2012-05-22 15:51:41 +02:00
Nils Adermann 16a51daac8 Fix typo in comment 2012-05-22 15:44:14 +02:00
Jordi Boggiano d3cec0399a CS fixes & do not replace the exception since that removes the stack trace 2012-05-22 13:16:56 +02:00
Jordi Boggiano b68eb3317b Merge remote-tracking branch 'OfficineSoftware/master' 2012-05-22 12:59:12 +02:00
Jordi Boggiano 7abfe5c541 Merge pull request #722 from dbu/doc-require-dev-conflicts 
explaining behaviour when require-dev conflicts with require. fix #720
 2012-05-22 03:53:14 -07:00
Jordi Boggiano 1bd4ccbd54 php-cs-fixer magic 2012-05-22 12:07:08 +02:00
Jordi Boggiano 4ea9b33a6c Merge remote-tracking branch 'naderman/solver-refactor' 2012-05-22 11:04:12 +02:00
Jordi Boggiano 1b36482d77 Merge pull request #723 from schmittjoh/createDevProject 
added --dev to create-project command (closes #645)
 2012-05-22 00:57:00 -07:00
Johannes M. Schmitt 305b9cee9a added --dev to create-project command (closes #645) 2012-05-21 20:57:10 -05:00
Nils Adermann 5567820beb Merge pull request #721 from Hounddog/issue_674 
Wrong variable used for foreach. Fixes issue 674.
 2012-05-21 09:50:21 -07:00
dbu 9173d4384e explaining behaviour when require-dev conflicts with require. fix #720 2012-05-21 18:41:20 +02:00
Nils Adermann 21c7e219e2 Change "else if" to "elseif" 2012-05-21 18:34:12 +02:00
Nils Adermann 99200af51b Correctly indent break statements 2012-05-21 18:33:21 +02:00
Nils Adermann f193d61dfe Remove unecessary brackets 2012-05-21 18:32:22 +02:00
Nils Adermann 7f9c5ffeef Add documentation to RuleWatchChain and RuleWatchNode 2012-05-21 18:26:18 +02:00
Nils Adermann 76d3950992 Document the RuleWatchGraph 2012-05-21 18:14:38 +02:00
Martin Shwalbe 9d80a4e220 Wrong variable used for foreach. Fixes issue 674. 2012-05-21 17:29:57 +02:00
Jordi Boggiano 5c0c101327 Wrap token_get_all for better debuggability 2012-05-21 12:51:21 +02:00
Nils Adermann 265533d390 Rename watches array to watchChains to make clearer what they are 2012-05-21 12:39:04 +02:00
Jordi Boggiano 794b51fcdd Merge remote-tracking branch 'naderman/remove-outdated-alias-code' 2012-05-21 11:48:37 +02:00
Nils Adermann 81de780533 Merge pull request #702 from Seldaek/specify-refs 
Specify commit/refs for dev requirements
 2012-05-20 07:01:42 -07:00
Nils Adermann e817a2e2d7 Move public members above protected members in rule watch node 2012-05-20 15:58:55 +02:00
Nils Adermann c869566868 Make ruleHash a protected member of rules 2012-05-20 15:57:38 +02:00
Nils Adermann fa7bd35413 Make debug solver methods protected 2012-05-20 15:49:58 +02:00
Nils Adermann 2dfea8a5e0 Only consider undecided literals for selectAndInstall 
Fixes #707
 2012-05-20 15:44:15 +02:00