Skip to content

Commit bf6c7f8

Browse files
committed
Merge branch '2.6'
2 parents 50f7c1d + e14d28b commit bf6c7f8

File tree

3 files changed

+59
-55
lines changed

3 files changed

+59
-55
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"seld/signal-handler": "^2.0"
4646
},
4747
"require-dev": {
48-
"symfony/phpunit-bridge": "^6.0 || ^7",
48+
"symfony/phpunit-bridge": "^6.4.1 || ^7.0.1",
4949
"phpstan/phpstan": "^1.9.3",
5050
"phpstan/phpstan-phpunit": "^1.0",
5151
"phpstan/phpstan-deprecation-rules": "^1",

composer.lock

+54-54
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Composer/Autoload/AutoloadGenerator.php

+4
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,10 @@ class ComposerStaticInit$suffix
11331133
$loader->setPsr4($namespace, $path);
11341134
}
11351135

1136+
/**
1137+
* @var string $vendorDir
1138+
* @var string $baseDir
1139+
*/
11361140
$classMap = require $targetDir . '/autoload_classmap.php';
11371141
if ($classMap) {
11381142
$loader->addClassMap($classMap);

0 commit comments

Comments
 (0)