1
0
Fork 0
Commit Graph

7236 Commits (6aec6ecbfa0335eadf8232c609b21891f0b7e1bc)

Author SHA1 Message Date
John Stevenson 8f974fe741 Improve Windows escaping 2021-10-10 16:24:49 +01:00
Jordi Boggiano cb1e248258
Fix type annotation 2021-10-05 09:47:20 +02:00
Jordi Boggiano 18e24976c1
Merge branch '1.10' 2021-10-05 09:43:00 +02:00
Jordi Boggiano ca5e2f8d50
Fix escaping issues on Windows which could lead to command injection, fixes GHSA-frqg-7g38-6gcf 2021-10-05 09:39:50 +02:00
Jordi Boggiano b3eebeb3b9
Merge pull request from GHSA-frqg-7g38-6gcf 2021-10-05 09:28:42 +02:00
Jordi Boggiano 532c6e7933
Fix show --all showing only the installed version if the package is installed, fixes #10095 2021-10-02 22:15:34 +02:00
Jordi Boggiano a7963b7fed
Fix ComposerRepository handling of offline state to allow resolution as long as everything is present in the cache, fixes #10116 2021-10-02 21:22:25 +02:00
Stephan edccad4e05
VcsRepository: do not continue when receiving 429 rate limit exception (#10132) 2021-10-02 20:40:49 +02:00
Sergii Dolgushev 90d112d98a
Mask Git credentials in the error message (#10115) 2021-10-02 20:30:21 +02:00
Jordi Boggiano d64d1adf61
Rewrite php file cleaning step to be less regex intensive and support extreme cases better, fixes #10106 (#10107) 2021-10-02 14:39:39 +02:00
Vitaly Baev 7305d50277
Changed GitLab's applications URL (#10104) 2021-09-15 13:16:51 +02:00
Jordi Boggiano d6a8b0252d
Fix phpdoc 2021-09-15 11:31:58 +02:00
Jordi Boggiano 8cd2d0e541
Fix scanning of classmaps in files containing invalid Unicode, fixes #10102 2021-09-15 11:31:43 +02:00
SvenRtbg 5c4e1cedb2
Add ability check for ZipArchive (#10092)
ZipArchive::setExternalAttributesName() is only available when libzip 0.11.2 or higher is present. 
This is not the case with at least SUSE SLES 12, so a simple PHP version check will not work here.
2021-09-13 22:30:02 +02:00
Jordi Boggiano 8657f80ddd
Fix error output to be clearer when running composer.phar without phar extension, fixes #10097 2021-09-13 21:46:28 +02:00
Jordi Boggiano 6179f33c74
Fix docker being seen as WSL when run inside WSL, fixes #10094 2021-09-13 21:11:55 +02:00
Jordi Boggiano 4bcd860b65
Add more type annotations 2021-09-05 17:34:12 +02:00
Jordi Boggiano dd49db6f08
Make sure that names with wildcards which are not preceded by dots are also seen as package names and not version constraints 2021-09-05 09:56:28 +02:00
Jordi Boggiano 6c9aecf4e7
Ignore all symfony deprecations 2021-09-03 21:39:06 +02:00
Alexander Schranz 99c6b450e6
Check for returned link header in GithubDriver 2021-09-02 19:17:17 +02:00
Jordi Boggiano 01d734125c
Add more type info 2021-08-30 17:45:35 +02:00
Jordi Boggiano 0761474599
Add type info to many properties/methods 2021-08-30 14:46:49 +02:00
Jordi Boggiano fc04c86f82
Add type info to Autoload namespace 2021-08-30 13:58:31 +02:00
Jordi Boggiano 61fba697a0
Fix validating array loader handling of invalid target branch datatype 2021-08-30 13:43:33 +02:00
Jordi Boggiano 024f0eda53
Add a bunch of type info to Util namespace 2021-08-29 20:07:50 +02:00
Jordi Boggiano 8559279025
Merge pull request #10076 from aschempp/bugfix/package-type-update
Correctly resolve promises when package type changes
2021-08-29 14:16:01 +02:00
Jordi Boggiano b8e461ea61
Make sure /proc/version read does not fail the process ever, closes #10080 2021-08-29 13:10:22 +02:00
Jordi Boggiano 0158436fb4
Fix list command not showing plugin commands, fixes #10075 2021-08-29 13:03:45 +02:00
Jordi Boggiano 922ba01d07
Merge pull request #10072 from jrfnl/feature/10067-fix-classmap-regression
ClassMapGenerator: stabilize the heredoc/nowdoc stripping
2021-08-29 12:26:20 +02:00
Jordi Boggiano d8054d1d2f
Add more possessive quantifiers, unicode flag and support for more post-heredoc syntax, fix test file syntax being invalid 2021-08-29 12:23:02 +02:00
Andreas Schempp 0bed60e631 Correctly resolve promises when package type changes 2021-08-25 22:35:34 +02:00
Jordi Boggiano 73c109c561
Make sure that names with wildcards which are not preceded by dots are also seen as package names and not version constraints 2021-08-25 21:09:49 +02:00
Jordi Boggiano 6ab1b6a7d2
Regex simplifications 2021-08-23 22:18:03 +02:00
Jordi Boggiano f6c446bdd7
Tweak to allow matching delimiter within the string 2021-08-23 13:14:15 +02:00
Jordi Boggiano c44be998ab
Undo new stripping code and fix regex 2021-08-23 13:14:02 +02:00
powellblyth 5e75017166
Just some comments with 'it's' that should have been 'its' (#10071)
Co-authored-by: Toby Powell-Blyth <tobypowell-blyth@elasticstage.com>
2021-08-22 13:41:18 +02:00
jrfnl 40bd4b03ad
ClassMapGenerator: stabilize the heredoc/nowdoc stripping
I've looked into 10067 and have come to the conclusion that using a single regex to strip the heredoc/nowdocs is always going to run into trouble as:
* Either the matching will be too greedy (issue 10067);
* Or the matching will run into backtrace limits for large heredoc/nowdocs.

We cannot solve both within a single regex.

So, I'm proposing a slightly different solution which should support both and should also improve performance for files containing large heredoc/nowdocs.

The `stripHereNowDocs()` function will find a start marker and remember the offset of the start marker.
It will then find the end marker and strip the contents between the two (replace with `null`).
The function will then recurse onto itself until all heredocs/nowdocs in a file have been removed.
2021-08-21 17:45:43 +02:00
Jordi Boggiano d3c176ec69
PHPStan Level 5 (#10070)
* Bump PHPStan to level 5

* Update seld/phar-utils to latest

* Add phpstan-setup / phpstan scripts
2021-08-21 17:41:52 +02:00
Jordi Boggiano b583310476
Allow ircs protocol for support.irc 2021-08-19 16:03:59 +02:00
Jordi Boggiano 74b231a4bc
Fix lib-openssl detection on FreeBSD, fixes #10046 2021-08-19 15:00:08 +02:00
Jordi Boggiano 9727adf63b
Fix init performance when plugin commands are not needed, fixes #10064 2021-08-19 14:37:50 +02:00
Jordi Boggiano a586a753df
Fix all remaining php8.1 test suite deprecations 2021-08-19 13:00:30 +02:00
Jordi Boggiano b77fce8a4f
More deprecation fixes by using ProcessExecutorMock and a couple of PackageInterface type fixes 2021-08-18 23:35:27 +02:00
Jordi Boggiano 6aa2d15868
Introduce ProcessExecutorMock to fix deprecations and amount of mocking pain 2021-08-18 17:17:56 +02:00
Jordi Boggiano c5a02a2b58
Fix return value of ProcessExecutor::getErrorOutput, closes #10054 2021-08-18 14:55:38 +02:00
Jordi Boggiano 052065028f
Merge pull request #10051 from jrfnl/feature/php-8.1-null-to-non-nullable-fix-1
PHP 8.1: prevent a "null to non-nullable" deprecation notice [1]
2021-08-18 14:36:14 +02:00
Jordi Boggiano 3dcc6c1514
Make return value explicit 2021-08-18 14:32:06 +02:00
Jordi Boggiano cfe718fa43
Fix usage of getRequiredPackage, closes #10052 2021-08-18 14:30:09 +02:00
Jordi Boggiano 8ce0ea300e
Fix pear repo preventing self-update from functioning, fixes #10049 2021-08-18 14:23:08 +02:00
Jordi Boggiano 5c201687e5
Fix 7zip issues on windows when mixing forward and backslashes, fixes #10058 2021-08-18 11:55:51 +02:00
Jordi Boggiano 91a1a471db
Fix path repo bug causing symlinks to be left behind when uninstalling, fixes #10023 2021-08-18 11:25:00 +02:00
Jordi Boggiano d465df434c
Make sure diagnose command can run without proc_open, refs #9253 2021-08-18 10:16:20 +02:00
Jordi Boggiano 60fe67086e
Make sure proc_open is not required for basic installs, refs #9253 2021-08-18 10:15:47 +02:00
Jordi Boggiano d6f4111f35
Fix php 5.3 support 2021-08-17 16:59:00 +02:00
Jordi Boggiano 46f2d9de48
Fix php 5.3 support 2021-08-17 16:53:16 +02:00
Jordi Boggiano ddd7920d2a
Fix corrupt archives in cache from getting the installs stuck forever, and make sure it fails only once, fixes #10028 2021-08-17 16:49:36 +02:00
Jordi Boggiano e49f24e355
Switch phar signatures to sha512 2021-08-17 15:58:27 +02:00
jrfnl 609007b072 PHP 8.1: prevent a "null to non-nullable" deprecation notice
Discovered while running the existing unit tests on PHP 8.1.

The default state of the protected `$distUrl` property is "not set" and the property may not be set when the `Package::setSourceDistReferences()` method gets called.

Fixes a total of 9 deprecation notices along the lines of:
```
Deprecation triggered by Composer\Test\DependencyResolver\PoolBuilderTest::testPoolBuilder:
preg_match(): Passing null to parameter #2 ($subject) of type string is deprecated

Stack trace:
0 [internal function]: Symfony\Bridge\PhpUnit\DeprecationErrorHandler->handleError(8192, '...', '...', 597)
1 src/Composer/Package/Package.php(597): preg_match('...', NULL)
2 src/Composer/DependencyResolver/PoolBuilder.php(360): Composer\Package\Package->setSourceDistReferences('...')
3 src/Composer/DependencyResolver/PoolBuilder.php(338): Composer\DependencyResolver\PoolBuilder->loadPackage(Object(Composer\DependencyResolver\Request), Object(Composer\Package\CompletePackage))
4 src/Composer/DependencyResolver/PoolBuilder.php(195): Composer\DependencyResolver\PoolBuilder->loadPackagesMarkedForLoading(Object(Composer\DependencyResolver\Request), Array)
5 src/Composer/Repository/RepositorySet.php(229): Composer\DependencyResolver\PoolBuilder->buildPool(Array, Object(Composer\DependencyResolver\Request))
6 tests/Composer/Test/DependencyResolver/PoolBuilderTest.php(110): Composer\Repository\RepositorySet->createPool(Object(Composer\DependencyResolver\Request), Object(Composer\IO\NullIO))
...
```

Side-note: I'm wondering why `$this->getDistUrl()` is used instead of using the `$distUrl` property. It is a property within the same class after all. Haven't changed it, but did want to raise the question.

Refs:
* https://www.php.net/manual/en/function.preg-match.php
* https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg
2021-08-12 02:45:29 +02:00
jrfnl 42c6a0d7c5 ClassMapGenerator: fix the regex
By using a look ahead assertion to match "new line - maybe whitespace - marker", the negative performance impact of the `.*` is significantly mitigated and backtracing will be severely limited.

This fixes the bug as reported in 10037.

The bug was discovered due to a PHP 8.1 "passing null to non-nullable" deprecation notice being thrown, but is not a PHP 8.1 bug.

In actual fact, this issue affected all PHP versions and could lead to incomplete classmaps when the code base contained files with huge heredocs/nowdocs.

The regex change (not completely) incidentally also fixes an issue with markers in a heredoc/nowdoc not being correctly handled. This bug could lead to "classes" being added to the class map which aren't actually classes.

Fixes 10037
2021-08-11 22:26:12 +02:00
Stephan c65bd832d6
Url: fix sanitize for new github tokens (#10048) 2021-08-11 13:24:41 +02:00
Juliette c7d11f361c
PHP 8.1: fix more return type deprecation warnings (#10039)
Follow up on 10008 and the various commits made for that.

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
2021-08-11 13:06:47 +02:00
Juliette f5a0dfeb50
PHP 8.1: fix deprecation warnings about incorrect default values (#10036)
* PHP 8.1/Tests: fix some deprecation warnings

The default value for the `preg_split()` `$limit` parameter is `-1`, not `null`.

Fixes numerous `preg_split(): Passing null to parameter #3 ($limit) of type int is deprecated` notices when running the test suite.

Ref: https://www.php.net/manual/en/function.preg-split.php

* PHP 8.1/NoProxyPattern: fix deprecation warning

The default value for the `preg_split()` `$limit` parameter is `-1`, not `null`.

Fixes some `preg_split(): Passing null to parameter #3 ($limit) of type int is deprecated` notices when running the test suite.

```
Deprecation triggered by Composer\Test\Util\Http\ProxyManagerTest::testGetProxyForRequest:
preg_split(): Passing null to parameter #3 ($limit) of type int is deprecated

Stack trace:
0 [internal function]: Symfony\Bridge\PhpUnit\DeprecationErrorHandler->handleError(8192, '...', '...', 42)
1 src/Composer/Util/NoProxyPattern.php(42): preg_split('...', '...', NULL, 1)
2 src/Composer/Util/Http/ProxyManager.php(148): Composer\Util\NoProxyPattern->__construct('...')
3 src/Composer/Util/Http/ProxyManager.php(50): Composer\Util\Http\ProxyManager->initProxyData()
4 src/Composer/Util/Http/ProxyManager.php(59): Composer\Util\Http\ProxyManager->__construct()
5 tests/Composer/Test/Util/Http/ProxyManagerTest.php(75): Composer\Util\Http\ProxyManager::getInstance()
...
```

Ref: https://www.php.net/manual/en/function.preg-split.php

* PHP 8.1: fix deprecation warnings / http_build_query()

This fixes all relevant calls to the PHP native `http_build_query()` function.
The second parameter of which is the _optional_ `$numeric_prefix` parameter which expects a `string`.

A parameter being optional, however, does not automatically make it nullable.

As of PHP 8.1, passing `null` to a non-nullable PHP native function will generate a deprecation notice.
In this case, these function calls yielded a `http_build_query(): Passing null to parameter #2 ($numeric_prefix) of type string is deprecated` notice.

Changing the `null` to an empty string fixes this without BC-break.

Fixes a few deprecation warnings found when running the tests.

Refs:
* https://www.php.net/manual/en/function.http-build-query.php
* https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg

* PHP 8.1: fix deprecation notices / PharData::__construct()

This fixes all relevant calls to the PHP native `PharData::__construct()` method.

The second parameter of this method is the _optional_ `$flags` parameter which expects an `int` of flags to be passed to the `Phar` parent class `RecursiveDirectoryIterator`.
Fixed by passing the default value for the `$flags` parameter as per the `RecursiveDirectoryIterator::__construct()` method.

The third parameter of the method is the _optional_ `$alias` parameter which expects an `string`.
Fixed by passing an empty string.

Fixes various notices along the lines of:
```
Deprecation triggered by Composer\Test\Package\Archiver\ArchiveManagerTest::testArchiveTar:
PharData::__construct(): Passing null to parameter #2 ($flags) of type int is deprecated

Stack trace:
0 [internal function]: Symfony\Bridge\PhpUnit\DeprecationErrorHandler->handleError(8192, '...', '...', 55)
1 src/Composer/Package/Archiver/PharArchiver.php(55): PharData->__construct('...', NULL, NULL, 2)
2 src/Composer/Package/Archiver/ArchiveManager.php(193): Composer\Package\Archiver\PharArchiver->archive('...', '...', '...', Array, false)
3 tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php(65): Composer\Package\Archiver\ArchiveManager->archive(Object(Composer\Package\CompletePackage), '...', '...')
...
```

Refs:
* https://www.php.net/manual/en/phardata.construct.php
* https://www.php.net/manual/en/recursivedirectoryiterator.construct.php

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
2021-08-11 13:05:45 +02:00
Jordi Boggiano 2665f1b282
Fix private property access, fixes #10022 2021-07-28 14:33:47 +02:00
Jordi Boggiano 2fb53232d1
Fix usage on symfony 2.x, fixes #10022 2021-07-28 14:19:19 +02:00
Jordi Boggiano deb4c48bbc
Avoid using an invalid path for InstalledFilesystemRepo in create-project and use an array repo instead, fixes #10020, fixes #10021 2021-07-23 10:09:31 +02:00
Jordi Boggiano 1f4401005c
Allow default_socket_timeout to extend the curl timeout if it is longer than 300s, fixes #10018 2021-07-23 09:51:57 +02:00
GeoSot e07d2a7bef
Respect parent setting, handling exceptions (#10017) 2021-07-22 15:14:15 +02:00
Jordi Boggiano 2f83338d2f
Fix hopefully last php 8.1 deprecation warnings 2021-07-22 13:54:18 +02:00
Jordi Boggiano 24f5e54fbe
Fix only/exclude to avoid matching names as sub-strings of full package names, fixes #10001 2021-07-22 13:47:31 +02:00
Jordi Boggiano 29a52ff463
Register ErrorHandler early to catch deprecation notices while the Application is being initialized 2021-07-22 12:58:14 +02:00
Jordi Boggiano 2be03f0d60
More fixes for php8.1 deprecations 2021-07-22 12:42:01 +02:00
Jordi Boggiano a7efb27338
More php8.1 deprecation fixes, refs #10008 2021-07-22 11:48:30 +02:00
Jordi Boggiano 47cf602f9e
Fix more PHP 8.1 deprecations, refs #10008 2021-07-22 11:30:01 +02:00
Jordi Boggiano 10ae1d7b08
Fix some PHP 8.1 deprecation warnings, fixes #10008 2021-07-21 15:13:24 +02:00
Jordi Boggiano f5a03b950d
Improve error reporting in require command, fixes invalid case of consistency issue, fixes #10006 2021-07-21 14:38:10 +02:00
Ondrej Mirtes 79093d664b Update PHPStan and remove ignore 2021-07-21 10:10:09 +02:00
Ondřej Mirtes 58ced29a2a
Simplify code 2021-07-14 16:36:12 +02:00
Jordi Boggiano be58b36a35
Also look up 7zz on linux/macOS, fixes #9951 2021-07-12 15:50:02 +02:00
Jordi Boggiano b602b19f6d
Fix archive command now that zips are extracted async, refs composer/satis#655 2021-07-12 15:09:59 +02:00
Jordi Boggiano db1d9e75be
Fix support for 7z command fallback on linux/macOS, fixes #9994 2021-07-12 14:49:44 +02:00
Jordi Boggiano bacbd15b6b
Fix open_basedir support regession in bfea0f7d1 2021-07-12 14:34:18 +02:00
Jordi Boggiano 5152eeebdc
Merge pull request #9995 from Seldaek/fix_wsl
Fix UNC/WSL-path issues when running in Windows
2021-07-12 14:07:41 +02:00
Jordi Boggiano 005c55185a
Fix support for writing into UNC paths, and comparing UNC paths correctly in InstalledVersions, fixes #9993 2021-07-12 14:03:00 +02:00
Jordi Boggiano cc81f5bac3
Fix support for UNC paths in normalizePath, refs #9993 2021-07-12 13:36:57 +02:00
Ondřej Mirtes c65890d2d3
DiagnoseCommand - fix PHPDoc (#9991) 2021-07-07 21:52:53 +02:00
Jordi Boggiano 078aaa6968
Make sure the correct name is being output, fixes #9986 2021-06-27 14:45:31 +02:00
Jordi Boggiano a5efbbc94a
Validate schema before writing the file, fixes #9986 2021-06-27 14:45:31 +02:00
Jordi Boggiano 420d9bf21d
Move name validation out of interact, fixes #9986 2021-06-27 14:45:30 +02:00
Jordi Boggiano e87a150f41
Make sure schema issues are always reported correctly, but not in init when Composer is not required, fixes #9986 2021-06-27 14:45:30 +02:00
Jordi Boggiano 6f992a6ea3
Merge pull request #9975 from mitelg/fix-annotation-complete-package-interface
Fix initial values of CompletePackage properties
2021-06-26 23:16:58 +02:00
Jordi Boggiano 5780caf208
Fix link when no composer.json is present, fixes #9966 2021-06-26 23:09:27 +02:00
Michael Telgmann 66fb240e1b
Fix initial values of CompletePackage properties 2021-06-17 08:46:40 +02:00
Jordi Boggiano 9a32bf9709
Bump source version to 2.1.999 2021-06-09 16:44:06 +02:00
Jordi Boggiano bf3713072c
Fix source binaries not being made executable when symlinks cannot be used, fixes #9961 2021-06-09 16:25:16 +02:00
Jordi Boggiano 2d54a27ebc
Fix config support for new bin-compat value, refs #9959 2021-06-09 16:25:16 +02:00
noniagriconomie 65259ac8e0 Add Composer version in about command 2021-06-09 15:13:01 +02:00
Sebastian Blank a9031e40eb
Add "symlink" option for "bin-compat" config (#9959) 2021-06-09 11:33:44 +02:00
Jordi Boggiano 6c1f0cdf24
Handle edge cases too in removeDirectoryPhp to avoid trying to delete symlinks and such, fixes #9955 2021-06-08 21:53:20 +02:00
Jordi Boggiano f61f2c6872
Also free $file just in case 2021-06-08 21:26:41 +02:00
Jordi Boggiano a02802b109
Warn 1.x users when a package is not found that it may be due to our deprecation policy 2021-06-08 21:12:49 +02:00