1
0
Fork 0
Commit Graph

552 Commits (30e8845b1ecb2c78838cfa31dbc8b8249b58e6cd)

Author SHA1 Message Date
Jordi Boggiano a63f8d511e Avoid chmod on windows 2016-02-25 15:36:50 +00:00
Jordi Boggiano 2c67fb67f2 Rename variable and remove useless comment 2016-02-25 14:04:29 +00:00
Jordi Boggiano b945fc4d83 Add unzip support on windows and fail earlier if unzipping is impossible, fixes #4943 2016-02-25 13:09:15 +00:00
Jordi Boggiano 4df7ade801 Merge remote-tracking branch 'burci/feature/path_downloader_option_to_force_copy' 2016-02-25 11:42:47 +00:00
Rob Bast a245c4618b php-cs-fixer 2016-02-25 11:04:44 +01:00
Peter Buri 861b2bc8e8 Introduce option to force copy instead of symlinking in PathDownloader 2016-02-22 13:41:28 +01:00
Magnus Nordlander 4689d836fe Fixed (and added a test for) a regression introduced in a77e2fb, which causes package Git package updates to fail when the package has two or more URLs and the last URL is the only one that actually works. 2016-02-17 17:42:48 +01:00
Jordi Boggiano d6d0435c54 Merge pull request #4845 from curry684/pull-4690
Implement junctioning on Windows for path repositories
2016-02-14 19:51:23 +00:00
Jordi Boggiano 8db550b118 Merge pull request #4851 from curry684/pull-4431
Fixes in path repository handling of removed or nested sources
2016-02-14 19:16:16 +00:00
Jordi Boggiano 02952c3bdc Add missing </error> tag, refs #4878 2016-02-13 17:48:31 +00:00
Jordi Boggiano d347e1efca Minor tweaks refs #4878 2016-02-13 17:44:01 +00:00
Jordi Boggiano e4ede0c582 Merge remote-tracking branch 'bozerkins/force-to-reinstall-package-when-missing-vcs-metadata' 2016-02-13 16:55:44 +00:00
Jordi Boggiano 8808638ea9 Make sure cache clearing works easily in all cases 2016-02-10 15:36:42 +00:00
Jordi Boggiano 2378c9e308 Remove dead code 2016-02-10 15:10:32 +00:00
Jordi Boggiano 477da3a448 Fix clearCache in case of download failure 2016-02-10 15:06:22 +00:00
Jordi Boggiano 502c5431a2 Add hashing of the complete URL for cache entries of dist downloads for extra safety 2016-02-10 14:51:23 +00:00
Niels Keurentjes 80bf5b75fc Merge branch 'master' of https://github.com/composer/composer into pull-4431 2016-02-07 14:44:36 +01:00
Niels Keurentjes 54c079b559 Fixed Windows detection based on #4873 and suppressed some console output in removeJunction. 2016-02-05 11:27:41 +01:00
Niels Keurentjes 582e4796a3 Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-05 11:24:30 +01:00
bogdan e0fad1f55b Implemented interactive user confirmation on source package update failure
Removed unnecessary options for installation
Removed unnecessary exception
2016-02-04 23:01:21 +02:00
Jordi Boggiano 16215c1937 Merge pull request #4877 from cs278/zip-zlib-muddle
zlib suggest and fallback on non Windows
2016-02-04 11:15:49 +00:00
bogdan 581ce91f90 Implemented new option (ignore-missing-metadata) for composer install command
The command allows to slightly change how repository updates are handled during install

In the previous version composer failed to updated if .git|.svn|.hg folder was missing from the package
In the current version, with the option enabled, if the update fails for exactly this reason,
it'll try to remove the package completely and install it from remote
2016-02-04 03:16:39 +02:00
bogdan a77e2fb093 Removed code duplication with abstract hasMetadataRepository method
which checks if vcs metadata is present in the package

Fixed a bug with -vvv mode. When .git folder is missing from package
in normal mode, -v mode, -vv mode the program throws the exception about missing .git folder
in -vvv mode an exception about inability to read logs
2016-02-04 03:11:18 +02:00
Chris Smith e4877473cf Fallback to zlib extension to unpack gzip on non Windows systems 2016-02-04 00:49:56 +00:00
Niels Keurentjes 0dab63e050 Unified all Windows tests throughout the code. 2016-02-03 22:39:16 +01:00
Niels Keurentjes 1b1462317c Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-02 22:51:22 +01:00
Niels Keurentjes 05caf8349c Fixed bug potentially causing broken sites and solved #4431 along the way. 2016-01-30 01:13:37 +01:00
Jordi Boggiano 49d7d65933 Add verbosity input support to IOInterface 2016-01-29 10:14:12 +00:00
Niels Keurentjes 5489586436 Fully implemented junctioning on Windows for path repositories. 2016-01-28 00:56:02 +01:00
Jordi Boggiano a13b06725e Add support for if-modified-since on lazy repos and turning packagist into a lazy provider repo 2016-01-18 14:03:10 +00:00
Jordi Boggiano c1cc6bfecf Avoid doing too many loads of the remotefilesystem 2016-01-10 20:06:10 +00:00
Jordi Boggiano 86a911150b Update bundled CAfile and other cleanups 2016-01-10 16:54:44 +00:00
Jordi Boggiano 5d015defb8 Merge remote-tracking branch 'origin/master' into tls-config 2016-01-10 16:10:22 +00:00
Jordi Boggiano 5dbc8fa30b Make sure getRepoConfig is only called on VcsRepos, refs #4700 2016-01-09 18:01:48 +00:00
Jordi Boggiano f874842535 Merge remote-tracking branch 'chorry/4331-svn-creds' 2016-01-09 17:59:54 +00:00
Jordi Boggiano 47b05eab7a Fix type errors 2016-01-09 17:59:22 +00:00
Jordi Boggiano 29312be4df Strict typing fixes 2015-12-16 17:48:12 +00:00
Alexander Loutsenko f42ba46175 #4331 use --no-auth-cache for svn downloader when such option was set 2015-12-14 15:23:15 +03:00
Jordi Boggiano 966a982738 CS fixes 2015-11-21 19:28:10 +00:00
Jordi Boggiano 67a1924173 Merge remote-tracking branch 'Rudloff/xz' 2015-11-21 19:16:59 +00:00
Jordi Boggiano 690c7f572f Enable -f flag based on user selection and not only config values, refs #3789 2015-11-18 16:23:41 +00:00
Steve Buzonas 27d51642c8 stash untracked and force checkout if discarding changes 2015-11-18 16:23:40 +00:00
Jordi Boggiano d35fc31f62 Add process error to the output of failed unzipping 2015-11-10 13:29:51 +00:00
Pierre Rudloff 3abad250e9 .tar.xz downloader 2015-10-31 18:18:11 +01:00
xelan 32517d90d2 Escape angle brackets for commit message output 2015-10-29 09:01:28 +01:00
Jordi Boggiano ce08582671 Fix CS 2015-09-28 10:53:24 +01:00
Samuel ROZE f6d5d65bcd Use shortest relative paths for symlinks 2015-09-16 10:06:32 +01:00
Samuel ROZE d0a9550dea Uses `realpath` to fix relative path issues 2015-09-14 15:20:06 +01:00
Samuel ROZE a3f5f60359 Update output to have a coherent one 2015-09-14 10:18:55 +01:00
Samuel ROZE 0e8c5fa62e Store path from composer.json with the `path` repository to ensure lock file to be reused 2015-09-14 10:18:46 +01:00
Jordi Boggiano 89c6a68a76 Updates to path repository and path downloader, refs #4365 2015-09-12 22:28:03 +01:00
James Titcumb d85bad29d6 Warn about unpushed changes
`composer status` now prevents overwriting Git package if changes have not been pushed.
2015-08-30 00:30:16 +02:00
Samuel ROZE ead68d3d49 Create the path repository and downloader 2015-08-18 14:40:48 +01:00
Jordi Boggiano 33badac0a8 Include full error message in debug mode 2015-08-10 00:57:13 +01:00
iamluc d02ab54be1 Add a new option to view local modifications (git diff) 2015-08-09 17:30:32 +02:00
Kunal Mehta f634c6946d Update callers of VersionParser::formatVersion()
Tests were moved to BasePackageTest.
2015-07-02 00:06:56 -07:00
Jordi Boggiano 6a64041055 CS fixes 2015-06-30 15:38:32 +01:00
Andreas Möller eac5fbdee4 Fix: Remove unused imports 2015-06-28 23:20:54 -04:00
Wim Vandersmissen 1ff2a02517 fix to download correct Bitbucket archive reference when using --prefer-dist 2015-06-19 15:07:16 +02:00
Rob Bast b957d1c4a6 load xml as string from local file, fixes #3942
If the entity loader is disabled on a system, loading files, even from
the local file system, is considered as external to the running php
process, and thus not allowed by the libxml extension. Reading the file
contents and loading the xml as a string is a valid alternative however.
2015-06-03 09:52:36 +02:00
Jordi Boggiano 0081964428 Merge remote-tracking branch 'colinodell/fix-tag-ambiguity'
Conflicts:
	src/Composer/Downloader/GitDownloader.php
	tests/Composer/Test/Downloader/GitDownloaderTest.php
2015-05-31 12:52:27 +01:00
Possum 2e99b9fdf5 Use https where possible 2015-05-04 19:37:57 +02:00
Steve Buzonas b44c3bee52 add tests to cover different use cases of package install preferences 2015-04-18 20:59:51 -04:00
Steve Buzonas 124739d055 fix preference resolution to be backwards compatible 2015-04-18 18:25:59 -04:00
Jordi Boggiano ec6d727af8 Add comment about --, refs #3853 2015-04-15 02:48:10 +01:00
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
Steve Buzonas bf08b6eb90 add support for package based install type preferences 2015-02-26 11:21:14 -05:00
Rob Bast cb336a5416 Implement writeError throughout Composer 2015-02-25 11:00:35 +01:00
Jordi Boggiano 777f2e81a3 Show more info when a download fails 2015-01-31 21:24:48 +00: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 fb1747624c Force the origin remote url to be the original one and not that of a mirror 2014-10-20 19:50:22 +01:00
Jordi Boggiano 3e1d0681d1 Merge pull request #3334 from NAYZO/master
minor fixes in DownloadManager.php
2014-10-17 19:01:20 +01:00
Jordi Boggiano 94926218e8 CS fixes 2014-10-17 18:57:27 +01:00
Jordi Boggiano 332a933e8b Remove fallback on missing commit, fixes #3314, fixes #3147 2014-10-17 16:33:00 +01:00
Jordi Boggiano b7bd165fed Merge pull request #3122 from garthkerr/patch-1
Add blank line to output for FileDownloader.
2014-10-14 18:21:22 +01:00
Ala Eddine Khefifi 7cea912d30 minor fixes in DownloadManager.php
We should use "===" instead of "==" since it's better and faster in this case.
2014-10-08 11:25:00 +01:00
Chris Harvey 43b9ef309e Adding missing closing <info> tag when re-applying stashed changes 2014-09-25 18:39:50 +01:00
Jordi Boggiano 4e774e8b2c Fix formatting 2014-09-24 19:17:54 +01:00
frederik d1d40502bf ProcessExecutor::escape 2014-09-24 18:30:12 +02:00
frederik 7ae1430689 #3297 ProcessUtil class using ProcessUtil of Symfony Console 2014-09-24 17:18:15 +02:00
Frederik Bosch 4c58abbb76 Update GitDownloader.php 2014-09-24 15:27:31 +02:00
Frederik Bosch 6edabc629d Update GitDownloader.php
PHP 5.3. compat.
2014-09-24 15:24:28 +02:00
Frederik Bosch f3b0890cf4 GitDownloader.php: better escaping for Windows
Compability for Windows usernames and passwords. When usernames and passwords contain characters that are rawurlencoded to a string containing a % sign (e.g. @ becomes %40), the procent was replaced with a space. Git can there not authenticate.
2014-09-24 15:16:30 +02:00
Jordi Boggiano 0ce0cf42e8 Merge remote-tracking branch 'francoispluchino/fix-phpdoc'
Conflicts:
	src/Composer/EventDispatcher/EventDispatcher.php
2014-07-23 19:19:39 +02:00
Jordi Boggiano 1110074d5f Clean up properly after creating the vendor dir 2014-07-23 19:02:01 +02:00
François Pluchino 8b5c00bff0 Fix phpdoc 2014-07-16 15:17:38 +02:00
Garth Kerr dc90397d1e Add blank line to output for FileDownloader.
The VcsDownloader outputs a blank line between each dependency:

745dcbce33/src/Composer/Downloader/VcsDownloader.php (L80)

This write makes output consistent.
2014-07-12 15:05:06 -04:00
Jordi Boggiano 745dcbce33 Fix file deletions to always use a delayed retry on windows, fixes #3074 2014-06-29 18:49:45 +02:00
Jordi Boggiano ac497feaba CS fixes 2014-06-10 16:13:12 +02:00
Jordi Boggiano e890d1bc59 Remove use of glob, fixes #3042 2014-06-09 13:12:42 +02:00
Jordi Boggiano 89ec322929 Merge remote-tracking branch 'benja-M-1/feature/svn-auth-from-auth-json' 2014-06-05 11:08:19 +02:00
Jordi Boggiano 71397f82e4 Remove forced dir removal before install, fixes #3035 2014-06-04 14:20:36 +02:00
Jordi Boggiano f16e3a88e2 Clean up code format and error message 2014-06-03 10:46:14 +02:00
Jordi Boggiano 5336b039c1 Merge remote-tracking branch 'discordier/fix-zip-downloader' 2014-06-03 10:35:06 +02:00
Jordi Boggiano 170f395004 Merge pull request #2949 from jakoch/patch-3
renamed listFiles() to getFolderContent(). fixed comment: the method doe...
2014-06-01 15:43:10 +02:00
Jordi Boggiano 56c5af8dc4 realpathGlob tweaks, refs #2932 2014-06-01 15:15:20 +02:00
Richard Quadling 443858dae7 Force all glob results to be realpath'd. 2014-06-01 15:12:33 +02:00
Jordi Boggiano effacc1185 Do not realpath relative local URLs, fixes #2916 2014-05-31 21:36:09 +02:00