1
0
Fork 0
Commit Graph

3124 Commits (88032816489eabfb67b26a90b9050c990c29f4c6)

Author SHA1 Message Date
Nils Adermann 302948db3e Merge branch 'versioncomp'
* versioncomp:
  Correctly treat dev versions for other types of comparisons and add tests
  Remove useless ternary operator
  Prevent seeing dev versions as equal when they are not, fixes #848
2012-07-11 20:50:56 +02:00
Nils Adermann 560c3254d4 Correctly treat dev versions for other types of comparisons and add tests 2012-07-11 20:49:53 +02:00
Nils Adermann bbdbfc97ea Remove useless ternary operator 2012-07-11 20:36:44 +02:00
Jordi Boggiano 2f7130200a Prevent seeing dev versions as equal when they are not, fixes #848 2012-07-11 20:25:22 +02:00
Jordi Boggiano d4aab7d5b6 Fix solver test 2012-07-11 19:37:02 +02:00
Jordi Boggiano 2d19cf2a00 Fix hijacking possibility via provide bug 2012-07-11 19:31:30 +02:00
Jordi Boggiano 07ae0cdb37 Merge pull request #896 from michaelmcandrew/patch-1
"Out of the box, composer supports three types" (not two types)...
2012-07-11 05:48:22 -07:00
Michael McAndrew 91d399148b seems to me like "Out of the box, composer supports three types" (not two types) of package type. 2012-07-11 14:39:46 +02:00
Jordi Boggiano 37ef2037cf Add test case to ensure replace does not allow hijacking packages 2012-07-11 13:01:16 +02:00
Jordi Boggiano 6a8be06dcf Merge pull request #893 from Adel-E/patch-2
Fix phpdocs
2012-07-11 01:19:42 -07:00
Adel d3b9f5c33f Fix phpdocs 2012-07-10 19:09:56 +00:00
Jordi Boggiano eb283b34e4 Revert "Fix git checkouts of custom branches, fixes #889"
This reverts commit cbf27bb422.
2012-07-10 19:27:17 +02:00
Jordi Boggiano cbf27bb422 Fix git checkouts of custom branches, fixes #889 2012-07-10 19:02:36 +02:00
Alexey Prilipko 75d3d57117 Version parser stability regexp update 2012-07-10 21:50:58 +11:00
Jordi Boggiano 5325aef8fe Rename brackets to parenthesis for clarity, fixes #888 2012-07-10 12:37:03 +03:00
Jordi Boggiano cc063cce94 Merge pull request #883 from sylvainfilteau/feature-prepend-include-path
Change the order of the include paths
2012-07-10 02:35:43 -07:00
Alexey Prilipko 490b2c0295 Add package name prefix for non 'php', 'script' and 'www' roles 2012-07-09 08:47:27 +11:00
Jordi Boggiano 3eaa05edb9 Merge pull request #882 from prehfeldt/doc-fixes
fixed typos in doc
2012-07-08 04:16:54 -07:00
Alexey Prilipko 22d41845ae Exclude dirs from list of binaries 2012-07-08 15:20:35 +11:00
Sylvain Filteau 51404659ef Change the order of the include paths
Composer installed libraries should have precedence over other libraries in the
system (like PEAR installed libraries).

Made composer prepend it's include_path configuration instead of appending it.
2012-07-06 14:17:27 -04:00
Alexey Prilipko bc2d30492a Add php proxies to replacement vars. 2012-07-06 22:14:10 +11:00
prehfeldt 8fde6edfdf fixed typos in doc 2012-07-06 12:40:43 +02:00
Jordi Boggiano 6adc81c38b Merge pull request #873 from RobLoach/stabilitydocs
Update minimum-stability documentation
2012-07-05 02:14:06 -07:00
Rob Loach 12cf2441e0 Fix by @stof: Forgot RC as a minimum-stability flag. #r1101718 2012-07-04 17:26:59 -03:00
Rob Loach dbf2466040 Reference the discussion rather than the documentation for #873 2012-07-04 10:57:18 -04:00
Rob Loach 4f922ffa28 Update minimum-stability documentation 2012-07-04 10:37:28 -04:00
Jordi Boggiano 6573fd3f77 Add hint in solver exceptions as to what may be wrong 2012-07-04 15:57:51 +02:00
Jordi Boggiano a5f0872152 Update changelog 2012-07-04 15:08:06 +02:00
Jordi Boggiano 175d1939b5 Fix tests 2012-07-04 14:28:15 +02:00
Jordi Boggiano f4409d9168 Fix problem output formatting, fixes #871 2012-07-04 14:27:26 +02:00
Jordi Boggiano e6f7150196 Change default minimum-stability to "stable", fixes #744 2012-07-04 14:22:09 +02:00
Jordi Boggiano f8d671a07a Tweak exception message 2012-07-04 14:15:57 +02:00
Jordi Boggiano 47a8dccfb0 Merge remote-tracking branch 'henrikbjorn/validate-camelcase' 2012-07-04 12:42:14 +02:00
Henrik Bjørnskov 0e73f3187b Validate the name.
If uppercase characters is found suggest a new name with all lowercase
and using - as a seperator where the camelcased characters was found.
2012-07-03 18:39:24 +02:00
till b47635cf0a Merge branch 'bugfix-broken-classmap' of github.com:till/composer into bugfix-broken-classmap 2012-07-03 17:51:23 +02:00
till 2823c78856 Allow absolute paths in composer.json and don't prepend them with a funny $baseDir variable. 2012-07-03 17:50:41 +02:00
till d4c265fd18 Sorry, tabs. 2012-07-03 17:09:27 +02:00
till 642c205c4f Allow absolute paths in composer.json and don't prepend them with a funny $baseDir variable. 2012-07-03 17:06:22 +02:00
Jordi Boggiano 0a55707f3e Merge pull request #868 from palex-fpt/pear-binaries
Add php proxies that add all locally installed packages to include_path
2012-07-03 06:49:17 -07:00
Alexey Prilipko 3bdae180f6 Add php proxies that add all locally installed packages to include_path. PEAR binaries are run through these proxies. 2012-07-04 00:38:29 +11:00
Jordi Boggiano 74da2f6730 Remove unnecessary code 2012-07-04 00:35:25 +11:00
Jordi Boggiano db16f68fbf Tweak exception messages 2012-07-03 14:21:10 +02:00
Jordi Boggiano ae2fb6be89 Merge remote-tracking branch 'digitalkaoz/issue_347' 2012-07-03 13:19:40 +02:00
Robert Schönthal 0cd453449b minor changes to JsonFile::parseJson for Drivers 2012-07-03 12:45:07 +02:00
Robert Schönthal e96e06946f fixed json file tests 2012-07-03 12:37:58 +02:00
Robert Schönthal c517ac6404 fixed issue #347 added file to json validation exception 2012-07-03 12:37:58 +02:00
Jordi Boggiano b82b9b53f7 Remove unnecessary code 2012-07-03 10:43:34 +02:00
Jordi Boggiano 6fb667a752 Merge remote-tracking branch 'palex-fpt/pear-channel-reader' 2012-07-03 10:27:34 +02:00
Alexey Prilipko 22aef0124e Revert Locker change, ignore PEAR packages whose version cannot be parsed. 2012-07-03 19:18:58 +11:00
Alexey Prilipko 9ba3deb91b Fix text spacing and remove excess getInstallPath call in LibraryInstaller::update 2012-07-03 19:18:58 +11:00