1
0
Fork 0
Commit Graph

1190 Commits (abfe54f3344553d7de42fbe13f21e0f5ffb82d8c)

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
Fred Emmott 23d5e30fbc Add test for Generics class
Already worked, just adding a test.
2015-03-09 11:29:04 -07:00
Fred Emmott cb1ea889d6 Use HHVM_VERSION instead of HPHP_VERSION 2015-03-09 10:02:10 -07:00
Fred Emmott 33ea86573e Add support for using classmap to autoload Hack enums
fixes composer/composer#3823

Ran tests with both PHP5.5.9-1ubuntu4.5 and HHVM 3.6. Test fails on HHVM only
if I back out the ClassMapGenerator.php change.
2015-03-09 09:38:02 -07:00
Jordi Boggiano b80038804f Fix env override regression, fixes #3820 2015-03-06 16:21:40 +00:00
Jordi Boggiano c7b0628d93 Fix tests 2015-02-27 12:27:56 +00:00
Steve Buzonas 484c04b5e5 update repository manager tests to use data provider and test for exception case 2015-02-26 03:19:26 -05:00
Rob Bast 3d329622d7 overwrite -> overwriteError 2015-02-25 11:00:35 +01:00
Rob Bast cb336a5416 Implement writeError throughout Composer 2015-02-25 11:00:35 +01:00
Jordi Boggiano 0b4a9235f4 CS fixes 2015-02-24 14:22:54 +00:00
Jordi Boggiano c291b07abd Merge pull request #3764 from alcohol/retry-slow-test
retry slow test if timeout occurs
2015-02-23 22:41:42 +00:00
Jordi Boggiano 3efed220a6 Clean up event dispatching code and make package events extend installer events 2015-02-23 15:34:49 +00:00
Rob Bast 85955d82a6 Raise timeout to 5 minutes 2015-02-23 09:57:54 +01:00
Jordi Boggiano efcd1e4247 Merge pull request #3749 from alcohol/allow-setting-packagist-to-false-through-config-command
composer config repositories.packagist false
2015-02-17 19:41:03 +00:00
Jordi Boggiano 306f5518d6 Merge pull request #3750 from DavidPrevot/git
Config Git repository user
2015-02-17 15:34:19 +00:00
Jordi Boggiano 5d3c7ab6b7 Rename test files and descriptions 2015-02-17 14:43:09 +00:00
Jordi Boggiano b4698568d2 Adjust tests and fix installer code to create the pool using locked requirements and not the composer.json reqs 2015-02-17 14:37:33 +00:00
David Prévot e5ede671d2 Config Git repository user
One can’t assume a Git user is already setup for the tests.
2015-02-16 11:55:56 -04:00
Rob Bast ef92a06205 composer config repositories.packagist false
closes #3728, closes #3713, closes #3290, not sure about #3025
2015-02-16 16:44:13 +01:00
Matthias Derer 1425bb7fc3 added tests to reproduce the bug 2015-02-16 13:46:59 +01:00
Jordi Boggiano 781d8cb925 Merge pull request #3740 from bestform/ignore-root-requirements-in-installer
Ignore root requirements in installer when installing from locked state
2015-02-14 17:12:21 +00:00
Jordi Boggiano 53925295c3 Merge pull request #3699 from trivago/non_feature_branches
added non-feature-branches
2015-02-14 15:44:45 +00:00
Matthias Derer c9cff6387a removed requirements from the root package should we install from the lock file 2015-02-13 16:15:34 +01:00
Jordi Boggiano 1f1b334f46 Merge pull request #3711 from alcohol/github-api-v3-deprecations
GitHub api v3 deprecations, closes #3566
2015-02-11 10:28:17 +00:00
Rob Bast a34335a9bb github deprecation changes
- added some tests
- minor bug fixes discovered during testing
- resolved two deprecations (rate limit api and authorizations api)
- added some more comments to make the flow more understandable
2015-02-11 10:18:47 +01:00
Rob Bast d02eb8760b strict check, testcase(s) 2015-02-10 12:55:49 +01:00
Jordi Boggiano 6c971c3028 Fix regex matching and add more tests for addSubNode, refs #3721, fixes #3716 2015-02-09 19:11:32 +00:00
Rob Bast fb54429941 solve edge case for `composer remove vendor/pkg` 2015-02-09 17:21:20 +01:00
rkerner abc9d60fcc added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches 2015-02-02 14:36:50 +01:00
Nils Adermann 2697673666 Merge pull request #3685 from xfornesa/issue3647
fix for issue #3647
2015-01-28 16:17:56 +01:00
Xavier Fornes 8ba8580a28 fix test implementation for php 5.3
refs issue #3657
2015-01-28 11:46:38 +01:00
Nils Adermann 0543a32d39 Merge pull request #3610 from bd808/feature/classmap-authoritative
Add classmap-authoritative config setting
2015-01-28 11:26:28 +01:00
Xavier Fornes bb0a2df293 fix for issue #3657
ConsoleIO writing a message which contains end of lines characters
2015-01-28 08:49:38 +01:00
Nils Adermann 5e5eb069dc Don't use a regex to parse installer tests to allow for longer tests 2015-01-27 17:02:37 +01:00
Jordi Boggiano 7b308a27f6 Merge pull request #3655 from theravel/master
Fix error handling for incorrect "repositories" array
2015-01-20 10:35:14 +00:00
Jordi Boggiano cd38d1e096 Tweaks to also support 1.0-dev style aliases, refs #3480 2015-01-20 10:26:10 +00:00
Dmitry Tarasov 3b678ee379 Fix error handling for incorrect "repositories" array 2015-01-20 13:03:55 +03:00
Damian Mooyman 7bb85ff21e Support aliases for numeric branches. Fixes #3461 2015-01-20 17:42:01 +13:00
Grégoire Paris 091fee8a3b skip some tests when the zip extension misses
It is required for some tests to run.
2015-01-08 21:32:37 +01:00
Bryan Davis 0f2558dab3 Use assertContains in ClassMapAuthoritative checks
Use assertContains instead of assertRegExp when checking for
ClassMapAuthoritative settings.
2015-01-05 12:05:17 -07:00
Jordi Boggiano e0d36e19eb Disable overwrites when no-ansi is present, fixes #3612 2015-01-05 16:17:15 +00:00
Bryan Davis 92455759fc Fix AutoloadGeneratorTest for PHP 5.3.x 2015-01-03 18:01:18 -07:00
Bryan Davis ad1f8e6c5a Add classmap-authoritative config setting
Add a "classmap-authoritative" configuration setting that can be used to
disable searching the various prefix and fallback directories for
classes that have not been registered with the
Composer\Autoload\ClassLoader class map. This setting can be used to
optimize performance by avoiding a potentially large number of
`file_exists` calls when Composer is being used in a program with
additional autoloader facilities. Use of the setting implies
"optimize-autoloader" to ensure that the most complete class map
possible is generated.

Closes #3603
2015-01-03 17:35:25 -07:00
Jordi Boggiano 220bd2bd1e Remove phpunit repo from tests 2015-01-01 16:26:14 +00:00
Jordi Boggiano 0a0ad6c335 Merge pull request #3562 from stof/patch-1
Add the package license for PEAR packages
2014-12-28 15:09:37 +00:00
Christophe Coevoet 9bc6209be9 Fix tests for the pear repository 2014-12-27 00:12:35 +01:00
Christophe Coevoet 267af928df Add a failing testcase for stability flags in complex constraints
Refs #3570
2014-12-22 12:27:56 +01:00
Jordi Boggiano 60ac971419 Fix relative path fetching when a var uses var replacement, fixes #3564 2014-12-17 21:57:27 +00:00
Jordi Boggiano 331bda235c Fix activation of global plugins, fixes #3557 2014-12-16 11:12:13 +00:00
Jordi Boggiano 523aef76d0 Fix tests again.. 2014-12-14 13:46:37 +00:00
Jordi Boggiano 901fd838f3 Merge pull request #3450 from nicolas-grekas/prefer-lowest-stable
add --prefer-lowest and --prefer-stable to update command
2014-12-14 13:02:06 +00:00
Nicolas Grekas e821ac2772 Persist prefer-lowest in composer.lock 2014-12-14 10:29:41 +01:00
Jordi Boggiano 0627d846a5 PluginManager refactoring, fixes #3550 2014-12-13 18:54:42 +00:00
Jordi Boggiano 1622b9a390 Fix tests 2014-12-13 16:14:03 +00:00
Jordi Boggiano 8c3ee03734 Enough intermittent failures already 2014-12-13 15:14:54 +00:00
Jordi Boggiano bef89604e2 Fix parsing of strings, fixes #3543 2014-12-13 14:31:58 +00:00
Nils Adermann e844ead223 Merge pull request #3467 from naderman/fix-update-whitelist-unused
Add test case for removing unused dependencies on whitelisted update
2014-12-13 14:48:24 +01:00
Nicolas Grekas 98b254a3ec split update --prefer-lowest and --prefer-stable 2014-12-13 11:51:30 +01:00
Nicolas Grekas 4a0feb0189 add --prefer-lowest-stable to update command 2014-12-13 11:51:30 +01:00
Andreas Möller 6ddd8d4ec7 Enhancement: Add sort-packages option which allows sorting of packages 2014-12-13 00:24:14 +01:00
Rob d9b8b3611b fixes composer/composer#3546 2014-12-12 22:33:04 +01:00
Jordi Boggiano 76c666e210 Merge pull request #3544 from alcohol/match-event-to-listener-expectation
fix for composer/composer#3382
2014-12-12 18:18:12 +00:00
Rob Bast 113606be7b should fix composer/composer#3382 2014-12-12 18:41:37 +01:00
Jordi Boggiano 55895ab494 Skip tests on hhvm 2014-12-12 13:33:45 +00:00
Jordi Boggiano da881c118b Fix failures 2014-12-12 13:15:34 +00:00
Jordi Boggiano 8dad846613 Add SNI settings for SSL URLs that are proxied, fixes #3204 2014-12-12 12:25:21 +00:00
Jordi Boggiano 7b13507dd4 Fix typo in test 2014-12-11 21:52:29 +00:00
Jordi Boggiano 4a6503fe36 Add suppor for https_proxy, fixes #3204 2014-12-11 17:42:55 +00:00
Jordi Boggiano d4523119ea Use caret operator for 0.x releases when guessing versions, fixes #3518 2014-12-08 17:05:50 +00:00
Jordi Boggiano 06e96a78e2 Update ranges for 0.N versions, refs #3518 2014-12-08 17:04:59 +00:00
Jordi Boggiano 9438f3a58f Use better semver ranges for 0.x versions, fixes #3518 2014-12-08 16:57:27 +00:00
Jordi Boggiano 92f4c1fb35 Allow and ignore semver build metadata, fixes #2422 2014-12-08 15:52:32 +00:00
Jordi Boggiano f363f9d370 Add support for caret (^) operator 2014-12-08 15:39:52 +00:00
Jordi Boggiano ebab9db27a Add support for hyphen ranges 2014-12-08 13:44:42 +00:00
Jordi Boggiano 69ef80124f Add support for capital X in 3.X and || for OR 2014-12-08 12:59:01 +00:00
Jordi Boggiano 4c713978e9 Add more tests and validate that there is only one comma 2014-12-07 18:07:30 +00:00
Jordi Boggiano ca168d478b Spaces are now equivalent to comma in constraints and mean AND 2014-12-07 18:07:29 +00:00
Jordi Boggiano 029f709300 Fix parsing stability suffixes in multi constraints, fixes #1732 2014-12-07 17:46:04 +00:00
Jordi Boggiano 46d8e50bf3 Fix test on windows 2014-12-07 14:02:17 +00:00
Jordi Boggiano fc3c7838b2 CS fixes 2014-12-07 13:54:29 +00:00
Christophe Coevoet ea44412476 Skip the phar building on HHVM
Building a phar does not work on HHVM. It looks like it tries to read the phar file which does not exist yet.
2014-12-02 14:31:37 +01:00
Jordi Boggiano f291bf6f5c Merge pull request #3481 from naderman/optimize-solver
Solver optimizations
2014-12-01 19:05:42 +00:00
Nils Adermann 26598c4a9a Remove unnecessary pool reference from rules 2014-12-01 19:02:50 +01:00
Nils Adermann d77400ade2 Make ruleById lookup table in rule set public
Saves about 500k function calls on a packagist update
2014-12-01 18:28:45 +01:00
Nils Adermann 540dfacfa0 Add test to verify that depency packages get deleted when no longer in lock file 2014-11-26 20:24:30 +01:00
Nils Adermann d884b26aa3 Add test case for removing unused dependencies on whitelisted update 2014-11-26 20:19:37 +01:00
Nils Adermann b23a3cd368 Merge pull request #3423 from Michael-Gusev/patch-1
Issue #3422
2014-11-21 18:59:11 +01:00
Nils Adermann 96955dd23b Merge pull request #3264 from duncan3dc/remove-self-update-warning
Don't display the dev warning time when running self-update
2014-11-21 18:51:14 +01:00
Chris Smith c819bd7e70 Update config tests to not use environment variables 2014-11-21 10:15:17 +00:00
Chris Smith 5a56ebd545 Revert "Backup/restore Composer environment variables"
This reverts commit 725a4fd638.
2014-11-21 10:09:21 +00:00
Chris Smith 725a4fd638 Backup/restore Composer environment variables
The tests could fail if an environment variable replaces an expected
value.
2014-11-21 10:07:56 +00:00
Craig Duncan 647625ddc5 Added some tests for the dev version warning 2014-11-20 18:27:58 +00:00
Chris Smith 0f9128a7d2 Add comment 2014-11-20 16:54:39 +00:00
Chris Smith 2e40f5f586 Add failing test case 2014-11-20 16:54:38 +00:00
Nils Adermann 6f4be698a5 Merge pull request #3325 from rdohms/implementing-abandoned-packages
Abandoned Package Warnings
2014-11-20 13:09:18 +01:00
Michael Gusev a531594a4a Issue #3422
https://github.com/composer/composer/issues/3422
2014-11-17 11:05:23 +01: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 ec0463a400 Add tests for platform packages required by root and avoid creating rules altogether instead of disabling them, refs #3320 2014-10-17 15:30:27 +01:00
alu b7fa302b90 add ignore-platform-package-requirements for update/install commands. 2014-10-08 14:20:36 +09:00
Jordi Boggiano 6e4a21d700 Merge remote-tracking branch 'hakre/patch-2' 2014-10-07 14:10:29 +01:00
Jordi Boggiano 923191a489 Merge remote-tracking branch 'hakre/patch-1' 2014-10-07 13:45:32 +01:00
Jordi Boggiano 95d49ce638 Add additional test for beta without dash separator support, fixes #3331 2014-10-06 12:42:19 +01:00
Jordi Boggiano 109f4ffd5e Normalize json across all php versions, fixes #3226 2014-10-04 17:02:42 +01:00
Jordi Boggiano ed54e8346d Fix json test, fixes #3326 2014-10-04 12:33:28 +01:00
Rafael Dohms 346133d2a1 PR Review
- reverted comma removal
- made getReplacementPackage consistent
- removed abandoned flag if false
2014-10-03 15:12:16 +02:00
Rafael Dohms f9f2bbac59 Abandoned packages support
Added warning to the installer process.
If any installed packages are flagged, the user will get a warning at the end
of the install/update process.
2014-10-03 14:48:28 +02:00
Rafael Dohms d6d087d348 Support for Abandoned in Packages
Added parsing for abandoned property into the CompletePackage Object.
2014-10-02 23:53:21 +02:00
Jordi Boggiano b33da336ec Merge remote-tracking branch 'origin/master' 2014-09-30 16:28:01 +01:00
Jordi Boggiano efcdb394d3 Rename *-solve-dependencies to *-dependencies-solving 2014-09-30 16:26:55 +01:00
Jordi Boggiano 81fa284c9b Merge remote-tracking branch 'francoispluchino/installer-events' 2014-09-30 16:18:17 +01:00
Jordi Boggiano 663cda8827 Merge pull request #3142 from francoispluchino/plugin-load-only-one-time
Register plugin only one time when it's present in global and project mode
2014-09-30 15:19:55 +01:00
Jordi Boggiano 472c8a5113 Fix tests on windows, fixes #3141 2014-09-30 15:18:15 +01:00
Jordi Boggiano 55a6a1c3d4 Add support for nested arrays in the json manipulator, fixes #3296 2014-09-24 18:32:10 +01:00
Bastian Hofmann b279dda1c0 Merge branch 'master' of https://github.com/composer/composer 2014-09-24 13:23:49 +02:00
Jordi Boggiano e6165e6495 Tweak rules to allow guessing based on branch aliases and avoid greedy constraints on alpha/beta/RC packages, refs #3096 2014-09-23 15:19:23 +01:00
Jordi Boggiano cf75ec7763 Merge remote-tracking branch 'weaverryan/require-version-select' 2014-09-22 17:48:13 +01:00
Jordi Boggiano 62b5062146 Improve sorting of plugin packages, fixes #3109, refs #2972 2014-09-22 17:04:58 +01:00
François Pluchino 6c6a623229 Fix invalid version format 2014-09-22 11:58:26 +02:00
Bastian Hofmann 204fc207fa Moved config option to not save subversion credentials to repository configuration, added documentation. 2014-09-16 15:16:55 +02:00
Bastian Hofmann 0d0ed59e5c Codestyle fix 2014-09-15 13:21:33 +02:00
Ryan Weaver 895e62e859 Refactoring selection of the "recommended" version (e.g ~1.2) and adding some tests
This also modifies the behavior slightly (from a recommendation by seldaek) to always
propose the minor version of the recommendation (e.g. ~1.2 instead of ~1.2.1).
2014-09-12 11:26:51 -04:00
Ryan Weaver aea2e901a9 Extracting logic into a new class related to selecting the latest version
Also refactored InitCommand slightly so that you can use this "latest version"
functionality when searching for a package as well.
2014-09-12 11:26:51 -04:00
Bastian Hofmann b132e4eae0 Added cacheCredentials config flag for saved SVN credentials to control the --no-auth-cache flag
Example config:

{
    "http-basic": {
        "svn.example.com": {
            "username": "user",
            "password": "password",
            "cacheCredentials": false
        }
    }
}
2014-09-11 11:48:24 +02:00
François Pluchino 1067ce4f96 Add installer events 2014-07-29 15:25:16 +02:00
hakre 343d0b5af2 added test removing directory with trailing slash that is symlinked
#3144
#3157
2014-07-28 23:49:44 +02:00
hakre ed507dec9f added test unlinking directory
#3157
2014-07-28 23:36:04 +02:00
François Pluchino 11b945046f Register plugin only one time when it's present in global and project mode 2014-07-21 15:11:38 +02:00
Jordi Boggiano 7b4fcd93d3 Merge remote-tracking branch 'webfactory/issue-2698'
Conflicts:
	src/Composer/Repository/ArtifactRepository.php
2014-07-19 21:35:51 +02:00
Jordi Boggiano 4f0d7e4739 Merge remote-tracking branch 'dzuelke/prefer-stable-lock' 2014-07-19 19:38:00 +02:00
Jordi Boggiano d5294ef91b Update repo url from github and handle trailing slashes, refs composer/packagist#354 refs composer/packagist#423 2014-07-19 18:40:01 +02:00
David Zuelke d47d9eb253 remember prefer-stable setting in composer.lock 2014-07-07 21:20:46 +02:00
Jordi Boggiano 449f8165ef Allow $HOME and ~ usage in all *-dir config values, fixes #3060 2014-06-29 14:47:43 +02:00
Jordi Boggiano 8881cec174 Simplify version ranges (hopefully includes hhvm), refs #3049 2014-06-29 12:27:27 +02:00
Jordi Boggiano 3874a11238 Update json test 2014-06-22 11:01:05 +02:00
Jordi Boggiano ac497feaba CS fixes 2014-06-10 16:13:12 +02:00
Jordi Boggiano 08e34858d6 Fix code to use hostname only, refs #3026 2014-06-05 11:14:29 +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 c0f9a00125 Merge remote-tracking branch 'jakoch/patch-6' 2014-06-05 10:57:43 +02:00
Jordi Boggiano 959cc4d63c Add info about conf file loading to debug output 2014-05-31 16:50:33 +02:00
Benjamin Grandfond a21b0f82db Allow SVN to connect with credentials provided with the auth.json file 2014-05-30 17:14:43 +02:00
Jordi Boggiano 7131607ad1 Fix regression in handling github-oauth settings in auth.json 2014-05-27 16:26:24 +02:00
Mátyás Somfai 2ed0bfc1ba added tests for not updating packages referenced by specific commit hash 2014-05-27 14:23:31 +02:00
Jordi Boggiano 90d1b6e08a Rename basic-auth to http-basic, add docs/schema/config support, add local auth file support, add storage to auth.json, add store-auths config option, refs #1862 2014-05-27 13:50:47 +02:00
Jordi Boggiano 64ac32fca9 Merge pull request #2785 from Firehed/master
Add @generated annotation to lockfile (ref PR 2210)
2014-05-24 22:57:50 +02:00
Jordi Boggiano e23665be59 Fix replacers being picked if whatProvide was called before building the package whitelist, fixes #2991, fixes #2962 2014-05-23 15:22:53 +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