549dabf878
Merge branch '2.0'
2021-04-08 12:06:38 +02:00
e6cede4a61
Make sure update mirrors/--lock keeps the release date of the original reference when dev versions have newer commits, refs #9812
2021-04-08 11:54:39 +02:00
0ab4013788
Fix output listing some updates that do not really happen when updating mirrors/--lock, fixes #9812
2021-04-08 10:55:48 +02:00
101a5e2a21
Merge branch '2.0'
2021-04-07 16:05:26 +02:00
3e33cc1d93
Add new dep to the tests
2021-04-07 16:02:41 +02:00
1ce41efa6a
Fix tests
2021-04-07 14:39:42 +02:00
1179e4b481
Change root.dev-requirement to root.dev in installed.php as the root is not required per se, and this simply tracks the dev mode at install time
2021-04-07 13:42:22 +02:00
cc55b56dd7
Allow optional name and description fields for project type
2021-03-30 16:51:03 +03:00
bf73a20bc0
Merge branch '2.0'
2021-03-16 20:31:44 +01:00
44bb82b50f
Make full functional test output more reliable
2021-03-10 14:37:00 +01:00
f10ae542ff
Always mark symlinked path packages for update even during partial updates to make sure they always reflect the current state on disk, fixes #9751
2021-03-10 14:26:42 +01:00
4940009f83
Bump phpstan to level 3 ( #9734 )
...
Clean up PackageInterface/CompletePackageInterface, add missing methods, type things in solver as BasePackage, added CompleteAliasPackage, ..
2021-03-09 15:49:40 +01:00
8392508e23
Merge branch '2.0'
2021-03-09 15:29:19 +01:00
ab84916422
Fix unclear error when a package can be found in lock but not in the remote repo, fixes #9750
2021-03-09 15:01:23 +01:00
d0b399b788
Merge branch '2.0'
2021-03-09 09:54:39 +01:00
0879e80d56
Fix functional tests to use the same PHP version as PHPUnit runs with
2021-03-09 09:54:06 +01:00
40800df6bd
Fix CS
2021-02-25 13:46:52 +01:00
46dde9453b
Fix tests
2021-02-25 11:28:07 +01:00
7c555b6382
Merge pull request #9682 from nicolas-grekas/installed-no-dev
...
Allow querying InstalledVersions::isInstalled() for no-dev packages
2021-02-24 17:16:28 +01:00
09639a0cfc
Merge pull request #9670 from Ayesh/enums
...
Add support for autoloading Enums
2021-02-24 16:03:58 +01:00
7c910e6bfa
Revert autoload order fix, force bundled dependencies to be used over local dependencies, fixes #9721 , fixes #9717
2021-02-24 14:55:13 +01:00
7d4501816c
Allow querying InstalledVersions::isInstalled() for no-dev packages
2021-02-18 13:15:26 +01:00
03e8cacd12
Merge pull request #9696 from Seldaek/fix_installed_versions_during_update
...
Fix installed versions usage issues when using it in plugins during a Composer update process
2021-02-18 10:37:22 +01:00
22e79684ee
Fix unzip missing support for testsuite
2021-02-17 23:51:08 +01:00
d91fe67a80
Remove default branch alias from versions which are numeric, fixes #9705
2021-02-17 23:48:03 +01:00
6035e462d8
Fix test when on feature branch
2021-02-17 23:43:35 +01:00
a54d16f8a6
Fix tests env usage
2021-02-17 23:26:40 +01:00
f7e8f7625f
Remove plugin installer hackery
2021-02-17 23:21:18 +01:00
7267533690
Add one more InstalledVersions test for upgrades showing a known issue with plugin upgrades
2021-02-15 17:57:57 +01:00
27d0c5c3ef
Add test deficiencies in installed versions as the runtime autoloaders are not prepended and do not grant access to the latest data
2021-02-12 11:12:42 +01:00
d3ba447b79
Full functional test-bed improvements
2021-02-12 11:09:00 +01:00
52d7c6c383
Fix/add tests and also handle case where a json object is used
2021-02-11 11:13:58 +01:00
902174d2a7
Improve error reporting when failing to load a package, fixes #9680
2021-02-10 11:24:59 +01:00
228428747a
Add support for autoloading Enums
...
PHP 8.1 supports Enums, and [Enums follow class-semantics](https://php.watch/versions/8.1/enums#class-semantics-autoload ).
Composer's class-map generator currently looks for `class`, `interface`, and `trait` keywords. If Composer is run in PHP 8.1 or later, Composer now additionally looks for `enum` keyword as well. This is similar to how Hack's `enum` support is added.
This PR also adds tests for basic enums, backed enums, namespaced enums, and an enum that implements an interface and extends a class.
2021-02-06 15:51:18 +07:00
7402ef33fc
Dont recommend to use with all dependencies option when it is already used
2021-02-03 23:43:35 -05:00
5e956afa2f
Try fixing the build
2021-02-01 13:32:34 +01:00
07b8c23f02
Merge branch '1.10'
2021-01-27 15:46:58 +01:00
37c5e9961c
Merge remote-tracking branch 'nicolas-grekas/path-version' into 1.10
2021-01-27 15:20:38 +01:00
92313447d6
Filter out exclude-from-classmap rules to avoid generating very long regexes, fixes #9487
2021-01-27 15:10:32 +01:00
725b33ee5a
Handle "versions" option in PathRepository, remove support for "branch-version"
2021-01-27 14:28:26 +01:00
079e501ac8
Revert "Merge pull request #9273 from nicolas-grekas/dev-version"
...
This reverts commit d2d606ced24a8dbcd145
2021-01-27 14:03:44 +01:00
51001dec60
Merge remote-tracking branch 'nicolas-grekas/install-stack'
2021-01-27 11:04:09 +01:00
ba94445bb9
Ensure InstalledVersions reports info about all currently registered class loaders
2021-01-27 10:39:35 +01:00
6c346d00f3
Merge pull request #9617 from clxmstaab/merge-checkout-reset
...
GitDownloader: combine checkout + reset commands into a single process
2021-01-26 11:01:58 +01:00
471a63c206
Merge pull request #9465 from BR0kEN-/issues/9464
...
#9464 : ZipArchiver incorrectly treats `.gitignore` directory inclusions
2021-01-26 10:42:26 +01:00
4a6f1792ea
adjusted test expectations
2021-01-18 10:11:08 +01:00
d8a5db4cbb
Fix tests
2021-01-12 14:59:21 +01:00
57117384df
Merge pull request #9601 from Seldaek/json-fix
...
Fix JSON manipulation issue with large files and jit enabled
2021-01-12 14:45:13 +01:00
d94e638461
Fix tests and edge case
2021-01-12 14:00:02 +01:00
b021647e6f
Fix JSON manipulation issue with large files and jit enabled, fixes #9595
2021-01-12 11:02:43 +01:00
7f3a56f39b
Merge pull request #9360 from naderman/pool-builder-unlock-consider-all-constraints
...
PoolBuilder: Ensure versions matching locked constraints get loaded
2020-12-03 16:59:39 +01:00
db0656eab0
Duplicate partial update unlock but keep old version test with provide keyword
2020-12-01 14:55:05 +01:00
62bd81bf7a
Make sure the default branch alias is never used as a constraint by the VersionSelector
2020-11-26 14:24:22 +01:00
d00edab884
Merge pull request #9477 from naderman/fix-alias-conflicts
...
Explicit conflicts should conflict with aliases of packages too
2020-11-26 13:59:57 +01:00
e203809106
Fix test description
2020-11-26 13:59:35 +01:00
7197278fe9
Always install aliases together with their original package
...
Restores some Composer 1.x behavior like unbound constraints conflicting
with default branches unless they are branch aliased.
Simplifies conflicts with aliases because packages cannot be installed
without their aliases, so we do not need to know which aliases are
uninstalled in lock file or installed.json.
2020-11-26 12:10:07 +01:00
e857a8216c
Make sure mirror update fails if no lock file is present
2020-11-26 11:28:17 +01:00
2d025dce05
Make sure mirror updates do not fail if there are dev requirements and new requires are present, fixes #9514
2020-11-26 11:27:44 +01:00
58f358d028
Correct test case descriptions
2020-11-26 11:21:53 +01:00
b7d770659b
CS fixes
2020-11-22 14:52:39 +01:00
152694b574
Fix tests
2020-11-22 14:31:38 +01:00
480a6439fd
Fix phpstan phpdocs issues ( #9478 )
2020-11-20 09:28:09 +01:00
1b337be236
Add expected lock files to conflict with branch alias tests, add install from lock test
2020-11-16 13:27:54 +01:00
c02d2842b0
Test conflict with an unrequired alias does not prevent install.
...
The alias still ends up being marked as installed as the install step
reads it from the branch alias in the lock file and doesn't know a
conflict required it to be skipped.
2020-11-13 16:55:35 +01:00
045b5c6b6b
Add test case verifying conflicts on alias prevent it from getting installed
2020-11-13 15:47:27 +01:00
6b48258432
Add test case for root alias on an unloadable package
2020-11-13 14:40:54 +01:00
7b183956d8
Make sure the root aliases always get installed when a package is updated, fixes #9448
2020-11-13 13:52:21 +01:00
1ec5fa81e4
#9464 : Add the test to reveal the issue
2020-11-12 13:12:55 +02:00
e5a009ed80
Make sure empty objects are not left behind when removing requires/.. fixes #9462
2020-11-12 11:09:15 +01:00
b574f10d9d
Rename mainPackage to rootPackage in AutoloadGenerator and ensure we use RootPackageInterface
2020-11-12 10:41:06 +01:00
b8e40f6060
Fix tests
2020-11-11 11:49:50 +01:00
8dc5effee7
AutoloadGenerator: Send error HTTP status on error
2020-11-05 09:57:48 +01:00
56c65a58e2
Make platform-check only check non-dev requires, refs #9412
2020-11-04 23:41:58 +01:00
8c1355f448
Improve output of platform check further in case errors are hidden
2020-11-04 22:28:17 +01:00
ec960d12b0
Merge remote-tracking branch 'jakubboucek/feature/jb-platform-check-tigger-error'
2020-11-04 21:54:12 +01:00
4797d4afc8
Fix tests
2020-11-04 21:24:30 +01:00
2595de07ce
AutoloadGenerator: Trigger native PHP error on platform checks fails - tests
2020-11-04 12:28:15 +01:00
6f1761fe18
AutoloadGenerator: Send error HTTP status on error - update tests
2020-11-04 11:18:21 +01:00
ad2fcf8d92
Close zip archive after test finishes
2020-11-03 12:27:15 +02:00
b57792a80a
Skip CWD-in-path test on Windows
2020-11-03 12:20:44 +02:00
4d05cbffe3
Remove CWD from only the beginning of a path in ZipArchiver
...
Fixes https://github.com/composer/composer/issues/9403
2020-11-03 12:04:02 +02:00
8f454c6708
Remove CWD from only the beginning of a path in ZipArchiver
...
Fixes https://github.com/composer/composer/issues/9403
2020-11-03 12:01:48 +02:00
5aa90baab1
Add new lines to platform reqs issues
2020-11-01 23:39:06 +10:00
28e591dcd4
Merge pull request #9387 from studioromeo/fix-git-non-master-default-failing-tests
...
Fix git init -b being unavailable for older versions
2020-10-30 18:03:00 +01:00
2ced7b0bf8
Fix git init -b being unavailable for older versions
...
On older versions of git init doesn't have the -b flag. That
was introduced in v2.28.0.
Instead switch to using git checkout -b which has much
wider support (2.4.12 was as far back as I could check on
the docs).
2020-10-30 16:58:32 +00:00
372af31d23
Fix tests
2020-10-30 17:40:35 +01:00
f2f3b03fec
Fix config/create-project handling of repositories to prepend them by default as this is most likely the goal, fixes #9371
2020-10-30 14:16:40 +01:00
41daf69c87
Merge pull request #9379 from glaubinix/f/zip-util
...
Zip: ignore mac osx specific folder when searching for composer.json
2020-10-30 10:48:31 +01:00
d97c37f103
Zip: ignore mac osx specific folder when searching for composer.json
2020-10-29 22:30:12 +00:00
e6c7ab693e
Fix running tests with non standard default branch
...
When the global git config has init.defaultbranch set to
something other than master the tests fail. This is because
the tests assume that the default branch is called master
but that may not be the case.
This fixes the tests by ensuring that when running git init
we ensure the default branch is called master regardless of
how git is configured.
2020-10-29 21:16:11 +00:00
63bed40818
PoolBuilderTest: Add a dependency which must not be loaded on unlock
2020-10-27 22:18:05 +01:00
ea42d13f37
PoolBuilderTest: check locked constraints are considered on partial update
2020-10-27 21:59:12 +01:00
ff74d0e686
Fix lock file generation with dev-master aliases to be compatible with Composer 1, fixes #9337
2020-10-27 20:50:26 +01:00
7bc2112f2b
InstallerTest: Add a test for partial updates
...
Needs to take constraints of locked packages into account
2020-10-27 17:02:31 +01:00
b5c0e68bc7
PoolBuilder: test case ensuring versions matching locked constraints get loaded
2020-10-27 16:52:31 +01:00
568d9206cc
Fix tests
2020-10-27 14:04:36 +01:00
4b8c2aa121
Fix default version to be semver parseable, fixes #9342
2020-10-25 22:22:19 +01:00
5bdb0cfff5
Merge pull request #9339 from Seldaek/fix-plugin-order
...
Fix plugin install order for plugins modifying downloads
2020-10-25 21:28:38 +01:00
2d4e1e0dce
Make sure Transaction sorts operations correctly to begin with
2020-10-25 14:06:45 +01:00
2a913c7a68
Improve proxy error messages for streams
2020-10-24 18:20:31 +01:00
62eff8e979
Tweaks to new proxying code, refs #9324
2020-10-24 10:36:39 +02:00
d47261eb93
Refactor proxy handling for Composer2
2020-10-23 21:38:29 +01:00
e868996bdd
Validate: Warn about providing or replacing packages you require
2020-10-23 22:02:13 +02:00
8564dd8dac
Allow Url::sanitize to escape URLs without scheme
2020-10-23 13:27:46 +02:00
8feb83b22b
Remove duplicate StreamContextFactory ssl options
...
Added in Dec 2014 (commit 8dad846#4759 )
2020-10-23 13:25:17 +02:00
4d2f41a415
Merge pull request #9318 from naderman/validate-provide-replace-requirement
...
Validate: Warn about providing or replacing packages you require
2020-10-23 10:35:26 +02:00
447416a357
Fix typo
2020-10-22 16:16:02 +02:00
6409ed0fc2
Validate: Warn about providing or replacing packages you require
2020-10-22 11:28:19 +02:00
492bece6e2
Merge pull request #9317 from naderman/test-provider-satisfy-self
...
Test: Verify require for package provided or replaced by pkg itself is used
2020-10-22 10:46:05 +02:00
1d6c0865ca
Test: Verify replacing a package required by the same package satisfies the dep
2020-10-22 10:32:04 +02:00
290450214e
Test: Verify require for package provided by pkg itself is used
2020-10-22 10:26:28 +02:00
c0236c5ed2
Move slow integration test to separate fixtures directory and add to slow group
2020-10-22 10:14:17 +02:00
c37dce0bb3
Remove unnecessary hhvm conflict rules from test
2020-10-22 10:02:09 +02:00
2468cd20dd
Update test case for github issue 7665 to have correct output
2020-10-22 09:44:16 +02:00
e11f52c041
Add a test to reproduce github issue #7665
2020-10-22 09:44:16 +02:00
b74afd772b
Merge pull request #9309 from naderman/fix-solver-9290
...
MultiConflictRule conflict analysis handling on level 1 decisions
2020-10-21 18:40:03 +02:00
7b4cb9c370
Solver: Prevent infinite recursion in analyzeUnsolvableRule
...
In complex scenarios reasons for learned rules can themselves be learned
rules caused by other learned rules which had the some of the same
reasons. In this situation iterating over all problem rules requires
keeping track of which rules have previously been analyzed to avoid and
endless loop.
Side effect is that the sorting of problems including learned rules
changes slightly.
2020-10-21 17:11:13 +02:00
9641ad6025
SolverProblemException: Hide learnt rules on output
...
Results in too much error output which is not helpful. Very repetitive
and hard to understand. In issue 8903 even leads to endless recursion
bug.
2020-10-21 14:08:12 +02:00
853305063d
Add test case for github issue 9290
2020-10-21 13:33:39 +02:00
99a5469b5e
More hints
2020-10-18 13:13:44 +02:00
4d005a9786
Merge pull request #9296 from mcaskill/bugfix/file-downloader-cache-keys
...
Fix availability of $urls in FileDownloader
2020-10-16 11:24:03 +02:00
c01e3bd2f0
Make async test more robust
2020-10-16 11:23:03 +02:00
fcc072fdb6
Add test to check processed URL and cache key
2020-10-15 23:46:12 -04:00
fdde9e5933
On composer install we fix locked packages, but consider them locked for error reporting
2020-10-14 11:46:13 +02:00
74fb313c39
Separate locked packages from fixed packages in request
...
Locked packages are basically like removable fixed packages, so we still
only load one version, but we do not require their installation unless
something the user needs requires their use. So they automatically get
removed if they are no longer needed on any update.
2020-10-14 11:46:13 +02:00
73e24ea9fb
Partial updates should remove all unused dependencies
...
Instead of marking locked packages as fixed, we change the pool builder
to load only the locked version and treat it like a fixed package, but
removing the actual request fix, makes the solver treat it as a regular
optional dependency. As a consequence locked packages may be removed on
a partial update of another package, but they cannot be updated.
2020-10-14 11:46:13 +02:00
85eb007f4f
Transaction: Define a total order on packages to keep behavior on PHP8
...
So far the ordering of alias packages with the same name was undefined
so the actual order was determined by implementation of the sorting
algorithm in PHP. As of PHP8 sort is stable by default which changes the
outcome in some of our test cases.
With the fully defined total order the order can longer change depending
on sorting algorithm used and remains the same across PHP versions.
2020-10-14 11:13:51 +02:00
7ea6d5d2e7
Merge branch '1.10'
2020-10-13 16:00:04 +02:00
4feed8b85c
Fix parsing "branch-version"
2020-10-13 15:43:12 +02:00
d702fa0e1a
Add test to ensure root requirements do not get expanded by the pool builder
2020-10-13 15:14:20 +02:00
528030716e
Fix tests
2020-10-13 15:01:22 +02:00
bafdf9f705
Merge branch '1.10'
2020-10-13 14:47:23 +02:00
893fbfcb89
Add support for "extra.branch-version"
2020-10-13 13:56:18 +02:00
24abd233ec
Merge branch 'master' into code-improvements
2020-10-13 12:23:13 +02:00
0775e261c5
Merge remote-tracking branch 'lstrojny/apcu-prefix'
2020-10-13 10:19:30 +02:00
09ef026d43
Remove OperationInterface::getReason, closes #9230 , closes #9263
2020-10-12 12:31:54 +02:00
03b8c3db3f
Merge branch '1.10'
2020-10-08 14:38:41 +02:00
6698e0bafa
Merge remote-tracking branch 'naderman/version-guess-remotes' into 1.10
2020-10-08 14:01:25 +02:00
f9913205dd
Fix VcsRepositoryTest
2020-10-08 11:06:39 +02:00
89afb823b6
VersionGuesser: Add test for remote version guess
2020-10-07 15:21:04 +02:00
92722a9a4c
VersionGuesser: Fix root package loader test which relies on git cmd in guesser
2020-10-07 15:11:08 +02:00
db2f09a361
VersionGuesser: Update tests to match new git command generated
2020-10-07 14:25:55 +02:00
80d71ccb3f
Merged isset, unset and str_replace calls
2020-09-26 00:55:19 +02:00
a4509d28e7
Introduce constants for Composer\Package\Link types
2020-09-21 14:22:06 +02:00
80a75e9959
Minor code improvements
2020-09-20 02:16:28 +02:00
0b6abf3b96
APCu prefix as a separate option
2020-09-16 10:49:00 +02:00
de0085767c
Sanitize prefix
2020-09-15 12:39:22 +02:00
dafd225a35
Allow to pass a string for apcu-autoloader to set the APCu prefix
2020-09-14 22:36:53 +02:00
d942c65e0c
Fix more warnings
2020-09-11 11:32:09 +02:00
1593b67230
Fix warnings on higher phpunit versions
2020-09-11 11:01:32 +02:00
f3936b82cd
Added test to cancel ProcessExecutor::asyncExecute
2020-09-08 11:33:41 +02:00
976fcd2eb4
PoolBuilderTest: Add case for multiple repositories and partial update with replace
2020-09-01 12:07:12 +02:00
6c4ed247dd
Add a pool builder test for replaces across multiple repos
2020-08-31 16:00:49 +02:00
1385412748
Merge branch 'master' into filter-packages
...
* master:
Add tests for edge cases of packages providing names which exist as real packages
Add another test verifying that a package may provide an incompatible version of sth that actually exists
Fix provider coexistence test, needs another requirement to install both
Fix test filename to end with .test extension so it gets run
Update config section to note required scope for GitLab tokens
Fix pre/post-package-install/update/uninstall events receiving a partial list of operations, fixes #9079
Also remove credentials from cache dirs in git/svn drivers, fixes #7439 , refs #9155
AuthHelper: Allow fall-through GitLab-specific HTTP headers for auth
Sanitize repo URLs to mask HTTP auth passwords from cache directory
Util/Zip: fix strpos args order
2020-08-28 14:52:58 +02:00
43093d0eeb
Add tests for edge cases of packages providing names which exist as real packages
2020-08-28 14:50:28 +02:00
140665eadd
Add another test verifying that a package may provide an incompatible version of sth that actually exists
2020-08-28 13:40:44 +02:00
85950f8e9a
Fix provider coexistence test, needs another requirement to install both
2020-08-28 13:40:44 +02:00
cf8ff2a75d
Fix test filename to end with .test extension so it gets run
2020-08-28 13:40:44 +02:00
c9201b8e40
PoolBuilderTest: Allow setting filter options for repositories
2020-08-28 13:07:11 +02:00
fcb9ef4899
Allow defining multiple reppos in pool builder tests
2020-08-28 12:15:19 +02:00
931a1ff1f8
AuthHelper: Allow fall-through GitLab-specific HTTP headers for auth
...
Previously, `AuthHelper` consumed the authentication credentials for GitLab domains and added access tokens as GitLab-specific headers.
[Composer repositories now supported in GitLab](https://php.watch/articles/composer-gitlab-repositories ) require standard Authorization headers with a personal access to function, which failed to work due to out GitLab-specific headers.
With this commit, AuthHelper checks if the password is an access token, and falls through to HTTP basic authentication even if the domain name is a GitLab domain name.
2020-08-27 12:13:28 +07:00
9a04ecefbf
Merge branch 'master' into filter-packages
2020-08-25 16:51:28 +02:00
6186c7f36f
Fix handling of root aliases in partial updates, fixes #9110
2020-08-25 11:05:28 +02:00
448daea696
Add support for detecting packages not matching only due to minimum stability
2020-08-23 16:48:07 +02:00
4d83783641
Fix test to avoid network usage
2020-08-23 16:03:00 +02:00
e745e59656
updated repositories-priorities4.test
2020-08-22 20:11:15 +03:00
f262feebec
fixing error message for higher repository priority, when higher repo has only a dev-branch
2020-08-22 20:07:13 +03:00
3e750b69f4
Fix name
2020-08-18 16:31:46 +02:00
a83588f568
The proper fix
2020-08-18 16:30:47 +02:00
99fd5c7b49
Add tests
2020-08-18 16:05:40 +02:00
4d20e6f5d6
Move Version util to Platform namespace, fix CS nitpicks, make regexes case insensitive for robustness, refs #9093
2020-08-13 15:48:41 +02:00
7e1ef19a5a
Expand library version checking capabilities ( closes #9093 )
2020-08-13 15:48:41 +02:00
657ae5519e
Add support for TAR in Artifact packages ( #9105 )
2020-08-12 20:30:58 +02:00
00f712a7c4
Revert "Allow specifying a version requirement for CLDR"
2020-07-30 21:00:43 +02:00
7bcde1481d
Fix git downloader syntax for windows cmd when updating packages, fixes #9089
2020-07-30 14:38:48 +02:00
5a02ea6a96
Check that class exists
2020-07-30 14:29:48 +02:00
404dea61c2
Allow specifying a version requirement for the relevant CLDR
2020-07-29 19:32:53 +02:00
d8fa746433
Merge pull request #9058 from Seldaek/zip-cleanup
...
Clean up Zip Util to be more strict about what is a valid package archive
2020-07-21 17:17:12 +02:00
c353ac835c
Add exception for multiple composer.json files ( #3 )
2020-07-21 17:10:26 +02:00
22367a68f9
Avoid loading same packages multiple times
2020-07-17 16:16:58 +02:00
23339e44b8
Fix alias tests to use default-branches
2020-07-17 16:15:19 +02:00
6ba0f3adf9
Merge branch 'master' into filter-packages
...
* master: (59 commits)
Update deps
Reuse repository manager and others directly from the Composer instance, refs #9057
Fix usage of create-project with local filesystem repos
Fix return value
Add support for multiple --repository additions in create-project, and make --add-repository delete the lock file, fixes #8853
Remove cygwin php handling in UAC elevation
Clean up a little to make impl less invasive and to handle replacers/providers
Supply event dispatcher in Create Project Command
Avoid attempting to use /etc/xdg as base config home, fixes #9053 , refs #9045
Create an issue @ Docker repository on tag
Mark transaction classes internal, refs #8827
Prepare 1.10.9 release
Remove highest/lowest builds for 1.10 maintenance branch
Fix bitbucket detection of redirects to login page, fixes #9041
Fix doc comment
Fixed spelling mistake
Add Windows UAC elevation to self-update command
GitLab: clarify interactive auth prompt
Improve support for XDG and default to XDG config dir if both that and ~/.composer are available, fixes #9045
Fix #9033 - inconsistent behavior with minor-only flag
...
2020-07-17 14:30:12 +02:00
433968de17
Fix usage of create-project with local filesystem repos
2020-07-17 11:30:03 +02:00
942562c382
Clean up Zip Util to be more strict about what is a valid package archive, fixes #8931
2020-07-16 17:36:46 +02:00
212fbc516e
Fix test issues
2020-07-02 08:12:25 +02:00
3d2d33dd58
Solver: Add missing rules and replace some with %A for pcre length limit
2020-06-26 22:11:13 +02:00
de3931c742
Revert "Remove unnecessary duplicate rule output from expected test result"
...
This reverts commit c78eb49b5e
2020-06-26 22:03:18 +02:00
c78eb49b5e
Remove unnecessary duplicate rule output from expected test result
2020-06-26 21:51:02 +02:00
2cfb60e683
Solver: Add test case for github issue 7051
2020-06-26 21:51:02 +02:00
bee91155a1
Fix guessing of default branch when HEAD is a non-feature-branch
2020-06-26 16:16:16 +02:00
05dacbdabb
Rename DEV_MASTER_ALIAS to DEFAULT_BRANCH_ALIAS
2020-06-25 08:56:14 +02:00
74d89d7110
Get rid of default branch handling in version guesser as it is way too time intensive at every initialization
2020-06-24 21:16:16 +02:00
ea0ce9dd7d
Merge branch 'master' into filter-packages
2020-06-22 18:38:16 +02:00
6d2b5c1950
Add missing class
2020-06-19 17:58:21 +02:00
7a37e78a30
Speed up installer tests by avoiding lots of bootstrapping and git processes
2020-06-19 17:56:13 +02:00
d19f5db568
Fix tests to use default-branch prop
2020-06-19 16:06:38 +02:00
6349764c2d
Fix root package handling of default-branch
2020-06-19 15:34:28 +02:00
6f0e5996de
Treat default branch name as a non-feature-branch no matter what it is called
2020-06-19 14:12:44 +02:00
f70d527f4f
Fix git tests
2020-06-17 17:53:00 +02:00
04381c70fe
Merge branch '1.10'
2020-06-17 17:37:39 +02:00
fb7fc4a4ca
Fix git tests
2020-06-17 16:59:43 +02:00
93d4cf6f91
Add --no-show-signature where git supports it, fixes #8966
2020-06-17 16:37:06 +02:00
83c64a9d19
Reuse operation formatting logic in downloaders
2020-06-17 12:33:02 +02:00
e5fe35d554
Update test description
2020-06-17 09:24:25 +02:00
c8731598cc
Merge branch '1.10'
2020-06-16 17:16:42 +02:00
ee58f25c00
Fix ZipDownloaderTest
2020-06-16 14:00:25 +02:00
3af617efe8
Parallelize zip extraction using async unzip processes
2020-06-16 14:00:20 +02:00
0dad963cd8
Add executeAsync to ProcessExecutor and allow Loop class to wait on it in addition to HttpDownloader
2020-06-16 14:00:19 +02:00
a797ee1322
Fix inline aliases not being loaded when extracting dev requirements, fixes #8954
2020-06-16 13:50:29 +02:00
6d9bf42655
Additional Util\RemoteFileSystem tests ( #8960 )
...
* RemoteFilesystemTest: simplifying some mock expectations calls
- will($this->returnValue()) to willReturn()
- will($this->returnCallBack()) to willReturnCallback()
* RemoteFilesystemTest: extracting identical mocks for IOInterface into a separate getIOInterfaceMock() method
* RemoteFilesystemTest: converting protected helper methods to private.
* RemoteFilesystemTest: moving getConfigMock() private method after the public methods (with other private methods)
* adding RemoteFileSystemTest::testCopyWithRetryAuthFailureFalse() unit test.
* Allow optional injecting of AuthHelper into RemoteFilesystem constructor.
* adding RemoteFileSystemTest::testCopyWithSuccessOnRetry() unit test.
* using backward compatible @expectedException in RemoteFilesystemTest.php
* RemoteFilesystemTest: extracting RemoteFilesystem with mocked method creation into a separate method.
* RemoteFilesystemTest: extracting AuthHelper with mocked method creation into a separate method.
2020-06-16 09:35:33 +02:00
fa799970ad
Replace whitelist with allow list
2020-06-07 22:15:09 +01:00
2fa58ccf96
Reduce amount of packages loaded by avoiding extensions of the constraint beyond the root constraint
2020-06-06 17:18:42 +02:00
4b9b499ce5
Fix issue loading aliases and fix markPackageNameForLoading when called twice in a row for same package it would overwrite the constraint the second time
2020-06-06 17:16:54 +02:00
b7f1550896
Add test covering replacer unfixing
2020-06-06 15:20:14 +02:00
f2befc46c9
Avoid storing duplicate packages when loading the same package twice
2020-06-05 17:13:39 +02:00
67a88880ec
Get rid of EmptyConstraint
2020-06-05 16:52:24 +02:00
c7f10bdd90
Fixed RuleTest
2020-06-05 16:52:24 +02:00
bde9502473
Made the constraint argument in Link mandatory
2020-06-05 16:52:24 +02:00
63906171f0
Cleanup EmptyConstraint output
2020-06-05 16:52:24 +02:00
b935a76bc6
Removed already covered test
2020-06-05 16:52:24 +02:00
8b4e834675
Added another poolbuilder test to show issue with constraint matching
2020-06-05 16:52:24 +02:00
71fde80048
Fixed test
2020-06-05 16:52:24 +02:00
29611a4d27
Fixed test descriptions
2020-06-05 16:52:24 +02:00
8e2dd62d10
Fixed tests related to constraint changes
2020-06-05 16:52:24 +02:00
bca88bdd4b
Fixed PoolBuilder running endlessly when packages do not exist
2020-06-05 16:52:24 +02:00
28f82032cd
And here's the key test :)
2020-06-05 16:52:24 +02:00
b87fc5bbfd
Added more poolbuilder test
2020-06-05 16:52:24 +02:00
43888cae8c
PoolBuilder: failing test for partial update with multiple deps
2020-06-05 16:52:24 +02:00
4f13875f3f
PoolBuilderTest: add new fixtures for partial updates with locked packages
2020-06-05 16:52:24 +02:00
85ea29d241
PoolBuilder failing test: do not load alternatives for pkg replaced by fixed pkg
2020-06-05 16:52:24 +02:00
208a735645
PoolBuilder Failing test: fixed package is not only pkg loaded for that name
2020-06-05 16:52:24 +02:00
a4a617abb4
Reduce amount of Filesystem/ProcessExecutor instantiations, add lots of docblocks
2020-06-04 16:08:23 +02:00
a66a939b76
Merge pull request #8937 from Seldaek/optim-rules
...
Optimize rule creation for alias packages
2020-06-03 14:17:13 +02:00
fafa959933
Add test to assert prefer-lowest behavior when conflicting branches prevent absolute lowest version from being installed, closes #7408
2020-06-03 08:34:25 +02:00
5a4709c3d6
Optimize rule creation for alias packages
...
This mainly benefits projects running updates with minimum-stability: dev
2020-06-02 13:44:56 +02:00
1ea3111583
Use RULE_LEARNED instead of RULE_FIXED
2020-06-02 13:21:05 +02:00
5e5f9f8142
Remove unused RULE_INTERNAL_ALLOW_UPDATE
2020-06-02 11:22:35 +02:00
c8efb50d39
Change the single requirement ignore from --ignore-platform-reqs=xx to --ignore-platform-req=xx to avoid BC issues
2020-06-02 11:22:09 +02:00
2ddf4346ef
Improve error reporting for RULE_PACKAGE_ALIAS
2020-06-02 10:35:04 +02:00
0ea9eafcaf
Add rules for aliased packages when an alias is added, fixes #8902
2020-06-02 10:07:20 +02:00
dfccf8c091
Add failing test reproducing the problem of #8902
2020-06-02 10:00:09 +02:00
537402f814
Add tests for #8861
2020-06-01 16:01:43 +02:00
e85da00dff
Add a way to ignore only some packages in --ignore-platform-reqs, and make the platform check ignore those packages which were ignored as requirements, fixes #8861
2020-06-01 15:43:24 +02:00
21e708f2c4
Remove upper bound PHP version checks from platform-check as there is not enough value added and it risks causing issues
2020-06-01 09:39:44 +02:00
b72ac2d01a
Oops
2020-05-26 19:55:40 +02:00
863e7076ba
Bump to use composer/semver 3.x
2020-05-26 19:18:34 +02:00
d72a07db06
Fix tests
2020-05-22 13:28:47 +02:00
4e1f8cf89d
Build tweaks
2020-05-20 16:20:54 +02:00
45d3e133a4
Avoid checking for unbounded constraints in platform checks
2020-05-19 17:15:08 +02:00
98e5f81a5f
Fix detection of fixed package problems to include more cases, fixes #8910
2020-05-19 12:17:25 +02:00
22622372bc
Fix complete test suite for v2
2020-05-06 13:23:52 +02:00
f73c8c419c
Merge pull request #8869 from naderman/replace-semver-test
...
Adding a test to verify replace version overlap with unbound constraints and single versions
2020-05-06 10:53:45 +02:00
dd0c8b4278
Merge pull request #8723 from helhum/fix-package-sorting
...
Fix package sorting
2020-05-06 10:47:01 +02:00
ff0717ad66
Merge pull request #8859 from Seldaek/deduplicate-problems
...
Deduplicate require/conflict rules which are the same but for different versions of the same package
2020-05-05 16:19:07 +02:00
419567ba6d
Update VersionSelector to take all platform requirements into account when selecting packages
2020-05-04 21:16:41 +02:00
d15447c454
Add test for replace version overlap
2020-05-04 11:24:11 +02:00
c23670c3ec
Add Util\AuthHelper unit test coverage ( #8863 )
...
* Add AuthHelper::addAuthenticationHeader() test on missing authentication credentials.
* Add AuthHelper::addAuthenticationHeader() test on bearer password.
* Add AuthHelper::addAuthenticationHeader() test on Github token.
* Add AuthHelper::addAuthenticationHeader() test on Gitlab Oauth token.
* Add $authenticationDisplayMessage write expectation to AuthHelper::addAuthenticationHeader() tests.
* Add AuthHelper::addAuthenticationHeader() test on Gitlab private token.
* Add AuthHelper::addAuthenticationHeader() test on Bitbucket Oauth token.
* Add AuthHelper::addAuthenticationHeader() test on Bitbucket public urls.
* Add AuthHelper::addAuthenticationHeader() test on Basic Http Authentication.
* Add AuthHelper::isPublicBitBucketDownload() tests.
* Rename AuthHelperTest $credentials variable to $auth.
* Add AuthHelper::storeAuth() test for auto-store option.
* Add AuthHelper::storeAuth() test for user prompt and y(es) answer.
* Add AuthHelper::storeAuth() test for user prompt and n(o) answer.
* Add AuthHelper::storeAuth() test for user prompt with invalid answer.
* Add AuthHelper::promptAuthIfNeeded() test for Github authentication failure.
- add GitHub hard dependency mock (new GitHub(...) mock)
* Run AuthHelper::promptAuthIfNeeded() tests only with PHP > 5.3
* Run AuthHelper::promptAuthIfNeeded() tests only with PHP >= 5.4
* Run AuthHelper::promptAuthIfNeeded() tests only with PHP 5.4
* Exclude PHPStan analyses of '../tests/Composer/Test/Util/Mocks/*'
* Exclude AuthHelper::promptAuthIfNeeded() tests from current pull request.
* Extract repetitive AuthHelperTest authentication expectation into a method.
2020-05-04 09:48:23 +02:00
7c891701e6
Fix package sorting
...
PackageSorter weighs the importance of a package
by counting how many times it is required by other packages.
This works by calculating the weight for each package name.
However currently the package index of the package array
is currently passed the weigh function, which basically
disables package sorting.
The reason for that is, that a package repository previously
returned the package list as associative array with package name as keys,
but currently just as an array with integer keys.
Therefore we must extract the package name from the package
before passing it to the weigh function.
2020-05-03 16:31:47 +02:00
3a64acb53e
Make sure versions are ordered also in the satisfied by package lists
2020-05-01 15:54:01 +02:00
56a11b9c2c
Deduplicate require/conflict rules which are the same but for different versions of the same package, fixes #8851
2020-05-01 15:41:54 +02:00
74a63b4d6b
Merge branch '1.10'
2020-04-30 21:31:29 +02:00
270c7c3262
Backport validation support for composer-runtime-api ( #8842 )
...
Fixes #8841
2020-04-28 16:04:00 +02:00
b9be78b689
Additional Util\Bitbucket class test coverage ( #8835 )
2020-04-28 11:45:30 +02:00
6a6ea6057f
Handle provider/replacer packages and avoid checking extensions which are provided by packages, refs #8546
2020-04-24 13:38:50 +02:00
d494df61ff
Make sure platform-check returns a non-0 exit code if it fails
2020-04-24 13:25:13 +02:00
d89342dc43
Fix tests
2020-04-24 09:07:32 +02:00
df0cada93f
Add test for #8669
2020-04-23 15:11:21 +02:00
34801239f1
Tweak problem wording slightly
2020-04-23 13:17:34 +02:00
8a1e9744a0
Fix tests
2020-04-23 10:29:22 +02:00
7049bbb714
Switch require_once to require for autoload_static as the once variant seems unnecessary
2020-04-22 17:05:37 +02:00
1000d49145
Fix error reporting when the root version changed since the last update, and does not match circular deps in lock file anymore
2020-04-22 14:02:09 +02:00
0d1922dc27
Add a Composer\Versions class which is available in all projects at runtime to query installed packages/versions
2020-04-22 12:10:09 +02:00
bf39fab82d
Add test for root alias presence in lock
2020-04-21 23:01:20 +02:00
2c8a4a1b93
Add platform-check config option to disable platform_check.php generation, and disable it for Composer
2020-04-21 15:25:35 +02:00
afa18f2092
Fix semver usage
2020-04-21 15:13:01 +02:00
c9846d4d3c
Merge pull request #8812 from nicolas-grekas/ext-check
...
Optimize extension checks
2020-04-21 11:45:26 +02:00
75f4116417
Merge pull request #8811 from Seldaek/fix-transaction-order
...
Fix transaction order
2020-04-21 11:38:59 +02:00
6463ab9e49
Optimize extension checks
2020-04-21 09:35:34 +02:00
e23710f92d
Implemented php version check in autoload.php ( #8546 )
2020-04-21 08:59:36 +02:00
ba9d4793bc
Fix transaction order
2020-04-20 22:24:00 +02:00
17ed09be2e
Add failing test showing that packages fail to be installed if they match a previous alias which was not removed yet
2020-04-20 21:50:06 +02:00
82502684b2
Allow testing for installed repo state
2020-04-20 21:44:15 +02:00
3f338ee8d9
Make sure versions are sorted before they get trimmed in error output
2020-04-19 15:51:30 +02:00
80a7c40c76
Shorten long lists of similar versions in problem output, fixes #8743
2020-04-15 16:47:44 +02:00
3e8021ed06
Add package naming pattern to the composer.json JSON schema
...
fixes #8749
2020-04-15 13:43:05 +02:00
44a4429978
Remove PEAR installer/downloader/repos/..., fixes #8778
2020-04-15 00:24:13 +02:00
876136022b
Merge remote-tracking branch 'origin/1.10'
2020-04-13 12:41:30 +02:00
62fda2ed85
Reorg ComposerRepository to fix tests
2020-04-13 12:10:31 +02:00
280f02b4bc
Update HTTP URLs to their HTTPS if they already redirect automatically
2020-04-13 06:22:02 +07:00
960fa4b205
Allow duplicate dashes in package names
...
fixes #8749
1.10 implementation of #8750
2020-04-10 19:01:06 +02:00
b6bad4eef6
Add options to configure repository priorities
2020-04-09 13:39:06 +02:00
8930f1b824
Add color to lock operations and dry run output
2020-04-08 15:18:28 +02:00
64f907f93f
Fix handling of aliases to use consistent format everywhere
2020-04-08 12:31:02 +02:00
c30925e68d
extracted `VersionParser::DEV_MASTER_ALIAS` ( #8742 )
2020-04-07 15:49:07 +02:00
80505e745e
Fix phpstan issues
2020-04-07 14:40:51 +02:00
25cd2382cb
Raise phpstan level to 1 ( #8027 )
2020-04-07 14:13:50 +02:00
e09dd9c10d
Detect packages which are only available in lock file and warn appropriately
2020-04-07 13:06:04 +02:00
8945936dbd
Deduplicate solver problems which list problems for dev-master AND 9999999-dev
2020-04-07 13:06:03 +02:00
f38e969b02
Update test expected output to different formatting
2020-04-07 11:16:13 +02:00
80a5fdf398
Remove obsolete rules and their generation
...
The only automatic conflict we have results from packages using the same name
either by literally having the same name and being different versions or they
replace the same name, so
- removed all types of obsolete rules
- simplified rule generation significantly
- got rid of provide filtering in the pool
- fixed some language in error handling
2020-04-07 11:11:18 +02:00
4e3d989978
A package providing a name should not conflict with a package replacing it
...
Simplified whatProvides, mustMatchName is unused, removed unused
function from policy
2020-04-07 11:08:47 +02:00
8072ec9b7c
Number 2: Adjust forgotten error message in test to new language
2020-04-02 16:31:30 +02:00
ce0c2d44cd
Adjust forgotten error message in test to new language
2020-04-02 16:20:54 +02:00
4fab2c7759
Error wording use "thus cannot" instead of "can thus not"
2020-04-02 16:02:17 +02:00
88e3f24b91
Fix description of test case
2020-04-02 15:42:42 +02:00
9858718ef6
Give a clearer error message explaining how to update a conflicting locked dependency
2020-04-02 15:32:02 +02:00
379baa1560
Merge pull request #8717 from naderman/t/pool-builder-allow-list
...
Move processing of partial update argument list into the pool builder
2020-04-02 12:53:02 +02:00
f7b5cbd1fc
Lock file should not contain new aliases for packages which were not updated
2020-04-02 01:12:34 +02:00
5ad93959cf
PoolBuilder: On partial update of a new dep with mutual replace, unfix replacer
...
Test also verifies provider does not get uninstalled in partial update
for another package name
2020-04-02 00:54:49 +02:00
613450e58a
PoolBuilder: properly clean up alias packages when unfixing packages
...
Prevent aliases to be duplicated: no need to apply root aliases from
composer.json on packages currently locked, they should have their
aliases in the lock file, otherwise request an update.
2020-04-02 00:08:53 +02:00
14000e7575
PoolBuilder: Ensure alias references get removed when unfixing a locked package
...
Use the last key + 1 for an index instead of count, since we unset elements somtimes
2020-04-01 16:40:45 +02:00
c270d3cfa6
PoolBuilder: make io non-nullable, NullIO can be used instead
2020-04-01 15:27:51 +02:00
9fb09049ff
Rename and document constants for partial update behavior
2020-03-30 16:21:27 +02:00
1b1d59ee6c
Make FileDownloader always download file first in vendor-dir/composer/$tmp instead of next to install path to avoid issues with custom installers not being loaded when downloading on first install, and use cleanup method properly
2020-03-28 20:38:50 +01:00
ef42d323b1
Test: partial update adding a new dep on a locked package should mark it for update
2020-03-27 23:07:02 +01:00
443553423b
Mark replaced packages for update when using --with-dependencies
...
This is necessary to allow the requiring of new packages which replace
packages currently locked without requiring explicitly listing them as
an argument, so simplifies the composer require command
2020-03-27 22:59:00 +01:00
17b50157e4
Test: composer update new/plg --with-dependencies updates locked transitive deps
2020-03-27 22:46:54 +01:00
392d0abd21
Rename test files and standardize on allow list rather than whitelist
2020-03-27 22:15:04 +01:00
01fe92905a
The update allow list is now generated while building the pool
...
This reduces code complexity while making partial updates more
predictable. This also allows composer require to successfully run a
partial update for a new package with transitive dependency updates.
2020-03-27 21:41:49 +01:00
fd63588dce
Fixed up tests
2020-03-19 13:27:23 +00:00
7a05286f55
Fix build
2020-03-13 13:33:54 +01:00
70f23e42f3
Fix tests
2020-03-13 11:26:12 +01:00
e15f7d6bb7
Merge branch 'master' into 2.0
2020-03-13 11:18:23 +01:00
33479f00ab
Add backticks to test.
2020-03-12 23:20:10 -04:00
08cee4c3e9
Implement getProviders equally on all repos
2020-03-12 15:39:26 +01:00
d09daa8d5a
Merge pull request #8684 from naderman/dev-require-errors
...
Handle dev extraction exit codes instead of completing broken lock with errors
2020-03-12 13:20:55 +01:00
ee8df484c4
Separate createPool and createPoolWithAllPackages, fix test description
2020-03-12 13:17:04 +01:00
3ec59204fc
Update test: require-dev is now allowed to satisfy providers from require
2020-03-12 12:28:46 +01:00
73a5cc63cc
Always use Removing for consistency between dry-run and actual install
2020-03-12 08:12:12 +01:00
1f467046d7
Implement getProviders on reposet for all repo types and add replacers
...
This way errors during require dev extraction make more sense
2020-03-11 17:38:16 +01:00
589aa351a8
Change Uninstalling to Removing in lock operations
2020-03-11 16:44:08 +01:00
a7a975ec1c
Alias dev-master/trunk/default to 9999999-dev instead of normalizing the version to that, fixes #8323
2020-03-11 15:04:18 +01:00
97e2a249e8
Merge branch 'master' into 2.0
2020-03-11 09:34:55 +01:00
ffac8646fc
Fix tests
2020-03-11 09:34:40 +01:00
3e82542812
Fix test
2020-03-10 17:11:19 +01:00
c033644f8b
Present lock changes alphabetically, with uninstalls first, then all install/updates mixed
2020-03-10 16:08:40 +01:00
24a5a0dacb
Skip invalid PSR-0/4 classes from optimized autoloader, fixes #8403
2020-03-10 15:40:45 +01:00
d63eb8179e
Merge branch 'master' into 2.0
2020-03-10 14:05:33 +01:00
6d3d7c39ac
Merge pull request #8621 from remorhaz/master
...
Fix incorrect --no-dev handling of replaced packages
2020-02-28 23:49:09 +01:00
9cab8c10cc
Merge branch 'master' into 2.0
2020-02-28 13:31:56 +01:00
0b9c658bef
Add plugin-api-version used to generate a lock file in itself
2020-02-28 10:21:24 +01:00
8df263a756
Test added for issue #8622 fix
2020-02-26 17:39:54 +02:00
0ad322e51f
Fix tests
2020-02-14 16:55:21 +01:00
bc002ae1fb
Merge branch 'master' into 2.0
2020-02-14 15:42:17 +01:00
d665ea7ea9
After update and install commands display how many packages want funding
2020-02-14 10:08:36 +01:00
5c4f524d6a
Add funding field to composer.json
...
You can specify a list of funding options each with a type and URL. The
type is used to specify the kind of funding or the platform through
which funding is possible.
2020-02-14 10:08:35 +01:00
2d8a8ed7e3
Add InstalledRepository to clean up some concepts and usages, remove BaseRepository
2020-02-13 21:44:24 +01:00
c5c6d44a0b
Refactor away some unnecessary RepositorySet usages
2020-02-13 17:51:22 +01:00
44d1e15294
Simplify suggester output when updating, refactor suggest command to reuse SuggestedPackagesReporter and make smarter defaults, fixes #6267
2020-02-13 16:13:29 +01:00
5d8dc48bd4
Fix test on windows
2020-02-13 10:05:42 +01:00
Jordi Boggiano