1
0
Fork 0
Commit Graph

2287 Commits (4d6910ece6b889245caef4a34f57c9f1a46dda5e)

Author SHA1 Message Date
Jordi Boggiano 2b385cbe58 Fix dependency flags not applying to provides/replaces, fixes #1771 2013-04-04 17:41:01 +02:00
Jordi Boggiano 605cd3ddc3 Rename diag to diagnose, fix feedback 2013-04-04 15:46:08 +02:00
Šarūnas Dubinskas 29b43ca082 Moving svn driver to the last position as it causes conflicts with hg over http 2013-04-04 09:15:36 +03:00
Jordi Boggiano 1060d015fb Add composer diag command to diagnose problems automatically 2013-04-04 00:43:08 +02:00
Jordi Boggiano 02f6a32d08 Fix undef var issue when removing a json config key 2013-04-04 00:42:00 +02:00
Serge Smertin 6cec5b0399 Added notice about need of zip extension 2013-04-04 00:00:02 +02:00
Serge Smertin 07920c48a6 Removed dev-master as default version for versionless artifact 2013-04-03 23:49:32 +02:00
Jordi Boggiano f744ec16f5 Fix normalization of relative paths going up a few dirs, fixes #1759 2013-04-03 19:30:36 +02:00
Nils Adermann 57c34033ff Merge pull request #1754 from njam/issue-1754
Fix file pattern start matching if no slash
2013-04-03 05:45:50 -07:00
Jordi Boggiano b0297ef67a Add prefer-stable flag to pick stable package over unstable ones when possible 2013-04-02 18:40:42 +02:00
Jordi Boggiano fc54a48b52 Fix archiver tests on windows 2013-04-02 11:32:11 +02:00
Jordi Boggiano 6401b6aa46 Fix handling of protocol paths like phar:// 2013-04-02 11:31:43 +02:00
Jordi Boggiano 59c4df5ba3 Merge remote-tracking branch 'hason/autoload' 2013-04-02 10:41:08 +02:00
Jordi Boggiano 83ea90296e Add COMPOSER_NO_INTERACTION env var to allow travis & others to easily make sure every composer run is non-interactive 2013-04-02 10:34:49 +02:00
Reto Kaiser 6f72e9570c Add a / to the beginning of a file matchin pattern if no / in rule.
See https://www.kernel.org/pub/software/scm/git/docs/gitignore.html
2013-04-01 23:04:00 +02:00
Jordi Boggiano 83084eedf9 Skip update whitelist warning for "nothing" and "lock" 2013-04-01 12:18:27 +02:00
Martin Hasoň 48444a028c Added support for vendor dir excluded from working dir 2013-04-01 09:27:50 +02:00
Martin Hasoň 0851ef1afb Fixed behaviour of Filesystem::findShortestPath[Code] for paths with up-level references 2013-04-01 08:30:11 +02:00
Serge Smertin b5e1457470 set version to dev-master to artifacts without version 2013-03-31 21:44:48 +02:00
Serge Smertin f25bfe09c5 added support for nested location of composer.json files within artifacts 2013-03-31 21:08:11 +02:00
Serge Smertin 586911f7a1 added verbose logging for artifact directory scan 2013-03-31 21:08:11 +02:00
Serge Smertin 0aad11801e added logging for wrong files 2013-03-31 21:08:10 +02:00
Serge Smertin 4b176f11f2 added artifact repository initial functionality 2013-03-31 21:08:10 +02:00
Jordi Boggiano e1eb35455f Merge pull request #1743 from sandermarechal/abs-path
Fix shortest absolute paths from cwd to classmap path
2013-03-31 05:18:56 -07:00
Sander Marechal 132f2a9d5d Cache getcwd() result 2013-03-31 13:23:51 +02:00
Sander Marechal c10e25a945 Use cross-platform absolute path check 2013-03-31 13:20:01 +02:00
Jordi Boggiano 6c9bc2824e Fix handling of branches with slashes, fixes #1748 2013-03-31 12:36:09 +02:00
Jordi Boggiano bb95a0a788 Fix docblocks 2013-03-30 19:49:59 +01:00
Sander Marechal d7697574ff Fix shortest absolute paths from cwd to classmap path 2013-03-29 17:09:39 +01:00
Jordi Boggiano f5fececf53 Merge branch 'deprecatedlock' 2013-03-28 20:15:22 +01:00
Jordi Boggiano ad69d15590 Fix self-update error handling, fixes #1738 2013-03-28 14:32:15 +01:00
Nils Adermann 8803281648 Make sure Phar overwrites files and doesn't load them 2013-03-28 13:33:43 +01:00
Nils Adermann 22044121ce Callbacks must be accessible publically on PHP 5.3 2013-03-28 12:49:53 +01:00
Nils Adermann cfd7a50f0a Do not hardcode vendor dir exclusion on archive.
For one thing this wouldn't have worked for any custom installers anyway
which can write installed code to other places. This will now allow one
to use composer archive on a clean code checkout to build an archive as
we are used to. Or on one that had composer install run to build an
archive that can be used for deployment which includes the vendors.
2013-03-28 12:49:53 +01:00
Nils Adermann 870a87f6d6 Use null as default values rather than false
Also made archive() in the ArchiveCommand protected as it does not need
to be used from the outside. The ArchiveManager can be used instead.
2013-03-28 12:49:53 +01:00
Nils Adermann 14ee67bed4 Output packages in archive command using getPrettyString 2013-03-28 12:49:53 +01:00
Nils Adermann 43be72acb4 Follow PSR-2 for method modifier ordering 2013-03-28 12:49:53 +01:00
Nils Adermann 1af2be9d6d Rename ExcludeFilterBase to BaseExcludeFilter 2013-03-28 12:49:53 +01:00
Nils Adermann ecf4f42885 Use a FilterIterator rather than a modified IteratorIterator, simpler 2013-03-28 12:49:53 +01:00
Nils Adermann 75d1759e77 Replace DIRECTORY_SEPARATOR in paths, not PATH_SEPARATOR 2013-03-28 12:49:53 +01:00
Nils Adermann 6066359944 Skip directories in zip generation, empty dirs won't get archived
This seems ok as we currently rely on git generating archives which does
not archive empty directories either.
2013-03-28 12:49:53 +01:00
Nils Adermann deae50392f Respect gitignore, gitattributes and hgignore files in archiving 2013-03-28 12:49:53 +01:00
Nils Adermann 64941b0a64 Make overwriting files an ArchiveManager option, use sourceRef in names 2013-03-28 12:49:53 +01:00
Nils Adermann 6ee08a2046 Remove unecessary unlink before writing archive 2013-03-28 12:49:53 +01:00
Nils Adermann 074af5dc54 Remove unnecessary dist type information from archive files 2013-03-28 12:49:53 +01:00
Nils Adermann 935f7271f8 The ArchiveManager should return the written path for library usage 2013-03-28 12:49:53 +01:00
Nils Adermann 48dd55b759 Generate a properly unique archive filename for dev revisions 2013-03-28 12:49:53 +01:00
Nils Adermann 838edd6e7a Fix class description of archive command 2013-03-28 12:49:53 +01:00
Nils Adermann 285603359c Add a missing array typehint 2013-03-28 12:49:52 +01:00
Nils Adermann 51135468f0 Clarify composer archive argument optionality 2013-03-28 12:49:52 +01:00
Nils Adermann 735b59c1d6 Skip the vendor dir when archiving the current project 2013-03-28 12:49:52 +01:00
Nils Adermann ba375b6867 Allow archiving the current project with composer archive 2013-03-28 12:49:52 +01:00
Nils Adermann afcdad4b23 Define an option to exclude files in the archive command 2013-03-28 12:49:52 +01:00
Nils Adermann 3e26502561 Remove Mercurial and Git Archivers as they cannot implement exclude rules 2013-03-28 12:49:52 +01:00
Nils Adermann 526f48ecb8 Implement a basic archive command
It allows creating archives with the archive manager given a package/version
pair.
2013-03-28 12:49:52 +01:00
Nils Adermann 33828b38df Use a saner file name for package archives 2013-03-28 12:49:52 +01:00
Nils Adermann bcbc50c0d6 Git can handle commit references in git archive just fine so use them 2013-03-28 12:49:52 +01:00
Nils Adermann ba51027680 Reorder ArchiveManager parameters to make the download manager optional 2013-03-28 12:49:52 +01:00
Matthieu Moquet 9d24e17003 Fix workflow & typos 2013-03-28 12:49:52 +01:00
Matthieu Moquet c248115e04 Fix how download manager is constructed
This fixes tests due to upstream changes.
The createDownloadManager in the Factory now takes the config as extra
parameter.
2013-03-28 12:49:52 +01:00
Matthieu Moquet 60b1cc7d24 Create ArchiveManager with the Factory 2013-03-28 12:49:52 +01:00
Matthieu Moquet d1d77dd13d Fixed several typos
- break at first archiver supports
- use standard directory separator
- change exception message
- remove the BaseArchiver since tar & zip archivers have been merged
- plus coding style
2013-03-28 12:49:52 +01:00
Matthieu Moquet a733d76b33 Merged zip & tar archivers 2013-03-28 12:49:52 +01:00
Matthieu Moquet b21bb1dcc5 Checks support before downloading the package 2013-03-28 12:49:52 +01:00
Matthieu Moquet bfd2275cb0 Update interface to merge vcs with basic archivers 2013-03-28 12:49:52 +01:00
Matthieu Moquet 3b22791059 Checks process execution 2013-03-28 12:49:52 +01:00
Matthieu Moquet 20e717f975 Refactored the archiver package 2013-03-28 12:49:52 +01:00
Matthieu Moquet 3d0ce85db2 Moved archive Dumpers into its own Archiver package 2013-03-28 12:49:52 +01:00
Till Klampaeckel 2acb033057 Initial feature-dist
* extends BaseDumper, implements interface
 * put $keys into BaseDumper

 * WIP WIP WIP WIP
 * BaseDumper for utilities
 * interface to enforce 'dump()'
 * feature:
   * supports git
   * supports zip output
   * basic test to cover feature

 * add @todo for later
 * add vendor namespace to package name

 * add extension to getFilename() so we don't need to switch in there (HT, @naderman)

 * add extension (obviously 'zip' in ZipDumper)

 * create archive in destination dir (provided by __construct())

 * condensed ZipDumper
 * moved code to BaseDumper (hopefully easier re-use)

 * use ProcessExecutor from BaseDumper

 * fix assignments in __construct()
 * allow injection of ProcessExecutor

 * fix parameters

 * fix regex

 * write in 'system temp dir'
 * update test case (oh look, a duplicate regex)

 * move working directory related to BaseDumper

 * add quotes

 * place holder for these methods

 * use PharData to create zip/tar when necessary

 * add placeholder calls
 * add call to package() using PharData

 * finish downloadHg(), downloadSvn()

 * put to use

 * make BaseDumper abstract (to force extension)
 * make BaseDumper implement Interface (makes for less code in the implementation)

new functionality for dumping as .tar.gz

tar instead of tar.gz, new abstract dumpertest class

creates a local git repo instead of fetching a remote one

more oo-ish version of it

no constructor

 * refactor tests to be less linux-specific (used Composer\Util to wrap calls)

 * make filename only the version

 * various cs fixes (idention, tabs/spaces, doc blocks, etc.)
 * fixed a typo'd exception name

 * refactored downloading:
   * removed download*() methods
   * added dep on Composer\Factory to setup a DownloadManager instance

 * update CS with feedback from @stof

 * ArrayDumper doesn't extend BaseDumper anymore (hence no conflict on the interface)
 * move keys from BaseDumper back to ArrayDumper
 * interface now declares dump() to always return void

Apparently I had to update the lock.

CS fixes (tabs for spaces)
Bugfix: sprintf() was missing.

Fix docblock for @stof. ;)

Pull in lock from master.

Update lock one more time (hope it still merges).

whitespace

Revert ArrayDumper static keys
2013-03-28 12:49:52 +01:00
Jordi Boggiano 3cc5698e7b Allow PHP 5.2 autoloaders to consume namespace, classmap and include path files, fixes #1730 2013-03-27 18:45:33 +01:00
Jordi Boggiano 842155d69e Use original URL for exceptions, not the one containing authorization, fixes #1722 2013-03-23 19:43:08 +01:00
Jordi Boggiano a0a9536d90 Avoid failing if COMPOSER env var is empty, refs #1720 2013-03-21 16:00:45 +01:00
Jordi Boggiano 10a7008fdf Trim query string from extension when downloading archives 2013-03-21 15:30:00 +01:00
Jordi Boggiano 61efd2998c Clear stat cache after calling filesystem commands 2013-03-21 15:21:54 +01:00
Stephan Hochdörfer df897b42c2 Removed dead statement. 2013-03-20 08:44:36 +01:00
Jordi Boggiano 7e4ca7638c Remove support for deprecated lock format 2013-03-17 19:50:56 +01:00
Jordi Boggiano d929a0813a Prepend the ClassLoader autoloader to avoid calling other previously registered autoloaders, fixes #1699 2013-03-16 16:14:55 +01:00
Jordi Boggiano 979db8539d Do not chdir unless necessary 2013-03-15 15:21:22 +01:00
Jordi Boggiano 57fe33d0f3 Make sure the directory is empty even if weird inputs are given, fixes #1683 2013-03-11 14:02:49 +01:00
Jordi Boggiano c13d6301f9 Merge pull request #1681 from beberlei/GH-1591#2
[GH-1591] More fixing of Installation on Windows Azure. Renaming between...
2013-03-11 02:21:10 -07:00
Jordi Boggiano 0d06eb1f9a Avoid overwriting existing windows .bat proxies if they were provided by the package 2013-03-11 10:13:45 +01:00
Jordi Boggiano d81740ab7d Fix authorization/authentication merge, fixes #1684 2013-03-11 10:04:45 +01:00
Benjamin Eberlei 882ce1b39f [GH-1591] More fixing of Installation on Windows Azure. Renaming between different partitions + xcopy fail, so we need to copyAndRemove() manually. 2013-03-10 20:17:00 +01:00
Jordi Boggiano ee60df708d Handle stability changes correctly, fixes #877
On update, packages that are less stable than the minimum-stability allows will
now be downgraded to their correct versions, even if they were installed as
unstable already.
2013-03-10 19:55:26 +01:00
Jordi Boggiano c9f0e458a2 Merge remote-tracking branch 'machee/gitUserPassNonGithub'
Conflicts:
	src/Composer/Downloader/GitDownloader.php
2013-03-10 14:47:36 +01:00
Jordi Boggiano 1071048e52 Merge remote-tracking branch 'miklosm/iss1675.2' 2013-03-10 13:59:53 +01:00
Jordi Boggiano c6bdf6ca11 Merge remote-tracking branch 'miklosm/iss1675.1' 2013-03-10 13:59:21 +01:00
Jordi Boggiano 7ae0dd2a2a Always install dev requirements when using the require command, fixes #1676 2013-03-10 13:44:54 +01:00
Jordi Boggiano 41392ace56 Check that a repo has no providers when getPackages is called to catch any mis-use 2013-03-10 13:40:54 +01:00
Jordi Boggiano be861f090a Remove filterPackages and add RepositoryInterface::search, refactor all commands to use new methods and remove all usage of the full package list for Composer repositories that support providers, fixes #1646 2013-03-10 13:40:52 +01:00
Jordi Boggiano 095852933e Remove code duplication, add support for searchUrl 2013-03-10 13:40:50 +01:00
Miklós Márton 661df121d9 Proposed fix for #1675 2013-03-08 16:06:53 +01:00
Miklós Márton 42346ad837 Fix for ordering problem during package removal resulting dangling symlinks, partially fixes #1675 2013-03-08 15:31:00 +01:00
deguif 655dc5f2e8 Fixed CS 2013-03-07 11:42:47 +01:00
thomas-gay 8534ab1dad Fixed potential undefined index in ArrayLoader.php
A source without a reference is invalid.
2013-03-07 09:55:23 +01:00
Jordi Boggiano 87a42c2f01 Fix CS 2013-03-06 23:10:03 +01:00
Jordi Boggiano 95a6be2396 Merge remote-tracking branch 'mnishihan/master' 2013-03-06 23:08:36 +01:00
Jordi Boggiano 60204f9227 Fake a dev lock when a non-dev update is made and there are actually no dev requirements 2013-03-06 22:20:03 +01:00
deguif 834f0b49e5 Improved error messages in ArrayLoader
Added package name to exception message when an error occurred in source or dist keys
2013-03-06 18:08:55 +01:00
Jordi Boggiano b474944155 Add more output to the profiled runs, refs #1659 2013-03-05 15:21:54 +01:00
Stephan Hochdörfer 906563451e Reverted the last changes. Changed logic in callbackGet() method to
respect the 401 handling also if STREAM_NOTIFY_FAILURE fires as on my
local machine the handling of STREAM_NOTIFY_AUTH_REQUIRED never got
executed.
2013-03-05 13:34:48 +01:00
Miklós Márton 72a4146383 Scratch 'prefer-source'; 'preferred-install' is the bee's knees 2013-03-05 12:56:09 +01:00
Stephan Hochdörfer dcdcf57f3f Moved 401 handling from ComposerRepository to RemoteFilesystem and
displaying the url when asking for the credentials.
2013-03-04 22:14:00 +01:00
Miklós Márton 9110c6413e Minor code reorg to reduce duplication 2013-03-04 20:35:29 +01:00
Miklós Márton 0d81ab7f46 Install/update now uses the new config variable 'prefer-source', fixes #553 2013-03-04 20:29:14 +01:00
Miklós Márton 0f8530ef56 Support for 'prefer-source' config setting, refs #553 2013-03-04 20:27:59 +01:00
Stephan Hochdörfer f2afbbac2f Extended the fetchFile() method of the ComposerRepository class to be
able to deal with http basic auth. In case the remote resource responds
with a 401 ask the user for access credentials and retry quering the
resource again.
2013-03-04 12:49:14 -05:00
Jordi Boggiano 0535473c6b Merge pull request #1655 from miklosm/iss1653
Fix for #1653
2013-03-04 08:24:25 -08:00
Jordi Boggiano a32aa1a305 Fix BC handling of old require-dev, refs #1656 2013-03-04 17:11:13 +01:00
Miklós Márton 40c9584746 Fixes #1653 2013-03-04 16:33:53 +01:00
Jordi Boggiano 373ff04261 Fetch only non-dev packages from lock if doing a dev update fails due to a previously incomplete lock file, fixes #1650 2013-03-04 12:30:59 +01:00
Jordi Boggiano 2db6fa1d50 Merge branch 'issue1611' 2013-03-04 09:56:43 +01:00
Jordi Boggiano c95127b80e Merge pull request #1644 from Seldaek/newdevrequires
New require-dev handling
2013-03-04 00:56:12 -08:00
Jordi Boggiano ea7d79ab03 Make sure platform requirements of the root package are enforced when installing from lock, fixes #1611 2013-03-03 20:05:46 +01:00
Jordi Boggiano 06026d6b93 Add @deprecated note 2013-03-03 17:59:13 +01:00
Miklós Márton 67e5e0588d Fixes #1347 (new license argument / dialog for init command) 2013-03-03 07:06:29 +01:00
Jordi Boggiano 73adf29602 Purge old dev packages before installing/updating new ones to make sure people do not have issues updating 2013-03-03 02:04:11 +01:00
Jordi Boggiano 542d10d8fd Remove all occurrences of getLocalDevRepository and getLocalRepositories calls 2013-03-03 01:54:14 +01:00
Jordi Boggiano caf26ac37c Enable dev mode by default in update command, add a --no-dev flag, fixes #1005 2013-03-03 00:42:22 +01:00
Jordi Boggiano 4207fc3b19 Refactor require-dev handling to use one single repository and a one pass solving, fixes #719, fixes #1185, fixes #1330, fixes #789, fixes #640 2013-03-03 00:41:12 +01:00
Jordi Boggiano 357f0572d1 Only print ignoring warning when a package is not installed and not required by the root package, fixes #1642 2013-03-02 20:18:38 +01:00
Jordi Boggiano ab206580f5 Merge remote-tracking branch 'christianjul/master' 2013-03-02 00:05:04 +01:00
Jordi Boggiano 2a23f8c48b Allow create-project to be called in an empty dir that exists, fixes #1135, replaces #1206 2013-03-02 00:01:01 +01:00
Jordi Boggiano f06c0cb580 Code reorgs and make bool values real booleans, refs #1637 2013-03-01 23:47:24 +01:00
Jordi Boggiano 8eb71f5478 Merge remote-tracking branch 'ricardclau/dirty-updates' 2013-03-01 23:35:37 +01:00
Christian Jul Jensen b04dbf5d71 Outout message when trying to update non-installed packages 2013-03-01 14:39:33 +01:00
Ricard Clau 2a2bb6aad6 remove unnecessary else 2013-03-01 10:22:12 +01:00
Ricard Clau 56f4625ec8 check first if there are changes 2013-02-28 19:44:29 +01:00
Ricard Clau 48ac383599 initial steps with new config value, implementation of discard changes for git and svn 2013-02-28 19:02:19 +01:00
Daniel González ed590de8dd typo
I see, that exist a typo error.
2013-02-28 16:56:26 +01:00
Jordi Boggiano c29f3c698e Fix support of aliases combined with reference locked packages, fixes #1631 2013-02-28 10:51:21 +01:00
Jordi Boggiano e3f06582e4 Clean up archive downloader, fixes #1630 2013-02-27 19:15:40 +01:00
Jordi Boggiano 1c468e7c02 Fix cs 2013-02-27 17:35:53 +01:00
Markus Tacker 821f57f443 A bug in PHP prevents the headers from correctly beeing sent when a content-type header is present and
NOT at the end of the array

https://bugs.php.net/bug.php?id=61548

This updates fixes the array by moving the content-type header to the end
2013-02-27 17:07:13 +01:00
Jordi Boggiano 9f961dca92 Guard against arrays being passed to is_file, fixes #1627 2013-02-27 15:45:04 +01:00
Jordi Boggiano 259a25344d Use the api to get file contents instead of raw.github.com
raw.github does not like the access_token query param
2013-02-27 14:10:28 +01:00
Jordi Boggiano 5454645cf3 Merge pull request #1625 from jappie/master
Fixed the "access_token query param" (5b1f314) fix
2013-02-27 04:36:27 -08:00
Jordi Boggiano 573b7a0fb7 Only downgrade providers but not the notification url 2013-02-27 13:32:21 +01:00
Jordi Boggiano 88ae6c023b Extract archives into temp dir to shorten paths and avoid issues on windows, fixes #1591 2013-02-27 13:31:55 +01:00
Jasper N. Brouwer 4347cb7a55 Fixed the "access_token query param" (5b1f314) fix 2013-02-27 13:23:59 +01:00
Jordi Boggiano f69418427f Add lib-ICU platform package 2013-02-27 13:11:35 +01:00
Jordi Boggiano 5b1f3145c2 Update the way github authorization is handled, fixes #1632
Since api.github.com redirects to s3 for downloads and s3 does not like Authorization
headers, we have to rely on the access_token query param. Otherwise php follows redirects
but still sends the Authorization header to all following requests.
2013-02-27 12:34:18 +01:00
Jordi Boggiano 15e9c3d101 Show proper error message when a git bitbucket repo is loaded as hg repo, refs composer/packagist#294 2013-02-27 10:54:19 +01:00
Shane Auckland a783727227 adding use statement 2013-02-25 15:55:37 +00:00
Shane Auckland 0ba335730e Specific schema validation failure messages (fixes issue #1616) 2013-02-25 15:34:31 +00:00
Shane Auckland 914a4b32e4 removing incorrect optimization 2013-02-25 09:15:25 +00:00
Shane Auckland c6c521bfae optimizing loops 2013-02-25 08:55:26 +00:00
Jordi Boggiano e43d0b5a5b Allow for "proprietary" as license identifier 2013-02-24 18:33:06 +01:00
Jordi Boggiano 8d55b9cced Merge remote-tracking branch 'ronnylt/script-event-post-dump-autoload'
Conflicts:
	tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
2013-02-22 18:42:29 +01:00
Jordi Boggiano cee34b4faa Add the include_paths.php autoload file to the phar when it is present 2013-02-21 18:53:39 +01:00