1
0
Fork 0
Commit Graph

4588 Commits (55b2afe9ad5da07277caa1061f06e47f70d24328)

Author SHA1 Message Date
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
Jérôme Tamarelle 836986faf3 Add temp composer home for GitDriver test using cache 2013-10-10 22:57:03 +02:00
Jérôme Tamarelle f51aa4fad6 Add local cache for Git repositories 2013-10-10 22:28:01 +02:00
Jordi Boggiano cc37e4b0b8 Show defaulted version if phpversion() returns nothing, fixes #2313 2013-10-09 19:44:53 -03:00
Ruud Denivel 05d2186049 disable prepend option on update 2013-10-09 18:27:59 +02:00
Ruud Denivel 65c10daaf8 disable prepend option on install 2013-10-09 18:18:34 +02: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
Gerry Vandermaesen eb72e1692c Added --no-install option to create-project command
Added a --no-install option to the create-project command that
skips installation of the dependencies in the newly created
project.
2013-09-21 17:35:07 +02:00
Jordi Boggiano b0a7c7574a Merge pull request #2283 from hkdobrev/master
Use default description and license from CLI args
2013-09-21 02:34:15 -07:00
Haralan Dobrev 4abaaaf76d Use default description and license from CLI args
When running `composer init` with `--description` and `--license` arguments
on the command line they are later suggested as defaults during the
interactive flow. However when you press Enter (to use the default suggesstion)
Composer does not use it, but instead skip them entirely from the `composer.json`
generation.

This change provides a default argument not only to `DialogHelper::getQuestion()`,
but also to `DialogHelper::ask()`.
2013-09-21 02:10:24 +03:00
Karoly Negyesi f4e9c74fee style fixes 2013-09-20 09:58:46 +02:00
Karoly Negyesi 6c393c1c69 use the more generic removeDirectory 2013-09-20 06:31:06 +02:00
Karoly Negyesi 24c9ef72d6 make LibraryInstallerTest a little more strict 2013-09-20 06:04:15 +02:00
Karoly Negyesi c6ec739766 allow injecting a mock filesystem into LibraryInstaller and fix LibraryInstallerTest 2013-09-20 06:02:36 +02:00
Karoly Negyesi f82c820a32 do not try to test update inside fixtures 2013-09-20 05:39:35 +02:00
Karoly Negyesi dd4db91ae7 using mkdir() in copyThenRemove() leads to errors if the target exists or not a dir, use ensureDirectoryExists() instead 2013-09-20 05:02:06 +02:00
Karoly Negyesi b333d7a485 act on target-dir changes during update 2013-09-20 04:31:24 +02:00
Jordi Boggiano da7ace02eb Update deps 2013-09-19 11:23:19 +02:00
schmkr c4d7347ec5 Fixed a coding style issue
Missing a space between if and (
2013-09-16 22:13:37 +02:00
schmkr 652715f4c2 Improved the handling of trunkPath
- $this->baseUrl is only used if $this->trunkPath === false, otherwise
we will use $this->baseUrl with $this->trunkPath.
- scanning through trunkPath will now look for composer.json file
instead of a path that matches $this->trunkPath, beacuse checking
against the latter failed with deeper trunkPaths
- $this->rootIdentifier is now 'trunk' no matter how deep
$this->trunkPath is (with deeper trunkPaths, the name became something
like "dev-trunk-devel-team-packages-package"
2013-09-16 18:10:24 +02:00