1
0
Fork 0
Commit Graph

1495 Commits (5d742fd38b93465cb2bc296c19c93ab7329a911a)

Author SHA1 Message Date
Niels Keurentjes 49524bc4ba Centralize secure-http checking 2016-03-28 22:01:32 +02:00
Jordi Boggiano 5f9d4a81a0 Merge remote-tracking branch 'curry684/moar-logging' 2016-03-26 08:49:14 +00:00
Jordi Boggiano 6527bb4166 Merge pull request #5100 from helhum/master
Extract binary installation and removal to own class
2016-03-26 09:39:51 +01:00
Niels Keurentjes 8e78ce9a43 Add extra logging before and after SAT solving 2016-03-24 23:19:40 +01:00
Jordi Boggiano edebbef98a Add test and fix for very large repos, moar possessive quantifiers, fixes #5104 2016-03-24 16:04:52 +00:00
Helmut Hummel b1ec99faed Extract binary installation and removal to own class
The functionality to install binaries might be useful
for other installers.
Create API for that by extracting this functionality from
the LibraryInstaller class.
2016-03-23 21:39:58 +01:00
Paul Wenke 9059d70ba0 Corrected username / access token parameters for $this->io->setAuthentication when read from git config. Grant type is now only set when requesting an access token. Removed bitbucket-domains and bitbucket-protocols from config. Fixed bitbucket typo in JsonConfigSource. Removed unecessary comments. Changed visibility of Composer/Util/Bitbucket properties to private. Added https to bitbucket url. Removed unused $note variable. 2016-03-20 15:56:58 -04:00
Jordi Boggiano 55b0ed8c8b Change installs into updates if there is no lock file, simplify some code, fixes #5034 2016-03-15 14:05:07 +00:00
Rob Bast dfdcfab822 simplified existing test, added a new test 2016-03-15 11:11:18 +01:00
Paul.Wenke b4d9d0fd0d Added BitbucketTest class. Added is_array and is_object check to http content before calling http_build_query. 2016-03-13 21:33:13 -04:00
Haralan Dobrev cc389d6c1a List project suggestions in create-project command
Resolves https://github.com/composer/composer/issues/2752
2016-03-05 14:22:12 +02:00
Jordi Boggiano 76450cc2a1 Merge pull request #4989 from naderman/t/fix-self-reference-transaction-root
Ignore self references when anlaysing independent root requirements
2016-03-02 13:26:18 +00:00
Jordi Boggiano b93b73e836 Rewrite git unpushed status checks, fixes #4987 2016-03-02 13:00:20 +00:00
Nils Adermann 4af74b54e0 Ignore self references when anlaysing independent root requirements
When creating a transaction we try to identify all requirements that are
not themselves required by any other package. If a package references
itself this should not mark it as being required by another package.
2016-03-02 13:03:26 +01:00
Jordi Boggiano fea99bcb1b Clarify the fetch/push URL selection for github repos and various protocols, fix regression 2016-03-01 13:43:59 +00:00
Jordi Boggiano b080a73840 Fix broken test on windows, fixes #4973 2016-03-01 13:25:39 +00:00
Jordi Boggiano 6f42b9c865 Disable git, svn, http protocols for VCS downloaders, fixes #4968 2016-03-01 13:20:35 +00:00
Jordi Boggiano c29f20964e Damn git 2016-02-29 18:10:46 +00:00
Jordi Boggiano 4b0624a93a Fix regression in create-project 2016-02-29 18:09:56 +00:00
Jordi Boggiano e745b37935 Fix tests 2016-02-29 15:50:04 +00:00
Jordi Boggiano d24ea66892 Merge remote-tracking branch 'fduch/console-select-support' 2016-02-29 15:24:28 +00:00
Jordi Boggiano 0ed5b541a9 Fix CS 2016-02-29 15:05:11 +00:00
Jordi Boggiano 7b404c4717 Add failing test for #3990 2016-02-29 14:45:35 +00:00
Jordi Boggiano f2e2dd8f86 Merge pull request #4972 from curry684/code-quality
Code quality
2016-02-29 14:14:49 +00:00
Niels Keurentjes a409e158b8 Disabled unit test breaking on some platforms. Ref #4973 2016-02-28 01:08:25 +01:00
Niels Keurentjes 3a66d1b9bb Fixed unit test explicitly depending on erroneous method invocation. 2016-02-27 23:42:55 +01:00
Jordi Boggiano 2f638c7d96 Fix test 2016-02-25 21:16:48 +00:00
Jordi Boggiano be4d385942 Fix uncommitted change detection, refs #3633 2016-02-25 20:59:26 +00:00
Jordi Boggiano 9f4f8a9578 Merge remote-tracking branch 'greg0ire/improve-status-for-unpushed-branches' 2016-02-25 19:43:20 +00:00
Jordi Boggiano 06be9b88c2 Merge remote-tracking branch 'slbmeh/feature/gh-2787' 2016-02-25 19:03:36 +00:00
Jordi Boggiano 2dcd76aa43 Fix test suite 2016-02-25 14:24:27 +00:00
Jordi Boggiano bad80878bc Merge remote-tracking branch 'sashman/master' 2016-02-25 13:55:49 +00:00
Jordi Boggiano 406e087a46 Stop running PEAR Repo test suite as it fails and is kinda irrelevant at this point 2016-02-25 13:10:46 +00:00
Rob Bast a245c4618b php-cs-fixer 2016-02-25 11:04:44 +01:00
Rob Bast dc2f201152 add trailing / and updated diagnose command 2016-02-24 20:54:01 +01:00
Rob Bast 4d975c49aa fix mocks 2016-02-24 20:30:10 +01:00
Franz Liedke f47c2c9ed7 Add test case for RepositoryManager::prependRepository method 2016-02-24 00:57:10 +09:00
Sash 582e361a88 Fixing array accessing 2016-02-22 21:47:33 +00:00
Sash f6899e5c38 #4828 Using version guesser to pull out the commit has for git repositories. The return value is now an array with version and commit values. 2016-02-22 21:19:01 +00:00
Jordi Boggiano 8a2d1a2ee2 Make artifact paths in lock file cross-platform, fixes #3832 2016-02-19 16:25:53 +00: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
Rob Bast 4600deac68 fix #4925 2016-02-17 10:06:10 +01:00
Niels Keurentjes aa6b2e5b63 Modernized unit test still depending on age old BC code. 2016-02-15 21:52:42 +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
Remi Collet ae5de98db1 make this test more robust, not relying on result order which may vary 2016-02-12 17:02:19 +01:00
Jordi Boggiano dc695ec78d Fix tests 2016-02-10 14:35:53 +00:00
Niels Keurentjes 017a9af672 Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-07 14:45:15 +01:00
Jordi Boggiano 9a57de574d Merge pull request #4886 from curry684/issue-4885
Ensure exception is thrown when classmaps are requested for corrupted files
2016-02-06 15:53:14 +00:00
Jordi Boggiano 7e17fec3b8 Merge pull request #2585 from jaypea/ziparchiver
added ZipArchiver to actually compress zip files
2016-02-06 15:49:24 +00:00
Niels Keurentjes 0b55a0ca91 Can't use error_clear_last as it was introduced in PHP7. 2016-02-06 02:58:36 +01:00
Rob Bast 5db0f623b0 enable test again 2016-02-05 13:36:53 +01:00
Rob Bast baa84d9be1 adjust test and assertion to be more flexible 2016-02-05 13:34:21 +01:00
Rob Bast baabc612f6 adjust message, skip test
currently we have no way to put dynamic values or wildcards in EXPECT-OUTPUT
2016-02-05 13:21:30 +01:00
Rob Bast 94daeca57b add test and adjust rule error message 2016-02-05 11:59:05 +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
Rob Bast df23153932 fix output 2016-02-04 12:45:55 +01:00
Rob Bast be5719eb53 Merge remote-tracking branch 'upstream/master' into repro-4795
* upstream/master: (98 commits)
  Fallback to zlib extension to unpack gzip on non Windows systems
  Zip extension does not provide zlib support
  Unified all Windows tests throughout the code.
  Added Platform utility and unit test for it.
  Remove warnings for non-writable dirs, refs #3588
  [doc] add -H flag to sudo commands
  use full json content to determine reference, closes #4859
  typos
  Make sure COMPOSER_AUTH is also loaded in Config, refs #4546
  Use proper defaults for IO authentications
  Add verbosity input support to IOInterface
  Update SolverTest.php
  Update broken-deps-do-not-replace.test
  Update SolverProblemsException.php
  Cleaned up check+conversion that was no longer required.
  Cleaner notation for expected exceptions in fixtures.
  Introduced more generic, less invasive way to test for exceptions in fixtures, more in line with how phpunit works.
  Included unit test for circular root dependencies.
  Expanded InstallerTest to support expecting Exceptions by supplying "EXCEPTION" as "--EXPECT--"
  Clarified error message and added braces.
  ...
2016-02-04 12:43:37 +01:00
Niels Keurentjes 0dab63e050 Unified all Windows tests throughout the code. 2016-02-03 22:39:16 +01:00
Niels Keurentjes f2a2b18367 Added Platform utility and unit test for it. 2016-02-03 22:25:43 +01:00
Jordi Boggiano 8771eca527 Merge remote-tracking branch 'curry684/issue-4767' 2016-02-03 17:00:30 +00:00
Niels Keurentjes b71c67239d Made NTFS junction detection more reliable and added unit tests for the junction functions. 2016-02-02 23:44:01 +01:00
Rob Bast 0e584aa980 resolve issue 2016-02-02 10:45:57 +01:00
Jordi Boggiano 49d7d65933 Add verbosity input support to IOInterface 2016-01-29 10:14:12 +00:00
Jefferson Carpenter b7845bb6c0 Update SolverTest.php 2016-01-28 20:13:44 -06:00
Jefferson Carpenter 087b901545 Update broken-deps-do-not-replace.test 2016-01-28 20:12:51 -06:00
Niels Keurentjes 3e06c801f4 Cleaned up check+conversion that was no longer required. 2016-01-27 13:49:52 +01:00
Niels Keurentjes 523362c7c5 Cleaner notation for expected exceptions in fixtures. 2016-01-27 13:46:14 +01:00
Niels Keurentjes 639ee0701c Introduced more generic, less invasive way to test for exceptions in fixtures, more in line with how phpunit works. 2016-01-27 13:19:08 +01:00
Niels Keurentjes bd241cb896 Included unit test for circular root dependencies. 2016-01-27 10:05:10 +01:00
Niels Keurentjes e5fe3d8a3b Expanded InstallerTest to support expecting Exceptions by supplying "EXCEPTION" as "--EXPECT--" 2016-01-27 10:04:45 +01:00
Rob Bast f829a160fb use a proper tmp directory
this test failed on OSX before, trying to create a directory at the root of the filesystem
2016-01-26 14:32:04 +01:00
Rob Bast f1fd7d1dd6 make clashes less likely and use silencer 2016-01-26 14:29:12 +01:00
Jordi Boggiano 1818b95149 CS fixes 2016-01-26 13:07:18 +00:00
Rob Bast 64d653ad92 fix race condition 2016-01-26 13:54:35 +01:00
Jordi Boggiano 783e0aec8a Merge remote-tracking branch 'alcohol/unique-test-directories' 2016-01-26 12:35:29 +00:00
Jordi Boggiano 5c944d45ac Merge pull request #4827 from curry684/issue-4203
Added more graceful warning suppression utility
2016-01-26 12:31:18 +00:00
Jordi Boggiano 5672f67475 Merge pull request #4829 from curry684/issue-4726
Globbing while resolving path repositories now normalizes to slashes
2016-01-26 12:18:47 +00:00
Rob Bast a8995b2572 use dirsep so phpunit on windows doesnt fail 2016-01-26 11:23:08 +01:00
Rob Bast 5e73b21c70 return realpath() value (OSX uses a weird symlink structure) 2016-01-26 09:41:21 +01:00
Rob Bast adf3b956d0 try to use unique test directories
any tests that use the filesystem should have their own unique directory, as we run our test suite in parallel and
cleanup of tests (removing directories) should not interfere with currently running tests
2016-01-26 09:41:21 +01:00
Niels Keurentjes aef4820abe Normalization of URLs caused discrepancy on Windows with unit tests. 2016-01-26 09:08:57 +01:00
Jordi Boggiano 03e0d65f37 Allow stream wrapper usage in config dirs, fixes #4788 2016-01-25 23:40:16 +00:00
Niels Keurentjes 2c3e7cf5f2 Unit tests fail in a nasty way if ErrorHandler test is run before the Silencer and it's not silencing itself. 2016-01-25 23:51:11 +01:00
Niels Keurentjes 76c1645a0e Merge remote-tracking branch 'upstream/master' into issue-4203 2016-01-25 23:38:13 +01:00
Niels Keurentjes 18cd4f966b Added silencer utility to more gracefully handle error suppression without hiding errors or worse. Fixes #4203, #4683 2016-01-25 23:37:54 +01:00
Jordi Boggiano c5cb2327cf Merge remote-tracking branch 'bamarni/config-repo-options' 2016-01-25 21:28:22 +00:00
Bilal Amarni e727f9f5fe [Config command] allow to pass options when adding a repo 2016-01-25 19:25:10 +01:00
Chris Smith 304c268c3b Tidy up and general improvement of sAN handling code
* Move OpenSSL functions into a new TlsHelper class
* Add error when sAN certificate cannot be verified due to
  CVE-2013-6420
* Throw exception if PHP >= 5.6 manages to use fallback code
* Add support for wildcards in CN/sAN
* Add tests for cert name validation
* Check for backported security fix for CVE-2013-6420 using
  testcase from PHP tests.
* Whitelist some disto PHP versions that have the CVE-2013-6420
  fix backported.
2016-01-24 19:02:50 +00:00
Jordi Boggiano 837fa805ec Code tweaks, refs #4124 2016-01-22 19:09:44 +00:00
nevvermind aa45a48283 Refactoring
- changed "SPI" into something more familiar, like "implementation"
- throw exceptions on invalid implementation types or invalid class names
- use null instead of false when querying
- refactored the tests accordingly
2016-01-22 13:51:32 +00:00
nevvermind 681043355f Update test fixtures + fix test 2016-01-22 13:51:32 +00:00
nevvermind 58ded13eb9 Fix tests breaking on a api version bump
Make generic plugins work with many API versions as opposed to just 1.0.0.
2016-01-22 13:51:32 +00:00
nevvermind 2051d74774 Added Capable plugins for a more future-proof Plugin API
Plugins can now present their capabilities to the PluginManager, through which it can act accordingly, thus making Plugin API more flexible, BC-friendly and decoupled.
2016-01-22 13:51:32 +00:00
Rob Bast 17d6b98707 add A to root requirements 2016-01-21 18:40:33 +01:00
Rob Bast 0f09982858 add a test attempting to reproduce composer/composer#4795 2016-01-21 16:18:00 +01:00
Rob Bast 446f1b3e31 fix zip test 2016-01-21 10:22:12 +01:00
Jordi Boggiano fb848d2e07 Code cleanups 2016-01-16 16:50:28 +00:00
Jordi Boggiano e6f1c13d00 xz test tweak 2016-01-10 20:45:40 +00:00
Jordi Boggiano 5214620f05 Fix xz tests 2016-01-10 20:26:23 +00:00
Jordi Boggiano c1cc6bfecf Avoid doing too many loads of the remotefilesystem 2016-01-10 20:06:10 +00:00
Jordi Boggiano 5d015defb8 Merge remote-tracking branch 'origin/master' into tls-config 2016-01-10 16:10:22 +00:00
Jordi Boggiano 969263944c Rename var 2016-01-09 18:39:18 +00:00
Jordi Boggiano 44a00a28fa Merge remote-tracking branch 'chorry/4694-clean-temporary-dirs-in-tests' 2016-01-09 18:37:50 +00:00
Jordi Boggiano 48420a2411 Update deps and bump json-schema requirement, fixes #4756 2016-01-09 16:52:06 +00:00
Alexander Loutsenko 909a679ab5 Filesystem is not needed as a property for CacheTest 2015-12-14 18:52:02 +03:00
Alexander Loutsenko 397ae2d7c8 review fixes 2015-12-14 18:50:04 +03:00
Alexander Loutsenko fa5de786ff clean garbage dirs in tmp after composer tests #4694 2015-12-14 17:52:37 +03:00
Rob Bast c292122791 it looks like php 5.3.3 might not have openssl extension? 2015-11-30 15:51:49 +01:00
Jordi Boggiano ddd85afd32 Merge pull request #4633 from jaapio/feature/gitlabInstallPath
Adds support for gitlab installed in subfolder
2015-11-30 13:49:50 +00:00
Jaapio df92cb09ab extract regex to const. To be able to reuse it 2015-11-29 13:59:54 +01:00
Jordi Boggiano 8072448cf3 Adjust deduplication of files autoloads, refs 9710b26d3f 2015-11-26 10:39:16 +00:00
Jaapio b471440ea0 Adds support for gitlab install in subfolder
Since gitlab can be hosted on any url also subdirectories should be
supported. (e.g https://mycompany.com/gitlab).
This supports only http and https protocols since the gitlab api url
is derived from the package repository url. And the ssh protocol doesn't
support folders this way.
2015-11-23 22:05:37 +01:00
Jordi Boggiano fbab2bfa17 Move user agent definition to StreamContextFactory so it is available in all contexts 2015-11-23 15:12:33 +00:00
Jordi Boggiano 020c126c27 Fix CS 2015-11-21 21:51:43 +00:00
Jordi Boggiano a10bffec0e Merge remote-tracking branch 'GromNaN/gitlab' 2015-11-21 21:48:46 +00: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 1fe690f810 Autoload generator cleanups 2015-11-21 18:33:17 +00:00
Jordi Boggiano 3748c11709 Simplify files autoload include function, and make sure files are included once per package even if exactly the same, refs #4186 2015-11-21 18:30:44 +00:00
Jordi Boggiano 9710b26d3f Merge remote-tracking branch 'jeskew/feature/require_files_but_once' 2015-11-21 17:31:05 +00:00
Jordi Boggiano c0b49d09f3 Merge remote-tracking branch 'cw-ozaki/no-script-dump-autoload'
Conflicts:
	src/Composer/Autoload/AutoloadGenerator.php
	src/Composer/Command/DumpAutoloadCommand.php
2015-11-21 17:14:33 +00:00
Thiago Carvalho 320533bcf9 Fixes #4610 2015-11-21 08:58:52 +01:00
Jordi Boggiano cf6cd83335 Use writeError for xdebug warning and fix running test suite with xdebug 2015-11-19 17:37:32 +00:00
Jordi Boggiano f674261b96 Merge remote-tracking branch 'ockcyp/exclude-classmap-parent' 2015-11-14 15:33:55 +00:00
Jérôme Tamarelle 4255db9e31 Allows SSH urls for gitlab and detect the scheme
SSH urls uses HTTPS to request the API
2015-11-14 16:05:05 +01:00
Jordi Boggiano 4b269f4ded Follow stability option in create-project to select the best possible version, refs #4563 2015-11-14 15:04:04 +00:00
Jérôme Tamarelle ac68a721f4 Merge remote-tracking branch 'composer/master' into gitlab
Conflicts:
	doc/04-schema.md
	src/Composer/Util/RemoteFilesystem.php
2015-11-14 14:13:39 +01:00
Jerome TAMARELLE 6ccc562c0f Add tests on GitLab class (copied from GitHubTest) 2015-11-13 18:50:50 +01:00
Omer Karadagli 4046ae042d Up-level relative paths in exclude-from-classmap 2015-11-12 15:53:47 +00:00
Giorgio Premi fd0026b542 Detect infinite script call recursion 2015-11-09 15:34:11 +01:00
Giorgio Premi a25492d1b9 Allow composer script call with @ syntax 2015-11-09 15:34:11 +01:00
Remi Collet a6c6537529 skip no more needed with jsonc 1.3.9 2015-11-04 09:11:01 +01:00
Pierre Rudloff 879d34589b XzDownloader test 2015-11-03 23:29:20 +01:00
Jordi Boggiano 735d4a692e Fix validating array loader tests 2015-10-30 20:40:09 +00:00
Jordi Boggiano 6c16510743 Add support for wildcards in exclude-from-classmap, refs #1607 2015-10-30 19:12:30 +00:00
Jordi Boggiano f1b0c073ad Tweaked exclude-from-classmap: windows support, normalize paths and make sure they are all package-relative and do not leak to other packages, refs #1607 2015-10-30 00:22:04 +00:00
Jordi Boggiano 084f6de24e Merge remote-tracking branch 'trivago/add_exclude'
Conflicts:
	doc/04-schema.md
	src/Composer/Autoload/AutoloadGenerator.php
2015-10-30 00:00:44 +00:00
Rob c7ed232ef4 Merge pull request #4529 from jeroenseegers/warn-on-commit-reference
Generate a warning when a commit reference is used
2015-10-29 10:52:59 +01:00
Jordi Boggiano 599ad77167 Merge pull request #4542 from bd808/feature/support-merge-plugin
Allow easier manipulation of RootAliasPackage
2015-10-28 03:45:57 +00:00
Bryan Davis 06c44ce998 Add setters used by composer-merge-plugin to RootPackageInterface
Extend RootPackageInterface with setter functions used by
composer-merge-plugin and implement them for RootAliasPackage. This will
allow composer-merge-plugin and similar code that manipulates the root
package at runtime to ignore the difference between a RootPackage and
a RootAliasPackage.
2015-10-27 14:43:29 -06:00
Jordi Boggiano 82349bcb2a Fix support for extracting stability flags in multi-constraints, fixes #4440 2015-10-27 14:59:48 +00:00
Jordi Boggiano 507415e404 Make VersionSelector prefer stable by default and allow specifying a PHP version that must be matched, fixes #4318 2015-10-27 14:43:04 +00:00
Jeroen Seegers 279b5f0156 Drop irrelevant properties from composer_commit-ref.json 2015-10-27 14:20:45 +01:00
Jeroen Seegers f3dc31839f Refactor commit-ref validation
The require and require-dev arrays have been merged into one and no
longer user private methods/properties to collect warnings.
2015-10-27 13:59:29 +01:00
Jeroen Seegers 476c6f279b Add fixture for composer.json with commit-ref 2015-10-27 13:50:41 +01:00
Jordi Boggiano 3d9daea6a0 CS fixes 2015-10-25 15:19:15 +00:00
Jeroen Seegers 73e73c90fb Generate a warning when a commit reference is used
Closes #4485
2015-10-23 21:38:11 +02:00
Jordi Boggiano a54f84f05f Merge pull request #4479 from MakiCode/feature#4397
Added --file flag: Feature#4397
2015-10-13 14:09:04 +01:00
Rob Bast b523fc0b7b ran fixers 2015-10-13 11:35:51 +02:00
MakiCode 1c0b9cd65f Removed test for non-string file name check 2015-10-12 10:20:45 -05:00