6f6d59426d
New finding by Static Code Analysis: revert uniqid() to comply long path requirements
2018-07-16 22:40:48 +02:00
cd39efc72c
New finding by Static Code Analysis
2018-07-14 20:55:26 +02:00
50565cb0c8
Use variable to call count() less often
2018-07-12 20:44:24 +02:00
68d468d683
Merge pull request #7450 from staabm/simpler-hash
...
Use a simpler hashing for the Rule2Literal case
2018-07-12 10:05:24 +02:00
1e9136f086
Merge pull request #7456 from staabm/simpler-equals
...
Specialize Rule2Literal->equals(Rule2Literal) for speedup
2018-07-12 10:02:36 +02:00
7079cdb70d
Merge pull request #7458 from staabm/patch-3
...
Define variable only when actually used
2018-07-12 10:01:19 +02:00
b350c09c7e
Merge pull request #7457 from staabm/patch-2
...
Remove unnecessary abs() calls
2018-07-12 09:58:38 +02:00
b63e2de819
add alias `i` to the install command
2018-07-11 20:37:34 +03:00
86d5de2965
Define variable only when actually used
2018-07-10 21:01:52 +02:00
42516901f1
Removed another unnecessary abs() call
2018-07-10 20:59:39 +02:00
0e16dbabde
Removed another unnecessary abs() call
2018-07-10 20:55:14 +02:00
e3a23f4ae6
Remove unnecessary abs() calls
...
Literal cannot be negative at this point
2018-07-10 20:49:24 +02:00
7a4937bbcc
Specialize Rule2Literal->equals(Rule2Literal) for speedup
2018-07-10 18:24:06 +02:00
07383552b3
Temporary save the package-name into a variable
...
this reduces number of unnecessary function calls in the hot path of "composer update"
2018-07-09 14:09:46 +02:00
0aa7ec2d2c
Use a simpler hashing for the Rule2Literal case
...
this speeds up "composer update" by ~18%
2018-07-09 14:01:57 +02:00
354eec76ae
Add repositories path glob
2018-07-07 00:47:27 +09:00
7d9f8e2247
Improvements
...
Small improvements, such as remove unused imports, unecessaries casts, parentheses, etc.
2018-07-05 07:44:43 -03:00
9355ebd3f6
Closing the ZipArchive in ArtifactRepository::getComposerInformation()
2018-06-25 10:34:00 +02:00
7221e4ea4e
Generate tree view before displaying it
...
Add support json tree view
2018-06-19 17:29:00 +02:00
20e89a7621
composer show options -t and -l do not work together, fixes #7210
2018-06-11 01:09:52 +04:30
87646ae689
Hide suggest reason when there is not one
2018-06-09 15:18:21 +01:00
837ad7c14e
Merge branch '1.6'
2018-06-07 11:15:18 +02:00
5bae1913ab
swap tests to prevent conflicting error-messages
2018-06-07 11:15:10 +02:00
07867724d0
add back the warning about missing unzip
...
display an error-message on non-Windows OS if unzip is unavailable, per #7383
2018-06-07 11:15:01 +02:00
0a27ca7b65
Make sure circular dependencies do not break the autoload dumper, refs #7316 , refs #7348
2018-06-06 14:51:52 +02:00
3fb2a054a7
Merge pull request #7357 from Toflar/better-solver-debug-output
...
Improve SAT resolving developer debug information
2018-06-06 14:01:57 +02:00
6ff74d3ed1
[BUGFIX] Fixed typo in comment
2018-06-05 15:55:14 +02:00
b8989796bf
Merge branch '1.6'
2018-05-31 19:58:32 +02:00
eedbd218f5
Make sure circular dependencies do not break the autoload dumper, refs #7316 , refs #7348
2018-05-31 17:02:04 +02:00
d82bdc04ac
Improved debugging output
2018-05-24 11:46:50 +02:00
1016cf19b2
Merge pull request #7351 from zefrog/fix-git-auth-failure-no-tty
...
Fix Git detection of authentication failure when no tty is attached to the process
2018-05-24 11:16:40 +02:00
ee97f26931
FIX Update PHPDocs to indicate more specific return types
2018-05-22 10:39:25 +12:00
5435877bd9
Improve SAT resolving developer debug information
2018-05-18 10:59:09 +02:00
089f3803de
Merge remote-tracking branch 'helhum/sf-hidden-input'
2018-05-15 16:07:13 +02:00
46f973e213
Merge branch '1.6'
2018-05-15 16:07:05 +02:00
c6d53abf89
Fix tests
2018-05-15 16:06:56 +02:00
70e431368f
Merge remote-tracking branch 'ph-fritsche/1.6' into 1.6
2018-05-15 16:01:34 +02:00
fd00ea7ce8
Fix Git detection of authentication failure when no tty is attached to the process
2018-05-15 15:31:31 +02:00
af1dccb1fb
Avoid showing virtual packages in search results, fixes #7310
2018-05-15 15:20:21 +02:00
b99798068d
Use symfony/console for hidden questions
...
Fixes : #7337
2018-05-14 17:05:36 +02:00
b0be87177d
Filter dev-dependencies from "dump-autoload --no-dev" , fixes #4343
2018-05-08 02:57:26 +02:00
4ebb747e12
Merge branch '1.6'
2018-05-04 11:18:18 +02:00
e697293cd9
Handle broken symlinks more cleanly, fixes #7255
2018-05-04 11:17:43 +02:00
3b9d6769bf
Fix class names in comments being parsed in short_open_tags files, fixes #7289
2018-05-04 11:02:12 +02:00
464daeebe2
Merge branch '1.6'
2018-05-03 17:38:09 +02:00
43e33be79f
Fix regression in 036fc44c25, fixes #7268
2018-05-03 17:30:33 +02:00
0f373e3249
Fix issues introduced by #7191 , fixes #7263
2018-04-13 15:51:58 +02:00
38866ba310
Merge remote-tracking branch 'johnstevenson/external-xdebug'
2018-04-13 15:38:27 +02:00
f42e6a5772
Compute keep-vcs/remove-vcs last minute to allow plugins to change the value, refs #7002
2018-04-13 14:49:26 +02:00
ef7252b358
Avoid relying on internal usort behavior
2018-04-13 14:09:00 +02:00
c917865fe9
Fix handling of dev versions and consolidate logic, refs #7119
2018-04-13 13:55:02 +02:00
24ad6307a7
Merge remote-tracking branch 'austris-argalis/issue-7085'
2018-04-13 13:11:46 +02:00
0ab843a058
Fix setting of scripts from config command, refs #7225
2018-04-13 13:10:22 +02:00
5aff7dff70
Merge remote-tracking branch 'swumao/feature-7208'
2018-04-13 12:56:20 +02:00
ea78712822
Merge branch '1.6'
2018-04-13 10:52:23 +02:00
e37e7f1329
Fix handling of non-callable event listeners, fixes #7229
2018-04-13 10:43:43 +02:00
785aba9d82
Merge remote-tracking branch 'stof/fix_show_columns' into 1.6
2018-04-13 10:07:02 +02:00
9dc6222288
Allow using fossil dependency in a fossil repository, fixes #7125 , closes #7126
2018-04-13 09:00:03 +02:00
a8cf4a07fc
Merge branch '1.6'
2018-04-12 20:03:08 +02:00
fa539766b8
Output outdated warning on stderr, fixes #7218
2018-04-12 19:56:35 +02:00
288631a37e
Log the source of the failure when an aliased script fails, fixes #7201
2018-04-12 19:42:23 +02:00
35ebb8b93f
Merge branch '1.6'
2018-04-12 19:22:50 +02:00
af3783b5f4
properly cache when a branch in a certain revision does not contain a composer.json
...
this prevents requesting/trying to get the composer.json over and over again even if no commits happend
Closes #7156
2018-04-12 19:11:53 +02:00
a51911f295
Merge commit 'b1a78b60fe552bc6e7df09cb1c0154797fea6f64'
2018-04-12 18:40:52 +02:00
b1a78b60fe
Remove output while the changes are being collected
2018-04-12 18:40:07 +02:00
277f32d388
Lock _readme: remove outdated hashtag link part, closes #7096
2018-04-12 18:00:01 +02:00
9bee2ca28e
make sure we only cache resources which contain a svn revision
...
like we do in the VCS driver.
Closes #7158
2018-04-12 17:56:41 +02:00
1336029b72
Fix type hints to match latest symfony, fixes #7199
2018-04-12 17:36:57 +02:00
2bd34c0534
Merge branch '1.6'
2018-04-12 17:01:00 +02:00
c9aa9c0d2f
Fix usage of svn user-provided credentials, fixes #7114 , closes #7228
2018-04-12 17:00:12 +02:00
5460e5d86f
Respect current PHP version when figuring out requirements for init command, fixes #7257
2018-04-12 16:22:40 +02:00
174c71de04
Handle http 401/403 differently to allow reading warning message
2018-04-12 15:57:14 +02:00
9041622b86
Fix version guessing regression and a few other issues, fixes #7127
2018-04-12 15:16:39 +02:00
79d62cc51c
Escape references properly when getting commit logs for verbose update
2018-04-12 14:20:34 +02:00
71d058b97b
refactored "svn --version" calls into a single place, closes #7152
...
this saves a lot of process-spawning as we re-use the result of a process started once.
2018-04-12 13:40:37 +02:00
2f56c3c334
Change status command help to make it clearer, closes #7213
2018-04-12 13:33:22 +02:00
78017bcbcb
Fix support for uppercase package names in why/why-not commands, fixes #7198
2018-04-12 12:14:30 +02:00
e76d32817e
Merge pull request #7070 from nicolas-grekas/fix
...
Fix RemoteFilesystem::getRemoteContents() on-failure behavior
2018-04-12 11:41:04 +02:00
556148510b
ConsoleIO::select for a single option, fixes #7106 , closes #7107
2018-04-12 11:03:32 +02:00
ec9ba46c5f
Fix run-script --list failing to handle native script handlers, fixes #7069
2018-04-12 10:39:18 +02:00
4bddcd7124
Add support for gitlab.com URL replacement, fixes #7160
2018-04-12 10:35:22 +02:00
bfa01285c2
Merge branch '1.6'
2018-04-12 10:25:03 +02:00
036fc44c25
Make sure aliased packages are removed correctly from the repository, fixes #7167
2018-04-12 09:51:01 +02:00
8d06832077
Update ClassMapGenerator to work better with symlinks, fixes #7252 , closes #7251
2018-04-12 09:37:26 +02:00
491ae0634a
Fix bug for scripts for config command
2018-03-30 14:24:04 +08:00
9a5c2da4de
Merge pull request #7122 from davidyell/patch-1
...
Added space to concatenation
2018-03-29 23:19:07 +02:00
b7ab081519
Allow Composer to be used without running the application
...
For [Humbug
Box](https://github.com/humbug/box/blob/master/src/Composer/ComposerOrchestrator.php#L30 ) we are
using Composer to dump the autoload. To do so I'm using the `Composer` class from the application:
```php
$composer = (new ComposerApplication())->getComposer();
```
If you do so however this is going to fail because `Application#io` is null instead of being a
`IOInterface` instance. Indeed it is initialised only when the application is run. So one solution
is to initialised it with a dummy IO and the right IO object will be set when the application is run
as usual.
2018-03-24 07:32:04 +00:00
90ac5e0749
improving doc
2018-03-16 13:15:15 +01:00
2413b55c60
LocalChanges for ArchiveFiles
2018-03-14 17:38:12 +01:00
f8dc77db18
Fix bc
2018-03-11 18:14:44 +00:00
ed97c2116c
Use external XdebugHandler library
2018-03-08 19:20:16 +00:00
ce521e5697
Take only displayed packages into account to determine column width
...
The ShowCommand was taking all packages into account when determining the
max lengths used to display the width of each column. This was causing
unnecessary hiding of columns in case of using a longer name or a longer
version in a different package.
This was especially visible when using the outdated command, as it applies
filtering by default.
2018-03-06 12:57:44 +01:00
4d8b9be5b6
Skip parsing equal branches/tags to avoid failures in packagist down the line
2018-03-05 23:34:22 +01:00
1dc78c1ad9
Merge branch '1.6'
2018-03-01 15:49:33 +01:00
72476b62d4
Check for license validity only on newly updated branches, refs composer/packagist#866 , refs composer/packagist#883
2018-03-01 15:49:25 +01:00
fb40967349
Added space to concatenation
...
Fix a missed space for string concatenation
2018-02-19 12:42:19 +00:00
8a5645ffda
Wording: Downgrading instead of Updating #7085
2018-02-16 00:38:41 +02:00
ef46a8afa4
Merge branch '1.6'
2018-02-11 11:02:41 +01:00
b90987fdeb
Fix permissions when using the PearBinaryInstaller
...
The PearBinaryInstaller is old and not used by many people, so the
world writable permissions weren't caught
2018-02-11 11:02:27 +01:00
3c09c0ab2a
Merge pull request #7079 from carusogabriel/misspelling
...
Fix misspelling
2018-02-08 20:46:07 +01:00
08f769220a
Merge branch '1.6'
2018-02-05 10:36:03 +01:00
f857da7c29
Remove deprecated license check from ValidatingArrayLoader, fixes #7026 , fixes #7073
2018-02-05 10:34:41 +01:00
0fc6fb56a0
Fix validation of license field
2018-02-05 10:17:52 +01:00
f722f952e7
Fix misspelling
...
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-02-04 22:41:28 -02:00
3b391191b9
Fix RemoteFilesystem::getRemoteContents() on-failure behavior
2018-02-01 23:02:25 +01:00
9f34ee9892
Merge branch '1.6'
2018-01-31 16:23:09 +01:00
a61a8d78b1
Fix warning for packages not existing while they exist but not at the required stability, fixes #7044
2018-01-31 16:11:37 +01:00
71896b0777
Fix self-update regression, fixes #7045
2018-01-31 14:06:54 +01:00
f31e2552be
Merge branch '1.6'
2018-01-24 16:19:39 +01:00
a29ad2bfd6
Add some more debugging info
2018-01-24 16:19:28 +01:00
1933532ec5
Fix github authentication request, fixes #5767
2018-01-24 16:07:02 +01:00
ccbbbccadb
CAvoid calling PRE_COMMAND_RUN if no composer could be initialized
2018-01-24 15:36:00 +01:00
352aefe48c
Add command name to the PreCommandRun event
2018-01-24 15:27:36 +01:00
b1bfb9bb65
Add PRE_COMMAND_RUN event, fixes #7002
2018-01-24 15:21:55 +01:00
5f97eb1578
Merge branch '1.6'
2018-01-24 14:14:38 +01:00
e67a559db9
make sure "svn info" output is parsed in a x-platform way
2018-01-24 14:14:17 +01:00
9bc83d698e
Pass auth credentials to svn log while retrieving commit logs
2018-01-24 14:14:08 +01:00
2224989430
Merge pull request #7036 from kalessil/master
...
[minor] SCA: reduced repetitive method calls
2018-01-24 11:27:16 +01:00
0161a63a0a
Merge pull request #6956 from wsandin/master
...
Fix for issue 6602 - warning when running composer as another user
2018-01-24 11:15:17 +01:00
49068c579e
Fix indenting
2018-01-24 11:14:40 +01:00
dae3c5bc2d
Merge branch '1.6'
2018-01-24 10:20:12 +01:00
da9e00066c
SCA: reduced repetitive methods references, used specialized PhpUnit assertions
2018-01-24 10:19:46 +01:00
a567501e58
Fix ConsoleIO::select regression in which 1.5.3-1.6.2 returned the selected values instead of index keys, fixes #7000
2018-01-24 10:19:21 +01:00
fd61a21bff
Fix detection of junction points, fixes #7025
2018-01-24 10:04:41 +01:00
766ed9555e
Only show override description if there is one, refs #7011
2018-01-24 09:02:51 +01:00
fa5a94143a
Show reason for php version package mismatch due to config.platform
2018-01-24 08:55:37 +01:00
96d07e6753
Merge branch '1.6'
2018-01-22 16:44:24 +01:00
842a7ea922
Fix dev-master not being normalized correctly for the root package, fixes #7007
2018-01-22 16:44:17 +01:00
ad8b44a4c8
Merge branch '1.6'
2018-01-22 15:42:56 +01:00
a5e35b9e89
Add --remove-vcs flag to create-project command to allow removing user prompts, fixes #7002
2018-01-22 15:17:30 +01:00
ea9b7ecbb0
Merge pull request #6982 from carusogabriel/phpstan
...
Fixes from PHPStan level 0
2018-01-22 14:50:43 +01:00
6a7e932233
Mention that also a antivirus software might corrupt file contents
2018-01-22 14:41:19 +01:00
621a9d845c
Add 'git-bitbucket' in RepositoryFactory
...
Add 'git-bitbucket' and 'hg-bitbucket' in RepositoryFactory help to call good driver in vcs
Cause if you config your repository type with 'git'. the GitDriver is instantiate and not GitBitbucketDriver
Fix #5389
2018-01-22 14:06:50 +01:00
9f60e50401
Merge pull request #7019 from mhujer/mh-validate-script-descriptions
...
Validation warns if script description for nonexistent script is present
2018-01-22 14:05:39 +01:00
471b012e3a
Fix problem report when requiring "ext-zend opcache", refs #2509
2018-01-22 13:41:32 +01:00
4dc81db069
Merge branch '1.6'
2018-01-21 17:40:29 +01:00
5a1765c838
Only warn for license deprecations for new releases/branches
2018-01-21 17:40:20 +01:00
bbee0d7c6c
Validation warns if script description for nonexistent script is present
...
Fixes #7010
2018-01-17 19:15:06 +01:00
015927d0b0
Merge branch '1.6'
2018-01-16 09:20:32 +01:00
1a6e3ee8c7
Show script description for custom commands in run-script --list, fixes #7009
2018-01-16 09:19:44 +01:00
3d262bd637
Fixes from PHPStan level 0
...
More fixes from PHPStan level 0
2018-01-14 11:44:15 -02:00
994bac0c15
Merge branch '1.6'
2018-01-10 15:54:49 +01:00
59fcb91912
Merge pull request #6985 from nicolas-grekas/get-url-contents
...
Add RemoteFilesystem::getRemoteContents() extension point
2018-01-10 15:54:03 +01:00
82b80a5451
Merge pull request #6979 from nicolas-grekas/fix-ctrl-c
...
Fix CTRL+C handling during create-project
2018-01-10 15:51:30 +01:00
60106edd32
Added a test to confirm issue #6994 .
...
Added a encapsulated group to the replacement parameter of the `preg_replace` for GitLab in `\Composer\Util\Url::updateDistReference()`. This fixes #6994 .
2018-01-09 17:57:22 +01:00
188b3a35c8
Tweak license deprecation text to handle + more gracefully, fixes #6981
2018-01-09 17:29:30 +01:00
5601f07bfa
Add RemoteFilesystem::getRemoteContents() extension point
2018-01-08 18:44:31 +01:00
4296fe657f
Adding check to confirm POSIX is defined and callable
2018-01-06 19:02:14 +07:00
251a347efb
Fix CTRL+C handling during create-project
2018-01-05 17:18:42 +01:00
e6114b2ca7
Fix support for replacing dist refs in gitlab URLs and add support for gitlab/github enterprise too
2018-01-05 15:20:30 +01:00
0c912d6eee
Fix generated static map...
2018-01-04 17:31:44 +01:00
ce70e0e9dd
Fix BC of generated static map
2018-01-04 14:11:50 +01:00
5cd0fef7ff
Upgrade to SPDX License 3.0 and handle deprecations more gracefully, fixes #6951
2018-01-04 10:42:46 +01:00
ab8437ce06
Merge remote-tracking branch 'swumao/feature-6892'
2018-01-03 16:46:50 +01:00
3be9591930
Simplify some ClassLoader code, minor memory improvement, fixes #6937
2018-01-03 16:24:22 +01:00
8a50345df7
Follow ignore-platform-reqs when checking for package requirements, fixes #6859
2018-01-03 15:02:46 +01:00
f222f7f896
Merge pull request #6961 from carusogabriel/bin
...
Allow bin key to receive string
2018-01-03 11:58:13 +01:00
2ad6f611d7
Allow bin key to receive string
2018-01-02 07:00:55 -02:00
7aad20cb30
[SvnDownloader] Improve plurals and singulars
2018-01-02 04:41:03 -02:00
dbea825871
Raise a warning if current user and owner of deploy dir doesn't match
2017-12-31 19:36:59 +07:00
ad27182618
Merge pull request #6945 from localheinz/fix/remove-main-key
...
Fix: Remove key when value is null
2017-12-29 15:25:34 +01:00
de07f588c1
Fix: Use array_key_exists() instead of isset()
2017-12-28 21:12:04 +01:00
5e68566ce6
Fix: Typo / wording
2017-12-27 19:50:16 +01:00
e91505ce30
Fix the platform requirement check command
...
The command must validate that the current package matches the constraint, not
that any newer package matches it.
2017-12-20 12:17:16 +01:00
50665aa18d
Simplify check for current revision, refs #6684
2017-12-19 17:50:02 +01:00
93cd9d874b
Merge remote-tracking branch 'RobberPhex/git-repo'
2017-12-19 15:47:58 +01:00
e4bb306dfc
Fix for CI
2017-12-19 22:32:10 +08:00
1c0a494c72
Update findBestVersionForPackage method to support return package name
2017-12-19 22:17:24 +08:00
50045a7536
Add no_useless_else in phpcs
2017-12-19 09:20:29 -02:00
c8aea719b1
CS fixes
2017-12-18 16:02:48 +01:00
f31b820b09
Merge pull request #6911 from johnstevenson/cygdrive
...
Fix shell proxy to allow user-defined cygdrive
2017-12-18 13:40:56 +01:00
847ebed6e6
Merge pull request #6913 from mbrodala/scripts-description-toplevel
...
Move "scripts-description" to toplevel
2017-12-18 13:39:46 +01:00
b32c7b3d16
Remove BC warning as this was never released
2017-12-18 13:39:20 +01:00
3e1b0c88d7
Merge branch '1.5'
2017-12-18 11:13:19 +01:00
512188d212
Filter macOS .DS_Store files when detecting github archives, fixes #6784 , closes #6785
2017-12-18 11:11:35 +01:00
8424235fac
Rename to "scripts-descriptions"
2017-12-18 10:47:01 +01:00
00f6c0a44a
Fix issue when requiring multiple packages once without and once with explicit version, fixes #6859
2017-12-18 10:35:44 +01:00
80d0c2029b
Move "scripts-description" to toplevel
...
Fixes #6881
2017-12-18 10:14:24 +01:00
354bd7f7e2
Update parse name version parirs name to lower
2017-12-18 14:55:03 +08:00
3511edc9e8
Fix shell proxy to allow user-defined cygdrive
2017-12-17 19:29:44 +00:00
0a9abeef88
Merge branch '1.5'
2017-12-17 15:05:08 +01:00
8bc02d1aed
Merge pull request #6904 from brettsantore/doc-update
...
clarify optionality of package in require command
2017-12-17 15:02:18 +01:00
4c8c574b6c
Fix regex, refs #6895
2017-12-17 14:02:55 +01:00
9f723ba381
Support GitLab repositories w/ port over HTTPs
...
When we have self-hosted GitLab, over HTTPs, on a different port.
rel composer/composer#6894
2017-12-17 13:59:08 +01:00
fc6c12bd0a
Fix pretty version guessing when non-dev branch
2017-12-17 13:49:15 +01:00
a55d9ce7b0
Merge pull request #6875 from OskarStark/strategy
...
output used strategy
2017-12-17 12:56:09 +01:00
b110f86aa0
Merge branch '1.5'
2017-12-16 22:42:30 +01:00
7d57f84b7d
Merge pull request #6879 from OskarStark/output
...
highlight previous composer version
2017-12-16 22:08:47 +01:00
c3b6c0c85e
Make sure exitCode is defined in the show command.
2017-12-16 22:08:10 +01:00
32a409a3ee
Clean elses
2017-12-16 04:23:48 -02:00
449ecf098d
clarify optionality of package in require command
2017-12-14 11:44:54 -05:00
8b90037d7b
highlight previous composer version
2017-12-07 10:12:21 +01:00
e85bcc882c
output used strategy
2017-12-07 10:08:34 +01:00
ed20b3b4f6
Fix OutputFormatter creation with Symfony 4, fixes #6871
2017-12-07 09:21:26 +01:00
6bb3ab1868
Tweak help/description
2017-12-01 17:03:42 +01:00
b579884e15
Tweak check-platform-reqs command to check all constraints and output more information about what requires failed, refs #6709
2017-12-01 17:00:15 +01:00
edf561d602
Merge remote-tracking branch 'swumao/master'
2017-12-01 15:43:31 +01:00
b2f283cbd2
Merge pull request #6696 from legoktm/sort-installed
...
Sort vendor/composer/installed.json deterministically
2017-12-01 15:27:55 +01:00
224d272a0e
Merge branch '1.5'
2017-12-01 14:30:56 +01:00
3976d9f242
Fix require command picking of specific versions, fixes #6859
2017-12-01 14:30:51 +01:00
Vladimir Reznichenko