1
0
Fork 0
Commit Graph

270 Commits (203ec4b485e43f77a9aa8e5064e72d1c67f96543)

Author SHA1 Message Date
hakre 7077803aa4 Git Checkout Branch / File Differentiation
This fixes a minor inaccuracy issue when creating git checkout commands
for branches.

The git checkout command used within `GitDownloader::updateToCommit()`
does not use the "`--`" sequence to separate branch from file parameters.

This leads to an inaccuary as git tries as well the branch name as file
name. If the non-existent branch is actually the name of a file, the file
is checked out. If the non-existent branch is not the name of a file, an
error message is given:

> error: pathspec 'non-existent-branch' did not match any file(s) known to
git.

Both cases are not expected for the program flow in
`GitDownloader::updateToCommit()`.

The only thing that is expected is a non-existent branch to fail to
checkout - but with a different error message:

> // reference was not found (prints "fatal: reference is not a tree:
 $ref")

This can be easily fixed by adding the missing separator when constructing
the command which is applied with this commit.
2015-03-19 12:50:06 +01:00
Rob Bast cb336a5416 Implement writeError throughout Composer 2015-02-25 11:00:35 +01:00
Padraic Brady 19e24c5804 Merge branch 'master' into tls-config
Conflicts:
	.travis.yml
	doc/03-cli.md
	src/Composer/Command/ConfigCommand.php
	src/Composer/Command/CreateProjectCommand.php
	src/Composer/Command/DiagnoseCommand.php
	src/Composer/Command/InstallCommand.php
	src/Composer/Command/RequireCommand.php
	src/Composer/Command/SelfUpdateCommand.php
	src/Composer/Command/ShowCommand.php
	src/Composer/Command/UpdateCommand.php
	src/Composer/Config.php
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Factory.php
	src/Composer/Repository/ComposerRepository.php
	src/Composer/Repository/PearRepository.php
	src/Composer/Repository/Vcs/VcsDriver.php
	src/Composer/Util/GitHub.php
	src/Composer/Util/RemoteFilesystem.php
2015-01-29 20:31:56 +00:00
Colin O'Dell f304611014 Fix Git failures due to tag ambiguity (issue #3417) 2014-11-14 10:31:52 -05:00
Jordi Boggiano a309e1d89d Fix tests and run it before the push url updater 2014-10-20 20:16:14 +01:00
Jordi Boggiano 94926218e8 CS fixes 2014-10-17 18:57:27 +01:00
Jordi Boggiano ac497feaba CS fixes 2014-06-10 16:13:12 +02:00
Jordi Boggiano 97873a27af Update perforce code 2014-05-07 19:34:41 +02:00
Jordi Boggiano 77163f66fc Add support for mirrors in composer repos 2014-05-07 19:34:35 +02:00
Jordi Boggiano 32cd883daa Rename options to transport-options, refs #2189 2014-05-07 18:25:28 +02:00
Jordi Boggiano 016a016455 Merge remote-tracking branch 'lcobucci/master'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
2014-05-07 18:02:46 +02:00
Clark Stuth a12c4e2a17 Removed getWindowsFlag and setWindowsFlag methods from Perforce object. 2014-03-25 08:30:44 -05:00
Clark Stuth dd1fd0e306 fixed perforce to reference labels instead of invalid tags 2014-03-24 15:19:35 -05:00
Clark Stuth 24dd42267f almost all unit tests passing after IOInterface dependency refactor. no longer passing IOInterface into any Perforce methods 2014-03-21 13:51:18 -05:00
Clark Stuth 0f7b078d6c added new dependency to Perforce object, updating some tests. 2014-03-21 13:51:18 -05:00
Pádraic Brady 306ba77e93 Implement the RemoteFilesystem Factory everywhere...
- also fixes impacted test
2014-03-01 17:01:44 +00:00
Nils Adermann 5ed18d9aa2 Fail over from source to dist and vice versa when downloads fail
Any RuntimeException descendent will be caught and cause another
download attempt using either source or dist depending on what was
attempted first.
2014-02-24 18:40:33 +01:00
Jordi Boggiano 5d4900e79d Add --no-checkout flag to avoid checking out the default branch first, fixes #2717 2014-02-18 13:28:46 +01:00
Julius Beckmann ed5da804dd Fixed handling of Metapackages in DownloadManager.
The "getDownloaderForInstalledPackage" returns null for "metapackage" and the download(), update() and remove() methods did not handle this return value correctly.
2014-02-06 10:50:06 +01:00
Luís Otávio Cobucci Oblonczyk 0f2c0ab389 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
2013-12-29 00:37:08 +00:00
mwhittom a8084e46ff Added error handling and error messages around missing perforce driver, invalid username/password 2013-12-02 13:34:47 -06:00
user a956ce9bb1 Use 'cache-files-ttl' for cache gc, fixes #2441
The configuration option 'cache-ttl' was used instead of 'cache-files-ttl' to determine
whether or not a cache gc should be performed.

* changed 'cache-ttl' to 'cache-files-ttl' to determine if a gc should be performed
* refactored FileDownloader to allow for easier testing
* added test to ensure that the gc is called with the proper config option
2013-11-24 10:55:25 +01:00
Jordi Boggiano 7148b22414 Add github-domains config value for GitHub Enterprise setups, fixes #728
Signed-off-by: Gennady Feldman <gena01@gmail.com>
2013-10-28 12:40:20 -04:00
Jordi Boggiano f5df1d6a9b Fix cs 2013-10-19 17:59:56 +02: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
mwhittom 2e737ac439 updated to replace double-quotes with single quotes 2013-09-09 14:48:24 -05:00
mwhittom f7d9f3d8b4 Fixed Test method setUp to be protected instead of private. 2013-09-06 12:31:04 -05:00
mwhittom 07d46aa3c3 Fixed spacing issues for PSR-2 2013-09-06 12:14:22 -05:00
mwhittom 774a55befd Updated to match psr-2 spec, fixed header comments 2013-09-04 09:24:49 -05:00
matt-whittom 8379985166 Updated/Standardized header comments 2013-09-04 09:10:44 -05:00
matt-whittom dd81449998 Updated to remove vfsStreams (no longer needed by tests)
Updated Perforce to cleanup, modified VcsRepository to call cleanup on Driver class
Updated tests, perforce constructor to make tests cleaner/easier
2013-09-04 09:10:44 -05:00
matt-whittom 1015957659 Added tests and code for tests 2013-09-04 09:10:43 -05:00
Nils Adermann 2ca07add97 Merge remote-tracking branch 'github-composer/master' into plugins
* github-composer/master:
  Correct FileDownloaderTest for invalid checksum

Conflicts:
	tests/Composer/Test/Downloader/FileDownloaderTest.php
2013-08-31 15:58:31 +02:00
Nils Adermann 72919e04b0 Correct FileDownloaderTest for invalid checksum 2013-08-31 15:55:12 +02:00
Nils Adermann 3960edd64e Turn EventDispatcher into generic solution handling plugins as well 2013-08-30 12:51:41 +02:00
Luís Otávio Cobucci Oblonczyk d4043b6b9a Package options must be passed as argument to downloader 2013-08-19 04:38:25 -03:00
Jordi Boggiano 7912253df6 Retry downloading when a corrupt zip is found, fixes #2133, fixes #2128, fixes #2125 2013-07-31 20:33:20 +02:00
Jordi Boggiano 7252078508 Attempt to fix travis build 2013-07-26 15:44:52 +02:00
Jordi Boggiano 771233a5a0 Make it clear what is going on when a vcs folder is missing, fixes #2108 2013-07-26 12:25:05 +02:00
Jordi Boggiano ab731b1197 Oops 2013-07-05 00:47:18 +02:00
Jordi Boggiano be235ffc19 Fix 5.3.3 build 2013-07-05 00:44:29 +02:00
Jordi Boggiano 0822683706 Fix tests 2013-06-28 20:42:06 +02:00
Jordi Boggiano 7f2b321044 Fix tests 2013-06-19 10:05:21 +02:00
Jordi Boggiano 6b876958b9 Fix tests 2013-06-18 14:23:51 +02:00
Stéphane Klein 42119dde6b Use github protocols setting for push urls 2013-06-16 04:50:16 +02:00
Jordi Boggiano c479a26d71 Add workaround for msysgit failing to handle symlinks on windows, fixes #1048, fixes #1418 2013-06-08 17:51:30 +02:00
Jordi Boggiano 4cac2caf70 Make sure cd call allows switching drives on windows, fixes #1971 2013-06-08 16:41:34 +02:00
Jordi Boggiano 8b8dc1fd70 Remove all possible cd calls, refs #1971 2013-06-08 16:40:42 +02:00
Jordi Boggiano 3fd883a489 Set cwd instead of using cd in GitDownloader, refs #1832 2013-04-28 11:12:09 +02:00
Filippo Tessarotto 470adc47df Switched rand() to mt_rand() 2013-01-30 10:44:07 +01:00
Jordi Boggiano 224934831d Change all github archive URLs to API URLs and handle fallback for those to nodeload 2012-12-05 19:20:52 +01:00
Jordi Boggiano b641f9ea68 Fix tests 2012-11-22 20:03:26 +01:00
Jordi Boggiano 5a9d986e67 Implement cache GC and fix keys 2012-11-10 23:17:36 +01:00
Jordi Boggiano 1682532b80 Update code to use new github archive URLs 2012-11-04 14:01:22 +01:00
Jordi Boggiano 0878c6deab Fix nodeload fallback URLs 2012-11-04 11:19:28 +01:00
Jordi Boggiano 39e69a3b12 Refactor OAuth acquisition code to generalize it 2012-10-21 17:56:57 +02:00
Jordi Boggiano ed9fcc5074 Fix tests 2012-10-19 12:25:53 +02:00
Jordi Boggiano f752b29fc6 Always make sure we are on the right branch 2012-10-17 17:15:49 +02:00
Jordi Boggiano 3068f29b4f Checkout branch by name when the current reference matches the branch tip, fixes #1164 2012-10-17 10:49:54 +02:00
Jordi Boggiano 027037bb9f Fix dist urls for lock files and hardcoded references 2012-09-27 20:23:51 +02:00
Jordi Boggiano 056dc5d690 Move config to all VcsDownloaders, enforce array for github-protocols 2012-09-08 00:45:25 +02:00
Martin Hasoň 3b6bd761ec Set protocols for github in composer config file 2012-09-07 15:08:34 +02:00
Jordi Boggiano 354b82bb8c Fix git checkouts of custom branches, fixes #889 2012-07-15 21:31:29 +02: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 ac3cebc633 Update PEAR Package Extractor to use 'task:replace', 'phprelease' commands and install role='script' files
Add PearInstaller
Change PEAR packages type from 'library' to 'pear-library' and dist type from 'pear' to 'file'
Remove PearDownloader
Refactor Channel Installer
2012-07-03 19:18:58 +11:00
Jordi Boggiano 66e9dcddf4 CS fixes 2012-06-23 11:58:18 +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
Jordi Boggiano 73a865bf2a Fix tests 2012-06-20 12:05:18 +02:00
Jordi Boggiano 4bbb168d44 Remove BC code 2012-06-19 23:06:40 +02:00
Alexey Prilipko a88265a497 Update PearPackageExtractor for package.xml 2.1 support 2012-06-15 12:30:08 +11:00
Grégoire Pineau f4e9dd4fb8 Fixed PSR rules 2012-06-14 12:10:01 +02: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
Martin Hasoň c8d110aa72 Imporoved exception message for GitDownloader (various protocols for github) 2012-05-18 14:41:57 +02:00
Jordi Boggiano a9fe883827 Use https fallback for github private repos if ssh protocol fails and we can ask the user's password 2012-05-06 17:19:30 +02:00
Jordi Boggiano ed8aa8322a Do not prevent updates if untracked files are present 2012-04-27 11:23:34 +02:00
Jordi Boggiano 0e9f88a3da Fix DownloadManagerTest creating directories on disk 2012-04-27 11:21:58 +02:00
Jordi Boggiano 5ceae7fb1f Fix tests 2012-04-18 18:46:26 +02:00
Jordi Boggiano 047fa0b553 Add a composer remote that is used by composer so it does not take over the origin one anymore 2012-04-17 20:02:19 +02:00
Jordi Boggiano 6f8031ac90 Fix error reporting for missing git process 2012-04-06 13:28:47 +02:00
Jordi Boggiano 6aaa523c0d Fix tests 2012-04-05 23:03:02 +02:00
Jordi Boggiano a3fa19a716 Avoid escaping too early to prevent issues 2012-04-04 17:13:57 +02:00
Jordi Boggiano 13a2bc6ff0 Revert "Fix push url hack"
This reverts commit 269537e466.
2012-04-04 17:11:10 +02:00
Jordi Boggiano 269537e466 Fix push url hack 2012-04-04 16:57:18 +02:00
Jordi Boggiano 1cdae66f8f Fix up git downloader and git driver commands 2012-04-04 09:09:27 +02:00
Jordi Boggiano afa14124f3 Make sure we fetch origin with tags before checking out a new version 2012-04-03 19:50:25 +02:00
Jordi Boggiano beb4cbcd2b Add test for ZipDownloader 2012-03-29 15:34:57 +02:00
Jordi Boggiano b9f770177b Fix tests 2012-03-26 13:25:45 +02:00
Jordi Boggiano 7cb79bb1c9 Fix typo & tests 2012-03-26 01:56:24 +02:00
Nils Adermann 15e764bb3f Merge pull request #439 from Seldaek/git_push
Set push url correctly for github clones
2012-03-16 03:24:14 -07:00
Jordi Boggiano a02940cafb Fix tests 2012-03-15 01:28:10 +01:00
Jordi Boggiano e763af7412 Set push url correctly for github clones 2012-03-11 21:01:41 +01:00
Jordi Boggiano 8bd0814b67 Merge pull request #420 from digitalkaoz/composer_tests
added some trivial tests
2012-03-11 09:01:12 -07:00
Jordi Boggiano 5696b44a4f Fix tests 2012-03-11 15:56:47 +01:00
digitalkaoz a284eb5cfe coding style fixes 2012-03-10 09:53:03 +01:00
digitalkaoz 8dad8d8c43 added some trivial tests 2012-03-09 19:30:37 +01:00
Jordi Boggiano ada9c20db1 Update Git/Hg downloaders tests, making sure they never use a live filesystem instance 2012-03-08 00:11:52 +01:00
Martin Hasoň f026e2a0eb Added tests for FileDownloader and ArchiveDownloader 2012-02-28 11:59:18 +01:00
Frank Kleine 025f6066ff fix file permissions 2012-02-21 00:40:43 +01:00
mikey179 0e5a4e07ba add tests to make sure a runtime exception is thrown if return code from git command line call is not 0 2012-02-21 00:12:39 +01:00
mikey179 895d901bf9 better error handling when git command runs into a failure, fixes #340 2012-02-21 00:02:34 +01:00
Jordi Boggiano 230e145053 Fix downloader tests on windows and mock Filesystem properly 2012-02-18 17:00:07 +01:00
Nils Adermann 7609f27052 Merge branch 'add-tests' of https://github.com/l3l0/composer into new-master
* 'add-tests' of https://github.com/l3l0/composer:
  Made fixes after review.
  Made changes which fied warnings and errors in tests.
  Fixed tests after update and merge of changes from upstream/master
  Fixed code. Changes improved code testability
  Added and extended some unit tests
2012-02-18 13:08:20 +01:00
Jordi Boggiano 5da021ffa7 Moved Filesystem to base Util namespace 2012-02-09 18:45:28 +01:00
Leszek Prabucki 19878c2dc1 Fixed tests after update and merge of changes from upstream/master 2012-01-24 18:44:55 +01:00
Leszek Prabucki de7f666118 Added and extended some unit tests 2012-01-24 18:44:54 +01:00
Jordi Boggiano 680db4d1da Fix bug with drive names of different cases 2011-12-18 21:10:10 +01:00
Jordi Boggiano 927be089ba Added more tests for Filesystem util and some fixes 2011-12-04 22:40:30 +01:00
Jordi Boggiano 4517a2e51e Added tests and fixed some incorrect behaviors in Filesystem 2011-12-04 18:35:45 +01:00
Jordi Boggiano 7e3f8099b1 Add proxy files for windows instead of copying, removed PEAR-style substitution 2011-12-03 20:44:00 +01:00
Jordi Boggiano 6b6d6b6d82 Add --dev flag to InstallCommand to do source installs, fixes #26 2011-10-30 20:59:41 +01:00
everzet 195272da09 refactored DownloaderInterface to be mono-installation-type 2011-09-29 04:11:51 +03:00
Jordi Boggiano 00a4fe2a14 Refactor downloaders, git installs actually work well now 2011-09-29 00:48:52 +02:00
Jordi Boggiano b9114e16be Fix typos, short var names etc 2011-09-25 23:20:31 +02:00
everzet 50aa7ac607 Provide $useSource argument to the DownloaderInterface methods 2011-09-25 18:56:05 +03:00
everzet 17d1abcec0 Refactored DownloadManager 2011-09-25 18:30:54 +03:00
everzet cde9531e4d DownloadManager implemented 2011-09-24 02:09:51 +03:00