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
Nils Adermann
dd527a4049
Remove weak rules
...
Since we no longer have suggest/recommend rules and no longer use any update
or feature rules so packages are removed by default, we do not need weak rules
anymore.
2012-05-19 21:49:48 +02:00
Nils Adermann
025581b365
Rename walkLiteral method to more explicitly say what it does
2012-05-19 20:50:21 +02:00
Nils Adermann
a395bc04d7
Get rid of continue 2; and use array_filter instead of manual looping
2012-05-19 20:48:12 +02:00
Nils Adermann
451bab1c2c
Get rid of Literal object / literal id mix, use literals only to save memory
2012-05-19 20:38:56 +02:00
Nils Adermann
59cc5a54de
Merge pull request #716 from stof/update_lock
...
Updated the lock file
2012-05-18 18:28:18 -07:00
Christophe Coevoet
e124d3ea81
Updated the lock file
2012-05-19 03:17:10 +02:00
Nils Adermann
9ffe0d13f5
Remove useless if
2012-05-19 02:28:09 +02:00
Nils Adermann
cdf3b4e012
Use SplDoublyLinkedList instead of custom linked list
2012-05-19 02:24:45 +02:00
Nils Adermann
731a451dfe
Move handling of watch graph to separate classes
2012-05-19 01:27:57 +02:00
Jordi Boggiano
71cecd8e93
Fix CS
2012-05-18 16:12:18 +02:00
Jordi Boggiano
edba29be45
Merge remote-tracking branch 'till/download-fun'
2012-05-18 16:08:57 +02:00
Jordi Boggiano
aaf65eb0c4
Update lock file
2012-05-18 15:33:09 +02:00
Jordi Boggiano
3ff4026a30
Merge pull request #712 from hason/githuberror
...
Imporoved exception message for GitDownloader (various protocols for git...
2012-05-18 06:11:07 -07:00
Martin Hasoň
c8d110aa72
Imporoved exception message for GitDownloader (various protocols for github)
2012-05-18 14:41:57 +02:00
till
a8121bc0a6
* fluent interface for set methods
...
* strtolower() type so setting is a little more relaxed
2012-05-17 20:07:49 +02:00
Jordi Boggiano
25a61cd763
Merge pull request #706 from gergoerdosi/master
...
Update Homebrew installation instructions.
2012-05-17 07:13:17 -07:00
Gergo Erdosi
b6cd2f6e08
Update Homebrew installation instructions.
...
Composer is now part of the homebrew-php repository which is used by most of the Homebrew users. The Gist formula in the previous version of the instructions raises a warning, which might confuse users. The installation of the new formula runs seamlessly without any warnings.
2012-05-17 17:06:57 +03:00
Nils Adermann
bac9d6d2e7
Merge pull request #705 from stof/support_local_repo
...
Support local repo
2012-05-17 06:33:07 -07:00
Christophe Coevoet
c2d3c0509c
Fixed the check for local git repositories
2012-05-17 15:08:54 +02:00
Christophe Coevoet
4404c5f287
Revert "Merge remote-tracking branch 'github-ercanozkaya/master'"
...
This reverts commit b5eededbe9
, reversing
changes made to 799a478f2a
.
This change was wrong as the GitDriver was then telling it supports
all local URIs even when they are not git repositories.
2012-05-17 14:54:45 +02:00
Nils Adermann
b5eededbe9
Merge remote-tracking branch 'github-ercanozkaya/master'
...
By Ercan Özkaya
via Ercan Özkaya
* github-ercanozkaya/master:
Add support for file:// URIs to GitDriver
2012-05-17 14:39:28 +02:00
Ercan Özkaya
ca217bd48f
Add support for file:// URIs to GitDriver
2012-05-17 15:36:02 +03:00
Jordi Boggiano
d7608bcddd
Added docs for new reference feature
2012-05-17 10:08:48 +02:00
Jordi Boggiano
c10eb66ac4
Ignore references when parsing dev versions
2012-05-17 04:07:15 +02:00
Jordi Boggiano
ba29b4bf94
Added references for dev versions, fixes #599
...
dev-<branch> and <n.m>.x-dev versions can now have a #<reference> appended
to them. This reference being a git/hg commit hash, or svn revision.
2012-05-17 04:07:14 +02:00
Andrea Turso
3a31b59473
Minor changes to the EventDispatcherTest
...
- Removed Exception class import
- Added FQN at L60
- Added documentation
- Added @group event-dispatcher
2012-05-16 16:55:24 +01:00