1
0
Fork 0
Commit Graph

3742 Commits (18da5810c5defd32a0f911ec67b20f88394b6474)

Author SHA1 Message Date
Jordi Boggiano 18da5810c5 Update deps 2013-10-16 12:13:34 +02:00
Jordi Boggiano f8be812a49 Merge remote-tracking branch 'origin/master' 2013-10-16 10:57:18 +02:00
Jordi Boggiano ce8b475f4c Minor tweaks to perforce support, refs #2329 2013-10-16 10:53:57 +02:00
Jordi Boggiano a3e304028c Merge remote-tracking branch 'fabiang/preforce' 2013-10-16 10:52:46 +02:00
Fabian Grutschus a6823d2f9b non-deep check returns allways false 2013-10-16 10:07:10 +02:00
Nils Adermann 2f4a3aba26 Merge pull request #2302 from igorw/versions-table
Format the possible version formats as a table
2013-10-15 09:55:22 -07:00
Nils Adermann 565f86f30d Fix stream context option test to really only verify content-type is last 2013-10-14 17:53:02 -07:00
Nils Adermann 42dd2f2ee8 Check only part of the error message as it's different in hhvm 2013-10-14 15:57:19 -07:00
Nils Adermann 4f51db72f8 hhvm version constant still called HPHP on older versions so use it for bc 2013-10-14 15:57:19 -07:00
Nils Adermann 4c8e8ca702 Allow specifying HHVM as a dependency 2013-10-14 15:57:19 -07:00
Fabian Grutschus 20854a50b4 Removed unnecessary test and just check for return code 2013-10-14 18:04:09 +02:00
Fabian Grutschus 0c5bd559f2 Changes comparsion to strict and removed a comment 2013-10-14 17:25:57 +02:00
Fabian Grutschus 67083e436b Check for exit code is equal to 0 instead of 127 2013-10-14 15:07:35 +02:00
Fabian Grutschus 5ae5963acd Fix for Preforce utility does not check if p4 command exists 2013-10-14 14:53:57 +02:00
Jordi Boggiano cd209e3180 Merge pull request #2323 from yuya-takeyama/patch-1
Fix link to COMPOSER_HOME on doc
2013-10-13 10:08:17 -07:00
Yuya Takeyama c88d461efd Fix link to COMPOSER_HOME 2013-10-13 18:52:28 +09:00
Jordi Boggiano 9dcada5e25 Remove buggy chunk of code, refs #2312, refs #2305 2013-10-11 20:41:32 -03:00
Jordi Boggiano 2b36106168 Fix tests, refs #2184 2013-10-11 20:22:50 -03:00
Jordi Boggiano 0fbb4cbd16 CS fixes and renaming a few methods, refs #2184 2013-10-11 20:21:34 -03:00
Jordi Boggiano 11a0d16ccc CS fixes 2013-10-11 20:12:45 -03:00
Jordi Boggiano 9a806658d6 Merge remote-tracking branch 'vuhl/master'
Conflicts:
	src/Composer/Factory.php
2013-10-11 20:06:34 -03:00
Jordi Boggiano 57146c12b4 Warn user that commands are being run in another directory 2013-10-11 19:59:46 -03:00
Jordi Boggiano 4989940533 Merge pull request #2317 from xrstf/installer-binaries
attempted fix for #1589 (installers & binaries)
2013-10-11 08:41:42 -07:00
Christoph f0842213e0 make sure relative paths from custom installers to not break the installation of binaries 2013-10-11 14:34:52 +02:00
Jordi Boggiano 60237f16af Merge pull request #2308 from nicolas-bastien/remove_unused_use_statement
Remove unused use statement.
2013-10-10 21:08:24 -07:00
Jordi Boggiano cc37e4b0b8 Show defaulted version if phpversion() returns nothing, fixes #2313 2013-10-09 19:44:53 -03:00
Nicolas Bastien 52711d121c Remove unused use statement. 2013-10-07 17:11:57 +02:00
Jordi Boggiano 3da05c68f9 Merge pull request #2297 from nicolas-bastien/patch-1
[DOC] add link to Monolog library
2013-10-02 07:25:06 -07:00
Igor Wiedler 30b5d2f1fc Document logical OR constraints 2013-10-02 12:55:29 +02:00
Igor Wiedler 1c2213ef5d Format the possible version formats as a table
Note I: This syntax is supported by MarkdownExtra, which both getcomposer
and github are using.

Note II: This patch currently breaks the PDF, because pandoc does not like
non-standard markdown tables. Ideas for fixing this appreciated.

Note III: The idea for this patch came up a few weeks ago on IRC. We
agreed back then that a table would be a good idea.

Note IIII: This patch creates a stability section which opens the door for
finally documenting how stability works in the composer docs.
2013-10-02 01:11:53 +02:00
Nicolas Bastien 6a435f97c8 Correct line length
Correct GromNaN  comment
2013-09-30 00:10:23 +02:00
Nicolas Bastien e34dae4d42 [DOC] add link to Monolog library 2013-09-28 06:51:54 +02:00
Jordi Boggiano 46e55541e7 Merge pull request #2294 from hason/path
Fixed path analysis
2013-09-26 06:51:49 -07:00
Martin Hasoň 3c0a620ad5 Fixed path analysis 2013-09-26 14:34:41 +02:00
Jordi Boggiano 05ffc605f1 Ignore chmod failures, fixes #1854 2013-09-26 12:49:50 +02:00
Jordi Boggiano 46e82cb38d Retry json file writing 3 times before failing, fixes #2286 2013-09-26 12:23:57 +02:00
Jordi Boggiano 3f8836ff10 Fix some docs 2013-09-26 12:00:12 +02:00
Jordi Boggiano ff404f8bd0 Merge remote-tracking branch 'origin/master' 2013-09-26 11:57:39 +02:00
Jordi Boggiano 6e4e10620a Merge remote-tracking branch 'gerryvdm/feature'
Conflicts:
	src/Composer/Command/CreateProjectCommand.php
2013-09-26 11:57:05 +02:00
Jordi Boggiano 3f6227a996 Add workaround for php bug 53460 glob() can return false, fixes #2278 2013-09-26 11:38:33 +02:00
Jordi Boggiano 67d2a4dfe2 Merge pull request #2292 from mmoreram/patch-1
Set some phpdoc to isLocalUrl
2013-09-26 01:07:51 -07:00
Marc 30049637dc Set some phpdoc to isLocalUrl 2013-09-26 01:57:21 +02:00
Jordi Boggiano 807600b255 Fix edge case where one adds a target-dir on a package that didnt have one before, refs #2279 2013-09-25 21:11:18 +02:00
Jordi Boggiano a813867065 Merge remote-tracking branch 'chx/913' 2013-09-25 20:58:13 +02:00
Jordi Boggiano 7defc95e4b Merge pull request #2289 from Seldaek/paralleltravis
Add parallel build to travis script
2013-09-25 01:32:49 -07:00
Jordi Boggiano 38917c2047 Add parallel build to travis script 2013-09-25 10:23:48 +02:00
Jordi Boggiano b482ebe0ca Merge pull request #2285 from peterkokot/patch-1
CS fix
2013-09-23 02:55:49 -07:00
Karoly Negyesi e32e4ad490 change the test to test for a target dir change 2013-09-22 19:42:05 +02:00
Karoly Negyesi 1a69d0a2a7 style fixes 2013-09-22 19:41:54 +02:00
Peter Kokot 4748f16091 fix CS 2013-09-21 20:31:53 +02:00