Jordi Boggiano
96bff33aa9
Merge remote-tracking branch 'Partugal/dev-warning'
2012-06-24 15:09:36 +02:00
Jordi Boggiano
ffecd39d33
Refactor repositories handling in config/factory/loader, fixes #828 , fixes #826
2012-06-24 13:06:13 +02:00
Sergey Linnik
2448c5a7c2
don't display dev expiration time warning when running self-update command
2012-06-24 14:18:07 +04:00
Smasty
58f0d4aeac
fix CS
2012-06-24 13:00:35 +03:00
Smasty
bd83eb93bf
ConsoleIO::askAndHideAnswer - added support for zsh, ksh and csh shells.
2012-06-24 12:14:13 +03:00
Jordi Boggiano
74c2fd5f06
Merge pull request #824 from beryllium/bug823
...
PECL-UUID does not define a version constant, use phpversion() instead
2012-06-23 10:26:38 -07:00
Jordi Boggiano
488e794c9b
Merge repos instead of replacing
2012-06-23 13:04:23 +02:00
Jordi Boggiano
3ac11b932c
Expose default repositories in system config file
2012-06-23 12:55:05 +02:00
Jordi Boggiano
4a6ae454c2
Merge remote-tracking branch 'dpb587/multiple-repos'
...
Conflicts:
src/Composer/Factory.php
src/Composer/Package/Loader/RootPackageLoader.php
tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
2012-06-23 12:09:31 +02:00
Jordi Boggiano
66e9dcddf4
CS fixes
2012-06-23 11:58:18 +02:00
Jordi Boggiano
b566ba77ac
Fix behavior broken by #665
2012-06-23 11:47:53 +02:00
Jordi Boggiano
de449aa144
Merge remote-tracking branch 'PSeiffert/master'
...
Conflicts:
src/Composer/Factory.php
src/Composer/Repository/RepositoryManager.php
2012-06-23 11:42:13 +02:00
Kevin Boyd
09be4ed936
PECL-UUID does not define a version constant, so we should use phpversion() to fetch the required information
2012-06-22 23:09:57 -07:00
Jordi Boggiano
6e90c0be51
CS fixes
2012-06-22 20:08:26 +02:00
Jordi Boggiano
95bc5c4898
Fix openssl/pcre matches, and skip other exts properly
2012-06-22 20:07:41 +02:00
Jordi Boggiano
887d913eb6
Merge remote-tracking branch 'ChristianRiesen/master'
2012-06-22 19:48:51 +02:00
Jordi Boggiano
383c3f0153
Avoid tokenizing files for nothing
2012-06-22 18:59:15 +02:00
Christian Riesen
70e7194b07
Changes after excellent feedback from Jordi
2012-06-22 17:16:07 +02:00
Jordi Boggiano
4fcc114f97
Merge pull request #808 from palex-fpt/not-equal-operator
...
Add '<>' operator to Version Parser
2012-06-22 07:00:18 -07:00
Christian Riesen
432815df67
Added more libraries to PlatformRepository
2012-06-22 15:46:36 +02:00
Jordi Boggiano
ccc6fa3714
Merge pull request #775 from palex-fpt/PR-746
...
PEAR Packages extraction based on package.xml format
2012-06-22 06:15:38 -07:00
Christian Riesen
8d3c85225f
Changed PlatformRepository to handle libraries as well now
2012-06-22 14:54:03 +02:00
Christian Riesen
7b49b013ec
PlatformRepository now knows curl and libxml versions
2012-06-22 13:51:26 +02:00
Jordi Boggiano
6f576d4d4f
Add update <package> example to docs of update
2012-06-21 16:13:52 +02:00
Nils Adermann
cb27a1f308
Merge pull request #812 from Seldaek/recover-refs
...
Recover to an older commit if a locked reference is not found
2012-06-20 16:18:02 -07:00
Nils Adermann
cc7632489d
Make problem report messages more readable
...
Added pretty strings to constraints
2012-06-20 19:06:36 +02:00
Jordi Boggiano
54054365e0
Add some comments
2012-06-20 12:09:09 +02:00
Jordi Boggiano
73a865bf2a
Fix tests
2012-06-20 12:05:18 +02:00
Jordi Boggiano
c9ef7479c4
Keep track of commit dates in the lock file in case the reference disappears
2012-06-20 11:47:38 +02:00
Jordi Boggiano
77f6b9e05b
Recover from invalid references by taking the parent commit (by date)
2012-06-20 11:46:59 +02:00
Jordi Boggiano
a518f471f7
Ensure aliases are removed from local repos when a package is deleted from the filesystem
2012-06-20 11:45:55 +02:00
Jordi Boggiano
4bbb168d44
Remove BC code
2012-06-19 23:06:40 +02:00
Alexey Prilipko
9f08764e9a
Add '!=' handling to VersionConstraint::matchSpecific
2012-06-20 00:29:28 +11:00
Alexey Prilipko
e130386612
Add '<>' operator for Version Parser
2012-06-19 12:11:11 +11:00
Jordi Boggiano
a06ebdd8ef
Add caching to svn metadata
2012-06-18 15:38:47 +02:00
Jordi Boggiano
6d1377838b
Handle weird chars in cache keys
2012-06-18 15:34:08 +02:00
Nils Adermann
dc2a9bfe62
Ignore null rules in rule generator
...
Fixes #806
2012-06-17 20:15:19 +02:00
Jordi Boggiano
e953b4c891
Ensure vendor dir is initialized before generating the install path of a package
2012-06-17 18:16:47 +02:00
Alexey Prilipko
a88265a497
Update PearPackageExtractor for package.xml 2.1 support
2012-06-15 12:30:08 +11:00
Christophe Coevoet
398a3ac0dc
Made the order of aliases deterministic in the locker
2012-06-14 18:59:53 +02:00
Jordi Boggiano
67cf46546d
Merge pull request #791 from liuggio/patch-1
...
just added a \ before RuntimeException
2012-06-12 09:20:33 -07:00
Giulio De Donato
5c08b5b215
fixed #790
2012-06-12 17:57:11 +02:00
Giulio De Donato
3a53b06f00
just added a \ before RuntimeException (sorry I didn't run the test)
2012-06-12 18:08:22 +03:00
Jordi Boggiano
021f7bc2be
Merge remote-tracking branch 'naderman/solver-refactor'
2012-06-11 15:13:46 +02:00
Jordi Boggiano
1df9c62583
Cosmetic fixes to autoload generation
2012-06-11 14:15:08 +02:00
Nils Adermann
8a9c51c83e
Merge remote-tracking branch 'github-beberlei/AutoloadFunctions'
2012-06-11 12:49:12 +02:00
Nils Adermann
5bea5974f7
Improve error messages for solver problems
2012-06-07 03:23:23 +02:00
Nils Adermann
12abff8b4c
Simplify branch handling code
2012-06-07 03:22:23 +02:00
Nils Adermann
76f8642feb
Remove duplicate function from decisions
2012-06-07 03:22:23 +02:00
Nils Adermann
5b1a48663e
DecisionQueueFree is no longer needed
2012-06-07 03:22:23 +02:00
Nils Adermann
2fbc04b950
Make decisions countable and use foreach to iterate them in solver
2012-06-07 03:22:23 +02:00
Alexey Prilipko
71ac073ebe
Add 'include-path' option to PEAR packages
2012-06-06 13:00:35 +11:00
Alexey Prilipko
5c16889c48
Update PearDownloader to use PEAR extractor
2012-06-06 12:54:50 +11:00
Alexey Prilipko
01a49ea49e
Add PEAR package extractor that honours package.xml formats
2012-06-06 12:52:13 +11:00
Jordi Boggiano
bc7e983b1e
Allow PlatformRepository packages to be aliased
2012-06-05 17:41:50 +02:00
Nils Adermann
1211d8f7d4
Correctly generate conflict and alias rules for installed packages
2012-06-05 12:02:34 +02:00
Nils Adermann
d592c0a55e
Remove only branches on right levels in revert
2012-06-05 11:49:36 +02:00
Nils Adermann
ac762ba6e9
Correctly resolve branches if necessary
2012-06-05 11:04:09 +02:00
Nils Adermann
67fde90666
Correctly sort operations within transactions using DFS
...
Fixes #655
2012-06-05 01:06:35 +02:00
Nils Adermann
26e051cb76
Decisions are now encapsulated in a separate object
2012-06-04 23:19:32 +02:00
Jordi Boggiano
99e3cad0b5
Soften wording on validation of licenses
2012-06-04 11:31:43 +02:00
Jordi Boggiano
d53ebf5ba9
Fix svn status with externals, fixes #766
2012-06-04 11:21:17 +02:00
Jordi Boggiano
1aa2cfe6e1
Fix unitialized git repo, fixes #758
2012-06-04 00:53:51 +02:00
Nils Adermann
cab70cc031
Merge pull request #759 from hason/noprocopen
...
Added test if proc_open function is enabled in RootPackageLoader
2012-06-02 12:19:59 -07:00
Benjamin Eberlei
5c5e962b5a
Add Files Autoloading key. This is a necessary feature to allow purely or partly functional libraries to be "autoloadable" by composer by calling require_once on every file in the "autoload"."files" list.
2012-06-02 18:18:33 +02:00
Ph3nol
c64d7b7dc7
PHP doc return tag added to SpdxLicenseIdentifier class method
2012-06-02 15:22:20 +02:00
Martin Hasoň
09f774c705
Added test if proc_open function is enabled in RootPackageLoader
2012-06-02 08:54:42 +02:00
Christophe Coevoet
b634659695
Fixed undefined variable when no branch match.
...
Closes #756
2012-06-02 00:48:46 +03:00
Jordi Boggiano
b3c395b8d2
Add PHP info to UA string
2012-06-01 14:05:24 +02:00
Jordi Boggiano
b92a19ce4b
Fix windows bin proxy when there are spaces in the path
2012-06-01 13:56:05 +02:00
Jordi Boggiano
3639611bc6
Add OS/Version to UserAgent
2012-06-01 13:55:36 +02:00
Jordi Boggiano
935eaa9646
Fix windows proxy code
2012-06-01 13:32:42 +02:00
Jordi Boggiano
57c3359bdb
Small fixes to the version guessing
2012-05-31 15:57:49 +02:00
Jordi Boggiano
3aeb6a8f2d
Minor robustness fix
2012-05-31 14:36:45 +02:00
Jordi Boggiano
5edb49c067
Show include path in show command
2012-05-31 14:36:34 +02:00
Jordi Boggiano
03ded63924
Root version detection improvement, fixes #748
2012-05-31 14:36:21 +02:00
Jordi Boggiano
56b79125bf
Check out the branch instead of headless commit when creating a project
2012-05-31 14:34:45 +02:00
Jordi Boggiano
740d3aa1e3
Generate source urls with labels and not identifiers
2012-05-31 11:49:10 +02:00
Jordi Boggiano
2257d0b550
Guess issues/source support info for github packages
2012-05-31 10:54:12 +02:00
Gordon Schmidt
589dffbfbb
changed string to match authorization errors
2012-05-31 09:24:36 +02:00
Jordi Boggiano
5bfbff867c
Root requires are not taken into account in locked installs, fixes #669
2012-05-28 18:57:59 +02:00
Jordi Boggiano
d56c996622
Remove source-refs from lock file for alias packages
2012-05-28 18:29:02 +02:00
Jordi Boggiano
31330a739f
Fix CS
2012-05-28 16:38:52 +02:00
Jordi Boggiano
2b2a5d0a92
Fix release- tags not being parsed
2012-05-28 14:41:26 +02:00
Jordi Boggiano
e6cd41ffc7
Merge pull request #740 from naderman/require-update
...
Skip dependency packages required in composer.json in update whitelist
2012-05-28 04:14:36 -07:00
Nils Adermann
c7250917e8
Skip dependency packages required in composer.json in update whitelist
2012-05-28 12:06:43 +02:00
Igor Wiedler
a0c90bad0f
Fix normalization in init command with --no-interaction and --require
...
When calling `composer init --no-interaction --require foo/bar:dev-master` it
would fail because in non-interactive mode it would only split on space.
2012-05-28 02:37:33 +02:00
Nils Adermann
242323cba4
Merge pull request #736 from Seldaek/require-update
...
Require command & update <package>
2012-05-27 17:11:48 -07:00
Jordi Boggiano
704b7a655f
Clarity fix
2012-05-28 02:05:23 +02:00
Nils Adermann
2d9aa3d49d
Update dependencies of whitelisted packages, but not random dependencies
2012-05-28 01:58:54 +02:00
Jordi Boggiano
d21032ace5
CS fixes
2012-05-28 01:58:49 +02:00
Jordi Boggiano
c694bd57a3
Merge remote-tracking branch 'digitalkaoz/issue_397'
2012-05-28 01:36:19 +02:00
Jordi Boggiano
734317b812
Add test and fix update whitelist feature
2012-05-28 00:11:47 +02:00
Jordi Boggiano
9841b6f36e
Extend proper method to register commands at startup
2012-05-28 00:10:02 +02:00
Jordi Boggiano
8ffe3c2e26
Cosmetic fixes
2012-05-27 23:21:10 +02:00
Jordi Boggiano
c580cb8ba8
Add package argument to the update command, fixes #470 , fixes #450
2012-05-26 15:20:27 +02:00
Jordi Boggiano
42c501aaa4
Force the installation of the newly required packages in require command
2012-05-26 15:17:52 +02:00
Jordi Boggiano
1443ea25f9
Make sure a constraint is provided with input requirements
2012-05-26 14:51:06 +02:00
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
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
356a01b480
Switch back to getOption since hasOption always returns true
2012-05-24 21:07:07 +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
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
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
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
Johannes M. Schmitt
305b9cee9a
added --dev to create-project command ( closes #645 )
2012-05-21 20:57:10 -05: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
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
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
Christophe Coevoet
c2d3c0509c
Fixed the check for local git repositories
2012-05-17 15:08:54 +02:00